diff --git a/micro_ros_agent/include/agent/Agent.hpp b/micro_ros_agent/include/agent/Agent.hpp
index 3f5c1c0..3035a38 100644
--- a/micro_ros_agent/include/agent/Agent.hpp
+++ b/micro_ros_agent/include/agent/Agent.hpp
@@ -53,9 +53,9 @@ public:
 private:
     bool initialized = false;
     eprosima::uxr::AgentInstance& xrce_dds_agent_instance_;
-    std::map<eprosima::fastdds::dds::DomainId_t, std::shared_ptr<graph_manager::GraphManager>> graph_manager_map_;
+    std::map<eprosima::fastdds::dds::DomainId_t, graph_manager::GraphManager> graph_manager_map_;
 
-    std::shared_ptr<graph_manager::GraphManager> find_or_create_graph_manager(eprosima::fastdds::dds::DomainId_t domain_id);
+    graph_manager::GraphManager* find_or_create_graph_manager(eprosima::fastdds::dds::DomainId_t domain_id);
 };
 
 }  // namespace agent