diff --git a/DiscImageChef/Commands/Analyze.cs b/DiscImageChef/Commands/Analyze.cs
index 50494d1c8..909851d6b 100644
--- a/DiscImageChef/Commands/Analyze.cs
+++ b/DiscImageChef/Commands/Analyze.cs
@@ -77,10 +77,10 @@ namespace DiscImageChef.Commands
                 Arity = ArgumentArity.ExactlyOne, Description = "Disc image path", Name = "image-path"
             });
 
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+            Handler = CommandHandler.Create(typeof(AnalyzeCommand).GetMethod(nameof(Invoke)));
         }
 
-        int Invoke(bool verbose, bool debug, string encoding, bool filesystems, bool partitions, string imagePath)
+        public static int Invoke(bool verbose, bool debug, string encoding, bool filesystems, bool partitions, string imagePath)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/Benchmark.cs b/DiscImageChef/Commands/Benchmark.cs
index 15a6c661c..bdc2d6887 100644
--- a/DiscImageChef/Commands/Benchmark.cs
+++ b/DiscImageChef/Commands/Benchmark.cs
@@ -67,7 +67,7 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool debug, bool verbose, int blockSize, int bufferSize)
+        public static int Invoke(bool debug, bool verbose, int blockSize, int bufferSize)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/Checksum.cs b/DiscImageChef/Commands/Checksum.cs
index 6724195ad..2bd20edfa 100644
--- a/DiscImageChef/Commands/Checksum.cs
+++ b/DiscImageChef/Commands/Checksum.cs
@@ -153,9 +153,9 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool debug, bool verbose, bool adler32, bool crc16, bool crc32, bool crc64, bool fletcher16,
-                          bool fletcher32, bool md5, bool sha1, bool sha256, bool sha384, bool sha512, bool spamSum,
-                          string imagePath, bool separatedTracks, bool wholeDisc)
+        public static int Invoke(bool debug, bool verbose, bool adler32, bool crc16, bool crc32, bool crc64, bool fletcher16,
+                                 bool fletcher32, bool md5, bool sha1, bool sha256, bool sha384, bool sha512, bool spamSum,
+                                 string imagePath, bool separatedTracks, bool wholeDisc)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/Compare.cs b/DiscImageChef/Commands/Compare.cs
index 16a76b93c..f4f73f8df 100644
--- a/DiscImageChef/Commands/Compare.cs
+++ b/DiscImageChef/Commands/Compare.cs
@@ -62,7 +62,7 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool debug, bool verbose, string imagePath1, string imagePath2)
+        public static int Invoke(bool debug, bool verbose, string imagePath1, string imagePath2)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/Configure.cs b/DiscImageChef/Commands/Configure.cs
index b882e67e4..e8494d667 100644
--- a/DiscImageChef/Commands/Configure.cs
+++ b/DiscImageChef/Commands/Configure.cs
@@ -53,7 +53,7 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        int Invoke(bool debug, bool verbose)
+        public int Invoke(bool debug, bool verbose)
         {
             if(!_autoCall)
             {
diff --git a/DiscImageChef/Commands/ConvertImage.cs b/DiscImageChef/Commands/ConvertImage.cs
index eac43fb9a..cc4868e28 100644
--- a/DiscImageChef/Commands/ConvertImage.cs
+++ b/DiscImageChef/Commands/ConvertImage.cs
@@ -190,12 +190,12 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool verbose, bool debug, string cicmXml, string comments, int count, string creator,
-                          string driveFirmwareRevision, string driveManufacturer, string driveModel,
-                          string driveSerialNumber, bool force, string inputPath, int lastMediaSequence,
-                          string mediaBarcode, string mediaManufacturer, string mediaModel, string mediaPartNumber,
-                          int mediaSequence, string mediaSerialNumber, string mediaTitle, string outputPath,
-                          string outputOptions, string resumeFile, string format)
+        public static int Invoke(bool verbose, bool debug, string cicmXml, string comments, int count, string creator,
+                                 string driveFirmwareRevision, string driveManufacturer, string driveModel,
+                                 string driveSerialNumber, bool force, string inputPath, int lastMediaSequence,
+                                 string mediaBarcode, string mediaManufacturer, string mediaModel, string mediaPartNumber,
+                                 int mediaSequence, string mediaSerialNumber, string mediaTitle, string outputPath,
+                                 string outputOptions, string resumeFile, string format)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/CreateSidecar.cs b/DiscImageChef/Commands/CreateSidecar.cs
index 73fd52866..80f292813 100644
--- a/DiscImageChef/Commands/CreateSidecar.cs
+++ b/DiscImageChef/Commands/CreateSidecar.cs
@@ -93,7 +93,7 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool debug, bool verbose, uint blockSize, string encodingName, string imagePath, bool tape)
+        public static int Invoke(bool debug, bool verbose, uint blockSize, string encodingName, string imagePath, bool tape)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/Decode.cs b/DiscImageChef/Commands/Decode.cs
index 4c02cb3b5..5390e4181 100644
--- a/DiscImageChef/Commands/Decode.cs
+++ b/DiscImageChef/Commands/Decode.cs
@@ -87,8 +87,8 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool verbose, bool debug, bool diskTags, string imagePath, string length, bool sectorTags,
-                          ulong startSector)
+        public static int Invoke(bool verbose, bool debug, bool diskTags, string imagePath, string length, bool sectorTags,
+                                 ulong startSector)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/DeviceInfo.cs b/DiscImageChef/Commands/DeviceInfo.cs
index 88c34b509..21502255d 100644
--- a/DiscImageChef/Commands/DeviceInfo.cs
+++ b/DiscImageChef/Commands/DeviceInfo.cs
@@ -66,7 +66,7 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool debug, bool verbose, string devicePath, string outputPrefix)
+        public static int Invoke(bool debug, bool verbose, string devicePath, string outputPrefix)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/DeviceReport.cs b/DiscImageChef/Commands/DeviceReport.cs
index 854b07067..98b681f50 100644
--- a/DiscImageChef/Commands/DeviceReport.cs
+++ b/DiscImageChef/Commands/DeviceReport.cs
@@ -66,7 +66,7 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool debug, bool verbose, string devicePath)
+        public static int Invoke(bool debug, bool verbose, string devicePath)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/DumpMedia.cs b/DiscImageChef/Commands/DumpMedia.cs
index ac7b9a8b1..ae7573f9a 100644
--- a/DiscImageChef/Commands/DumpMedia.cs
+++ b/DiscImageChef/Commands/DumpMedia.cs
@@ -178,10 +178,10 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool debug, bool verbose, string cicmXml, string devicePath, bool resume, string encoding,
-                          bool firstTrackPregap, bool fixOffset, bool force, bool noMetadata, bool noTrim,
-                          string outputPath, string options, bool persistent, ushort retryPasses, int skip,
-                          int speed, bool stopOnError, string format, string subchannel)
+        public static int Invoke(bool debug, bool verbose, string cicmXml, string devicePath, bool resume, string encoding,
+                                 bool firstTrackPregap, bool fixOffset, bool force, bool noMetadata, bool noTrim,
+                                 string outputPath, string options, bool persistent, ushort retryPasses, int skip,
+                                 int speed, bool stopOnError, string format, string subchannel)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/Entropy.cs b/DiscImageChef/Commands/Entropy.cs
index 7187e1ae7..245fa180b 100644
--- a/DiscImageChef/Commands/Entropy.cs
+++ b/DiscImageChef/Commands/Entropy.cs
@@ -76,8 +76,8 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool debug, bool verbose, bool duplicatedSectors, string imagePath, bool separatedTracks,
-                          bool wholeDisc)
+        public static int Invoke(bool debug, bool verbose, bool duplicatedSectors, string imagePath, bool separatedTracks,
+                                 bool wholeDisc)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/ExtractFiles.cs b/DiscImageChef/Commands/ExtractFiles.cs
index 272ae9a5c..a5abe1516 100644
--- a/DiscImageChef/Commands/ExtractFiles.cs
+++ b/DiscImageChef/Commands/ExtractFiles.cs
@@ -97,8 +97,8 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool debug, bool verbose, string encoding, bool xattrs, string imagePath, string @namespace,
-                          string outputDir, string options)
+        public static int Invoke(bool debug, bool verbose, string encoding, bool xattrs, string imagePath, string @namespace,
+                                 string outputDir, string options)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/Formats.cs b/DiscImageChef/Commands/Formats.cs
index a787d7e81..709cbcc64 100644
--- a/DiscImageChef/Commands/Formats.cs
+++ b/DiscImageChef/Commands/Formats.cs
@@ -49,7 +49,7 @@ namespace DiscImageChef.Commands
                                        "Lists all supported disc images, partition schemes and file systems.") =>
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
 
