diff --git a/apphandler.cpp b/apphandler.cpp
index a12e220..030031c 100644
--- a/apphandler.cpp
+++ b/apphandler.cpp
@@ -1243,12 +1243,14 @@
                           ipmi::Privilege::Operator, ipmiAppResetWatchdogTimer);
 
     // <Set Watchdog Timer>
-    ipmi_register_callback(NETFUN_APP, IPMI_CMD_SET_WD, NULL,
-                           ipmi_app_watchdog_set, PRIVILEGE_OPERATOR);
+    ipmi::registerHandler(ipmi::prioOpenBmcBase, ipmi::netFnApp,
+                          ipmi::app::cmdSetWatchdogTimer,
+                          ipmi::Privilege::Operator, ipmiSetWatchdogTimer);
 
     // <Get Watchdog Timer>
-    ipmi_register_callback(NETFUN_APP, IPMI_CMD_GET_WD, NULL,
-                           ipmi_app_watchdog_get, PRIVILEGE_OPERATOR);
+    ipmi::registerHandler(ipmi::prioOpenBmcBase, ipmi::netFnApp,
+                          ipmi::app::cmdGetWatchdogTimer,
+                          ipmi::Privilege::Operator, ipmiGetWatchdogTimer);
 
     // <Get Self Test Results>
     ipmi::registerHandler(ipmi::prioOpenBmcBase, ipmi::netFnApp,