diff --git a/monitor/main.cpp b/monitor/main.cpp
index 52d5bdb..84f2fcc 100644
--- a/monitor/main.cpp
+++ b/monitor/main.cpp
@@ -70,6 +70,23 @@
     // Retrieve and set trust groups within the trust manager
     auto trust =
         std::make_unique<phosphor::fan::trust::Manager>(getTrustGrps(jsonObj));
+
+    // Retrieve fan definitions and create fan objects to be monitored
+    for (const auto& fanDef : getFanDefs(jsonObj))
+    {
+        // Check if a condition exists on the fan
+        auto condition = std::get<conditionField>(fanDef);
+        if (condition)
+        {
+            // Condition exists, skip adding fan if it fails
+            if (!(*condition)(bus))
+            {
+                continue;
+            }
+        }
+        fans.emplace_back(
+            std::make_unique<Fan>(mode, bus, event, trust, fanDef));
+    }
 #else
     auto trust = std::make_unique<phosphor::fan::trust::Manager>(trustGroups);