-        static int Invoke(bool verbose, bool debug)
+        public static int Invoke(bool verbose, bool debug)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/ImageInfo.cs b/DiscImageChef/Commands/ImageInfo.cs
index 0f2eabcfa..2e046cdea 100644
--- a/DiscImageChef/Commands/ImageInfo.cs
+++ b/DiscImageChef/Commands/ImageInfo.cs
@@ -54,7 +54,7 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool debug, bool verbose, string imagePath)
+        public static int Invoke(bool debug, bool verbose, string imagePath)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/ListDevices.cs b/DiscImageChef/Commands/ListDevices.cs
index 3a979a467..6ecf22931 100644
--- a/DiscImageChef/Commands/ListDevices.cs
+++ b/DiscImageChef/Commands/ListDevices.cs
@@ -52,7 +52,7 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool debug, bool verbose, string dicRemoteHost)
+        public static int Invoke(bool debug, bool verbose, string dicRemoteHost)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/ListEncodings.cs b/DiscImageChef/Commands/ListEncodings.cs
index 9d9c6044b..a0ea0514a 100644
--- a/DiscImageChef/Commands/ListEncodings.cs
+++ b/DiscImageChef/Commands/ListEncodings.cs
@@ -46,7 +46,7 @@ namespace DiscImageChef.Commands
         public ListEncodingsCommand() : base("list-encodings", "Lists all supported text encodings and code pages.") =>
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
 
