diff --git a/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h b/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h
index 20789772e5..b04d336c51 100644
--- a/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h
+++ b/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h
@@ -97,7 +97,11 @@ int32_t       dmMarkWrapper(SMgmtWrapper *pWrapper);
 void          dmReleaseWrapper(SMgmtWrapper *pWrapper);
 int32_t       dmInitVars(SDnode *pDnode);
 void          dmClearVars(SDnode *pDnode);
+#if defined(TD_MODULE_OPTIMIZE) || !defined(TD_ENTERPRISE)
+int32_t       dmInitModule(SDnode *pDnode, SMgmtWrapper *wrappers);
+#else
 int32_t       dmInitModule(SDnode *pDnode);
+#endif
 bool          dmRequireNode(SDnode *pDnode, SMgmtWrapper *pWrapper);
 SMgmtInputOpt dmBuildMgmtInputOpt(SMgmtWrapper *pWrapper);
 void          dmSetStatus(SDnode *pDnode, EDndRunStatus stype);
@@ -119,7 +123,11 @@ int32_t dmInitStatusClient(SDnode *pDnode);
 void    dmCleanupClient(SDnode *pDnode);
 void    dmCleanupStatusClient(SDnode *pDnode);
 SMsgCb  dmGetMsgcb(SDnode *pDnode);
+#if defined(TD_MODULE_OPTIMIZE) || !defined(TD_ENTERPRISE)
+int32_t dmInitMsgHandle(SDnode *pDnode, SMgmtWrapper *wrappers);
+#else
 int32_t dmInitMsgHandle(SDnode *pDnode);
+#endif
 int32_t dmProcessNodeMsg(SMgmtWrapper *pWrapper, SRpcMsg *pMsg);
 
 // dmMonitor.c
diff --git a/source/dnode/mgmt/node_mgmt/src/dmMgmt.c b/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
index fa0f9149ab..e9ce4c4f89 100644
--- a/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
@@ -66,9 +66,15 @@ int32_t dmInitDnode(SDnode *pDnode) {
     goto _OVER;
   }
 
+#if defined(TD_MODULE_OPTIMIZE) || !defined(TD_ENTERPRISE)
+  if (dmInitModule(pDnode, pDnode->wrappers) != 0) {
+    goto _OVER;
+  }
+#else
   if (dmInitModule(pDnode) != 0) {
     goto _OVER;
   }
+#endif
 
   indexInit(tsNumOfCommitThreads);
   streamMetaInit();
diff --git a/source/dnode/mgmt/node_mgmt/src/dmTransport.c b/source/dnode/mgmt/node_mgmt/src/dmTransport.c
index ce6b21dd56..b7381891d1 100644
--- a/source/dnode/mgmt/node_mgmt/src/dmTransport.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmTransport.c
@@ -251,6 +251,33 @@ _OVER:
   dmReleaseWrapper(pWrapper);
 }
 
+#if defined(TD_MODULE_OPTIMIZE) || !defined(TD_ENTERPRISE)
+int32_t dmInitMsgHandle(SDnode *pDnode, SMgmtWrapper *wrappers) {
+  SDnodeTrans *pTrans = &pDnode->trans;
+
+  for (EDndNodeType ntype = DNODE; ntype < NODE_END; ++ntype) {
+    SMgmtWrapper *pWrapper = wrappers + ntype;
+    SArray       *pArray = (*pWrapper->func.getHandlesFp)();
+    if (pArray == NULL) return -1;
+
+    for (int32_t i = 0; i < taosArrayGetSize(pArray); ++i) {
+      SMgmtHandle  *pMgmt = taosArrayGet(pArray, i);
+      SDnodeHandle *pHandle = &pTrans->msgHandles[TMSG_INDEX(pMgmt->msgType)];
+      if (pMgmt->needCheckVgId) {
+        pHandle->needCheckVgId = pMgmt->needCheckVgId;
+      }
+      if (!pMgmt->needCheckVgId) {
+        pHandle->defaultNtype = ntype;
+      }
+      pWrapper->msgFps[TMSG_INDEX(pMgmt->msgType)] = pMgmt->msgFp;
+    }
+
+    taosArrayDestroy(pArray);
+  }
+
+  return 0;
+}
+#else
 int32_t dmInitMsgHandle(SDnode *pDnode) {
   SDnodeTrans *pTrans = &pDnode->trans;
 
@@ -276,6 +303,7 @@ int32_t dmInitMsgHandle(SDnode *pDnode) {
 
   return 0;
 }
+#endif
 
 static inline int32_t dmSendReq(const SEpSet *pEpSet, SRpcMsg *pMsg) {
   SDnode *pDnode = dmInstance();