diff --git a/include/PSUEvent.hpp b/include/PSUEvent.hpp
index f5bc155..50f6359 100644
--- a/include/PSUEvent.hpp
+++ b/include/PSUEvent.hpp
@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 
-class PSUSubEvent
+class PSUSubEvent : public std::enable_shared_from_this<PSUSubEvent>
 {
   public:
     PSUSubEvent(std::shared_ptr<sdbusplus::asio::dbus_interface> eventInterface,
@@ -40,6 +40,7 @@
     std::shared_ptr<std::set<std::string>> asserts;
     std::shared_ptr<std::set<std::string>> combineEvent;
     std::shared_ptr<bool> assertState;
+    void setupRead(void);
 
   private:
     int value = 0;
@@ -49,8 +50,7 @@
     std::string eventName;
     std::string groupEventName;
     boost::asio::deadline_timer waitTimer;
-    boost::asio::streambuf readBuf;
-    void setupRead(void);
+    std::shared_ptr<boost::asio::streambuf> readBuf;
     void handleResponse(const boost::system::error_code& err);
     void updateValue(const int& newValue);
     void beep(const uint8_t& beepPriority);
@@ -84,7 +84,7 @@
     sdbusplus::asio::object_server& objServer;
     std::shared_ptr<sdbusplus::asio::dbus_interface> eventInterface;
     boost::container::flat_map<std::string,
-                               std::vector<std::unique_ptr<PSUSubEvent>>>
+                               std::vector<std::shared_ptr<PSUSubEvent>>>
         events;
     std::vector<std::shared_ptr<std::set<std::string>>> asserts;
     std::vector<std::shared_ptr<bool>> states;
diff --git a/include/PSUSensor.hpp b/include/PSUSensor.hpp
index 98ec3d7..811250d 100644
--- a/include/PSUSensor.hpp
+++ b/include/PSUSensor.hpp
@@ -8,7 +8,7 @@
 #include <sdbusplus/asio/object_server.hpp>
 #include <string>
 
-class PSUSensor : public Sensor
+class PSUSensor : public Sensor, public std::enable_shared_from_this<PSUSensor>
 {
   public:
     PSUSensor(const std::string& path, const std::string& objectType,
@@ -20,16 +20,16 @@
               std::string& sensorTypeName, unsigned int factor, double max,
               double min, const std::string& label, size_t tSize);
     ~PSUSensor();
+    void setupRead(void);
 
   private:
     sdbusplus::asio::object_server& objServer;
     boost::asio::posix::stream_descriptor inputDev;
     boost::asio::deadline_timer waitTimer;
-    boost::asio::streambuf readBuf;
+    std::shared_ptr<boost::asio::streambuf> readBuf;
     std::string path;
     size_t errCount;
     unsigned int sensorFactor;
-    void setupRead(void);
     void handleResponse(const boost::system::error_code& err);
     void checkThresholds(void) override;