-        static int Invoke(bool debug, bool verbose)
+        public static int Invoke(bool debug, bool verbose)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/ListNamespaces.cs b/DiscImageChef/Commands/ListNamespaces.cs
index bc9438e40..e34b68a32 100644
--- a/DiscImageChef/Commands/ListNamespaces.cs
+++ b/DiscImageChef/Commands/ListNamespaces.cs
@@ -48,7 +48,7 @@ namespace DiscImageChef.Commands
                                               "Lists all namespaces supported by read-only filesystems.") =>
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
 
-        static int Invoke(bool debug, bool verbose)
+        public static int Invoke(bool debug, bool verbose)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/ListOptions.cs b/DiscImageChef/Commands/ListOptions.cs
index cf0fdf724..3c02fa911 100644
--- a/DiscImageChef/Commands/ListOptions.cs
+++ b/DiscImageChef/Commands/ListOptions.cs
@@ -49,7 +49,7 @@ namespace DiscImageChef.Commands
                                            "Lists all options supported by read-only filesystems and writable media images.") =>
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
 
-        static int Invoke(bool debug, bool verbose)
+        public static int Invoke(bool debug, bool verbose)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/Ls.cs b/DiscImageChef/Commands/Ls.cs
index b094611d2..551890244 100644
--- a/DiscImageChef/Commands/Ls.cs
+++ b/DiscImageChef/Commands/Ls.cs
@@ -89,8 +89,8 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool debug, bool verbose, string encoding, string imagePath, bool longFormat,
-                          string @namespace, string options)
+        public static int Invoke(bool debug, bool verbose, string encoding, string imagePath, bool longFormat,
+                                 string @namespace, string options)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/MediaInfo.cs b/DiscImageChef/Commands/MediaInfo.cs
index 403ece911..8f67ba617 100644
--- a/DiscImageChef/Commands/MediaInfo.cs
+++ b/DiscImageChef/Commands/MediaInfo.cs
@@ -74,7 +74,7 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool debug, bool verbose, string devicePath, string outputPrefix)
+        public static int Invoke(bool debug, bool verbose, string devicePath, string outputPrefix)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/MediaScan.cs b/DiscImageChef/Commands/MediaScan.cs
index 5c0db2541..048d2fa45 100644
--- a/DiscImageChef/Commands/MediaScan.cs
+++ b/DiscImageChef/Commands/MediaScan.cs
@@ -68,7 +68,7 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool debug, bool verbose, string devicePath, string ibgLog, string mhddLog)
+        public static int Invoke(bool debug, bool verbose, string devicePath, string ibgLog, string mhddLog)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/PrintHex.cs b/DiscImageChef/Commands/PrintHex.cs
index 395a588b0..ca1f88b03 100644
--- a/DiscImageChef/Commands/PrintHex.cs
+++ b/DiscImageChef/Commands/PrintHex.cs
@@ -84,8 +84,8 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool debug, bool verbose, string imagePath, ulong length, bool longSectors, ulong startSector,
-                          ushort widthBytes)
+        public static int Invoke(bool debug, bool verbose, string imagePath, ulong length, bool longSectors, ulong startSector,
+                                 ushort widthBytes)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/Remote.cs b/DiscImageChef/Commands/Remote.cs
index 2734f1a06..e69521128 100644
--- a/DiscImageChef/Commands/Remote.cs
+++ b/DiscImageChef/Commands/Remote.cs
@@ -54,7 +54,7 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool debug, bool verbose, string host)
+        public static int Invoke(bool debug, bool verbose, string host)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/Statistics.cs b/DiscImageChef/Commands/Statistics.cs
index ff1ed9f56..5f40678b9 100644
--- a/DiscImageChef/Commands/Statistics.cs
+++ b/DiscImageChef/Commands/Statistics.cs
@@ -45,7 +45,7 @@ namespace DiscImageChef.Commands
         public StatisticsCommand() : base("stats", "Shows statistics.") =>
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
 
