diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9856b1fb2886ad18603cb92ce4357416800e61f6..e10449de202f38e8817f8babd3fb4e18bc4c46e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,13 +10,19 @@ set(DAPSDK_MODULES "")
 
 if(NOT DEFINED CELLFRAME_MODULES)
     include (cmake/OS_Detection.cmake)
+    #if(LINUX)
+    #    set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic srv-vpn")
+    #elseif(WIN32 OR BSD OR DARWIN OR ANDROID)
+    #    set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
+    #else()
+    #    set(CELLFRAME_MODULES "core chains network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
+    #endif()
+    set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake-pos-delegate srv-stake-lock srv-xchange")
+
     if(LINUX)
-        set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic srv-vpn")
-    elseif(WIN32 OR BSD OR DARWIN OR ANDROID)
-        set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
-    else()
-        set(CELLFRAME_MODULES "core chains network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
+        set(CELLFRAME_MODULES "${CELLFRAME_MODULES} modules-dynamic srv-vpn")
     endif()
+
 endif()
 
 message("Cellframe modules: ${CELLFRAME_MODULES}")
@@ -231,9 +237,15 @@ if (CELLFRAME_MODULES MATCHES "srv-xchange")
 endif()
 
 # Enable service of delegated stake
-if (CELLFRAME_MODULES MATCHES "srv-stake")
-    message("[+] Module 'srv-stake'")
-    set(CELLFRAME_LIBS ${CELLFRAME_LIBS} dap_chain_net_srv_stake)
+if (CELLFRAME_MODULES MATCHES "srv-stake-pos-delegate")
+    message("[+] Module 'srv-stake-pos-delegate'")
+    set(CELLFRAME_LIBS ${CELLFRAME_LIBS} dap_chain_net_srv_stake_pos_delegate)
+endif()
+
+# Enable service of stake token
+if (CELLFRAME_MODULES MATCHES "srv-stake-lock")
+    message("[+] Module 'srv-stake-lock'")
+    set(CELLFRAME_LIBS ${CELLFRAME_LIBS} dap_chain_net_srv_stake_lock)
 endif()
 
 # Enable service for dynamic modules
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 72ceb6de6d78231bf37c02397d25b2fe176b2071..6cb243e903d6251831350b1db60f993ffd5ca33b 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -108,9 +108,14 @@ if (CELLFRAME_MODULES MATCHES "srv-xchange")
     add_subdirectory(service/xchange)
 endif()
 
-# Service of delegated stake
-if (CELLFRAME_MODULES MATCHES "srv-stake")
-    add_subdirectory(service/stake)
+# Service for token staking
+if (CELLFRAME_MODULES MATCHES "srv-stake-lock")
+    add_subdirectory(service/stake_lock)
+endif()
+
+# Service for PoS stake delegation
+if (CELLFRAME_MODULES MATCHES "srv-stake-pos-delegate")
+    add_subdirectory(service/stake_pos_delegate)
 endif()
 
 # Support for dynamic modules