diff --git a/psu.hpp b/psu.hpp
index f0d5775..b022881 100644
--- a/psu.hpp
+++ b/psu.hpp
@@ -18,6 +18,9 @@
 
 #include <ipmid/api.h>
 
+#include <ipmid/api-types.hpp>
+#include <vector>
+
 namespace google
 {
 namespace ipmi
@@ -25,24 +28,17 @@
 
 struct PsuResetRequest
 {
-    uint8_t subcommand;
     // Delay in seconds.
     uint32_t delay;
 } __attribute__((packed));
 
-struct PsuResetOnShutdownRequest
-{
-    uint8_t subcommand;
-} __attribute__((packed));
-
 // Set a time-delayed PSU hard reset.
-ipmi_ret_t psuHardReset(const uint8_t* reqBuf, uint8_t* replyBuf,
-                        size_t* dataLen, const HandlerInterface* handler);
+Resp psuHardReset(const std::vector<std::uint8_t>& data,
+                  const HandlerInterface* handler);
 
 // Arm for PSU hard reset on host shutdown.
-ipmi_ret_t psuHardResetOnShutdown(const uint8_t* reqBuf, uint8_t* replyBuf,
-                                  size_t* dataLen,
-                                  const HandlerInterface* handler);
+Resp psuHardResetOnShutdown(const std::vector<std::uint8_t>& data,
+                            const HandlerInterface* handler);
 
 } // namespace ipmi
 } // namespace google