diff --git a/main.cpp b/main.cpp
index d96d1cd..f6cdeec 100644
--- a/main.cpp
+++ b/main.cpp
@@ -17,13 +17,16 @@
 #include "message.hpp"
 #include "message_handler.hpp"
 #include "provider_registration.hpp"
-#include "sessions_manager.hpp"
 #include "socket_channel.hpp"
 
 // Tuple of Global Singletons
 session::Manager manager;
 command::Table table;
-std::tuple<session::Manager&, command::Table&> singletonPool(manager, table);
+eventloop::EventLoop loop;
+sol::Manager solManager;
+
+std::tuple<session::Manager&, command::Table&, eventloop::EventLoop&,
+        sol::Manager&> singletonPool(manager, table, loop, solManager);
 
 sd_bus* bus = nullptr;
 FILE* ipmidbus = nullptr;
diff --git a/main.hpp b/main.hpp
index cfb80c6..2b5f509 100644
--- a/main.hpp
+++ b/main.hpp
@@ -4,9 +4,14 @@
 
 #include <command_table.hpp>
 #include <sessions_manager.hpp>
+#include "sol/sol_manager.hpp"
+#include "sd_event_loop.hpp"
 
-extern std::tuple<session::Manager&, command::Table&> singletonPool;
+extern std::tuple<session::Manager&, command::Table&,
+                  eventloop::EventLoop&, sol::Manager&> singletonPool;
 
 // Select call timeout is set arbitarily set to 30 sec
 static constexpr size_t SELECT_CALL_TIMEOUT = 30;
 static const auto IPMI_STD_PORT = 623;
+
+extern sd_bus* bus;