-        static int Invoke(bool debug, bool verbose)
+        public static int Invoke(bool debug, bool verbose)
         {
             MainClass.PrintCopyright();
 
diff --git a/DiscImageChef/Commands/Update.cs b/DiscImageChef/Commands/Update.cs
index 92071e441..8d983e171 100644
--- a/DiscImageChef/Commands/Update.cs
+++ b/DiscImageChef/Commands/Update.cs
@@ -49,7 +49,7 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        int Invoke(bool debug, bool verbose)
+        public int Invoke(bool debug, bool verbose)
         {
             if(_masterDbUpdate)
                 return(int)ErrorNumber.NoError;
diff --git a/DiscImageChef/Commands/Verify.cs b/DiscImageChef/Commands/Verify.cs
index 30693ab9a..47c32b076 100644
--- a/DiscImageChef/Commands/Verify.cs
+++ b/DiscImageChef/Commands/Verify.cs
@@ -71,7 +71,7 @@ namespace DiscImageChef.Commands
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
         }
 
-        static int Invoke(bool debug, bool verbose, string imagePath, bool verifyDisc = true, bool verifySectors = true)
+        public static int Invoke(bool debug, bool verbose, string imagePath, bool verifyDisc = true, bool verifySectors = true)
         {
             MainClass.PrintCopyright();