diff --git a/platform-mc/sensor_manager.hpp b/platform-mc/sensor_manager.hpp
index c82b336..ce61d8f 100644
--- a/platform-mc/sensor_manager.hpp
+++ b/platform-mc/sensor_manager.hpp
@@ -19,6 +19,8 @@
 namespace platform_mc
 {
 
+using namespace pldm::pdr;
+
 /**
  * @brief SensorManager
  *
@@ -117,9 +119,8 @@
     /** @brief Available state for pldm request of terminus */
     std::map<pldm_tid_t, Availability> availableState;
 
-    /** @brief round robin sensor list */
-    std::map<pldm_tid_t, std::queue<std::shared_ptr<NumericSensor>>>
-        roundRobinSensors;
+    /** @brief Round robin sensor iter of terminus */
+    std::map<pldm_tid_t, SensorID> roundRobinSensorItMap;
 
     /** @brief pointer to Manager */
     Manager* manager;