diff --git a/client/src/cmdlfpresco.c b/client/src/cmdlfpresco.c
index f9079464f..d629e1224 100644
--- a/client/src/cmdlfpresco.c
+++ b/client/src/cmdlfpresco.c
@@ -112,7 +112,18 @@ int demodPresco(bool verbose) {
 }
 
 static int CmdPrescoDemod(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
+    CLIParserContext *ctx;
+    CLIParserInit(&ctx, "lf presco demod",
+                  "Try to find presco preamble, if found decode / descramble data",
+                  "lf presco demod"
+                 );
+
+    void *argtable[] = {
+        arg_param_begin,
+        arg_param_end
+    };
+    CLIExecWithReturn(ctx, Cmd, argtable, true);
+    CLIParserFree(ctx);
     return demodPresco(true);
 }
 
diff --git a/client/src/cmdlfpyramid.c b/client/src/cmdlfpyramid.c
index 452f3f61e..b21c5c974 100644
--- a/client/src/cmdlfpyramid.c
+++ b/client/src/cmdlfpyramid.c
@@ -178,7 +178,18 @@ int demodPyramid(bool verbose) {
 }
 
 static int CmdPyramidDemod(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
+    CLIParserContext *ctx;
+    CLIParserInit(&ctx, "lf pyramid demod",
+                  "Try to find Farpoint/Pyramid preamble, if found decode / descramble data",
+                  "lf pyramid demod"
+                 );
+
+    void *argtable[] = {
+        arg_param_begin,
+        arg_param_end
+    };
+    CLIExecWithReturn(ctx, Cmd, argtable, true);
+    CLIParserFree(ctx);
     return demodPyramid(true);
 }
 
diff --git a/client/src/cmdlfsecurakey.c b/client/src/cmdlfsecurakey.c
index 04bdb3445..35bd66240 100644
--- a/client/src/cmdlfsecurakey.c
+++ b/client/src/cmdlfsecurakey.c
@@ -114,7 +114,18 @@ int demodSecurakey(bool verbose) {
 }
 
 static int CmdSecurakeyDemod(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
+    CLIParserContext *ctx;
+    CLIParserInit(&ctx, "lf securakey demod",
+                  "Try to find Securakey preamble, if found decode / descramble data",
+                  "lf securakey demod"
+                 );
+
+    void *argtable[] = {
+        arg_param_begin,
+        arg_param_end
+    };
+    CLIExecWithReturn(ctx, Cmd, argtable, true);
+    CLIParserFree(ctx);
     return demodSecurakey(true);
 }
 
diff --git a/client/src/cmdlfti.c b/client/src/cmdlfti.c
index e2d7716d2..9a8b3847f 100644
--- a/client/src/cmdlfti.c
+++ b/client/src/cmdlfti.c
@@ -272,7 +272,18 @@ out:
 }
 
 static int CmdTIDemod(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
+    CLIParserContext *ctx;
+    CLIParserInit(&ctx, "lf ti demod",
+                  "Try to find TI preamble, if found decode / descramble data",
+                  "lf ti demod"
+                 );
+
+    void *argtable[] = {
+        arg_param_begin,
+        arg_param_end
+    };
+    CLIExecWithReturn(ctx, Cmd, argtable, true);
+    CLIParserFree(ctx);
     return demodTI(true);
 }
 
diff --git a/client/src/cmdlfviking.c b/client/src/cmdlfviking.c
index 0da4bcbd5..0727a7f96 100644
--- a/client/src/cmdlfviking.c
+++ b/client/src/cmdlfviking.c
@@ -54,7 +54,18 @@ int demodViking(bool verbose) {
 }
 
 static int CmdVikingDemod(const char *Cmd) {
-    (void)Cmd;
+    CLIParserContext *ctx;
+    CLIParserInit(&ctx, "lf viking demod",
+                  "Try to find Viking AM preamble, if found decode / descramble data",
+                  "lf viking demod"
+                 );
+
+    void *argtable[] = {
+        arg_param_begin,
+        arg_param_end
+    };
+    CLIExecWithReturn(ctx, Cmd, argtable, true);
+    CLIParserFree(ctx);
     return demodViking(true);
 }
 
diff --git a/client/src/cmdlfvisa2000.c b/client/src/cmdlfvisa2000.c
index 2e57202c2..582b29686 100644
--- a/client/src/cmdlfvisa2000.c
+++ b/client/src/cmdlfvisa2000.c
@@ -133,7 +133,18 @@ int demodVisa2k(bool verbose) {
 }
 
 static int CmdVisa2kDemod(const char *Cmd) {
-    (void)Cmd; // Cmd is not used so far
+    CLIParserContext *ctx;
+    CLIParserInit(&ctx, "lf visa2000 demod",
+                  "Try to find visa2000 preamble, if found decode / descramble data",
+                  "lf visa2000 demod"
+                 );
+
+    void *argtable[] = {
+        arg_param_begin,
+        arg_param_end
+    };
+    CLIExecWithReturn(ctx, Cmd, argtable, true);
+    CLIParserFree(ctx);
     return demodVisa2k(true);
 }