diff --git a/dap-sdk b/dap-sdk
index 1df644274f2d0aecea9cc46d2c691035ec01a9c3..ff8478aa04fa94540016fee0038db4b63965d0d1 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit 1df644274f2d0aecea9cc46d2c691035ec01a9c3
+Subproject commit ff8478aa04fa94540016fee0038db4b63965d0d1
diff --git a/modules/net/dap_chain_node_cli.c b/modules/net/dap_chain_node_cli.c
index 2f6fe124db9572ca9ae88cbd581e2603493bb0af..0387a9c7b0b51a0ec6be660712cba84a58fad1ce 100644
--- a/modules/net/dap_chain_node_cli.c
+++ b/modules/net/dap_chain_node_cli.c
@@ -231,7 +231,7 @@ int dap_chain_node_cli_init(dap_config_t * g_config)
                             "token_emit { sign -emission <hash> | -token <mempool_token_ticker> -emission_value <value> -addr <addr> } "
                             "[-chain_emission <chain_name>] -net <net_name> -certs <cert_list>\n");
 
-    dap_cli_server_cmd_add("mempool", com_mempool, "Command for working with mempool",
+    dap_cli_cmd_t *l_cmd_mempool = dap_cli_server_cmd_add("mempool", com_mempool, "Command for working with mempool",
                            "mempool list -net <net_name> [-chain <chain_name>] [-addr <addr>] [-brief] [-limit] [-offset]\n"
                            "\tList mempool (entries or transaction) for (selected chain network or wallet)\n"
                            "mempool check -net <net_name> [-chain <chain_name>] -datum <datum_hash>\n"
@@ -249,15 +249,13 @@ int dap_chain_node_cli_init(dap_config_t * g_config)
                            "\tAdd pubic certificate into the mempool to prepare its way to chains\n"
                            "mempool count -net <net_name> [-chain <chain_name>]\n"
                            "\tDisplays the number of elements in the mempool of a given network.");
-    dap_cli_cmd_t *l_cmd_mempool = dap_cli_server_cmd_find("mempool");
-    dap_cli_server_alias_add("mempool_list", "list", l_cmd_mempool);
-    dap_cli_server_alias_add("mempool_check", "check", l_cmd_mempool);
-    dap_cli_server_alias_add("mempool_proc", "proc", l_cmd_mempool);
-    dap_cli_server_alias_add("mempool_proc_all", "proc_all", l_cmd_mempool);
-    dap_cli_server_alias_add("mempool_delete", "delete", l_cmd_mempool);
-    dap_cli_server_alias_add("mempool_add_ca", "add_ca", l_cmd_mempool);
-    dap_cli_server_alias_add("chain_ca_copy", "add_ca", l_cmd_mempool);
-
+    dap_cli_server_alias_add(l_cmd_mempool, "list", "mempool_list");
+    dap_cli_server_alias_add(l_cmd_mempool, "check", "mempool_check");
+    dap_cli_server_alias_add(l_cmd_mempool, "proc", "mempool_proc");
+    dap_cli_server_alias_add(l_cmd_mempool, "proc_all", "mempool_proc_all");
+    dap_cli_server_alias_add(l_cmd_mempool, "delete", "mempool_delete");
+    dap_cli_server_alias_add(l_cmd_mempool, "add_ca", "mempool_add_ca");
+    dap_cli_server_alias_add(l_cmd_mempool, "add_ca", "chain_ca_copy");
 
     dap_cli_server_cmd_add ("chain_ca_pub", com_chain_ca_pub,
                                         "Add pubic certificate into the mempool to prepare its way to chains",
diff --git a/modules/service/voting/dap_chain_net_srv_voting.c b/modules/service/voting/dap_chain_net_srv_voting.c
index f01d67fb0a40dad0085dc271800f179f976ef38d..fb8f37c799ba841765a9fc03eb37fc23757f4fda 100644
--- a/modules/service/voting/dap_chain_net_srv_voting.c
+++ b/modules/service/voting/dap_chain_net_srv_voting.c
@@ -116,7 +116,8 @@ int dap_chain_net_srv_voting_init()
 {
     pthread_rwlock_init(&s_votings_rwlock, NULL);
     dap_chain_ledger_voting_verificator_add(s_datum_tx_voting_verification_callback, s_datum_tx_voting_verification_delete_callback);
-    dap_cli_server_cmd_add("poll", s_cli_voting, "Voting/poll commands",
+    dap_cli_cmd_t *l_poll_cmd = dap_cli_server_cmd_add(
+                "poll", s_cli_voting, "Voting/poll commands",
                             "poll create -net <net_name> -question <\"Question_string\"> -options <\"Option0\", \"Option1\" ... \"OptionN\"> [-expire <poll_expire_time_in_RCF822>]"
                                            " [-max_votes_count <Votes_count>] [-delegated_key_required] [-vote_changing_allowed] -fee <value_datoshi> -w <fee_wallet_name> [-token <ticker>]\n"
                             "poll vote -net <net_name> -hash <poll_hash> -option_idx <option_index> [-cert <delegate_cert_name>] -fee <value_datoshi> -w <fee_wallet_name>\n"
@@ -125,7 +126,7 @@ int dap_chain_net_srv_voting_init()
                             "Hint:\n"
                             "\texample value_coins (only natural) 1.0 123.4567\n"
                             "\texample value_datoshi (only integer) 1 20 0.4321e+4\n");
-    
+    dap_cli_server_alias_add(l_poll_cmd, NULL, "voting");
     dap_chain_net_srv_uid_t l_uid = { .uint64 = DAP_CHAIN_NET_SRV_VOTING_ID };
     dap_ledger_service_add(l_uid, "poll", s_tag_check_voting);