diff --git a/occ_dbus.cpp b/occ_dbus.cpp
index aaaf1c6..6bc1a46 100644
--- a/occ_dbus.cpp
+++ b/occ_dbus.cpp
@@ -28,7 +28,7 @@
         return false;
     }
 
-    if (sensors.find(path) == sensors.end())
+    if (!sensors.contains(path))
     {
         sensors.emplace(
             path, std::make_unique<SensorIntf>(utils::getBus(), path.c_str()));
@@ -55,7 +55,7 @@
         return false;
     }
 
-    if (sensors.find(path) == sensors.end())
+    if (!sensors.contains(path))
     {
         sensors.emplace(
             path, std::make_unique<SensorIntf>(utils::getBus(), path.c_str()));
@@ -82,7 +82,7 @@
         return false;
     }
 
-    if (sensors.find(path) == sensors.end())
+    if (!sensors.contains(path))
     {
         sensors.emplace(
             path, std::make_unique<SensorIntf>(utils::getBus(), path.c_str()));
@@ -109,7 +109,7 @@
         return false;
     }
 
-    if (sensors.find(path) == sensors.end())
+    if (!sensors.contains(path))
     {
         sensors.emplace(
             path, std::make_unique<SensorIntf>(utils::getBus(), path.c_str()));
@@ -153,7 +153,7 @@
         return false;
     }
 
-    if (operationalStatus.find(path) == operationalStatus.end())
+    if (!operationalStatus.contains(path))
     {
         operationalStatus.emplace(path, std::make_unique<OperationalStatusIntf>(
                                             utils::getBus(), path.c_str()));