diff --git a/src/lib/eina/eina_debug.c b/src/lib/eina/eina_debug.c
index 56253f7d9d..4517c6e3dd 100644
--- a/src/lib/eina/eina_debug.c
+++ b/src/lib/eina/eina_debug.c
@@ -1047,6 +1047,19 @@ eina_debug_dispatch(Eina_Debug_Session *session, void *buffer)
    return ret;
 }
 
+EAPI void
+eina_debug_session_data_set(Eina_Debug_Session *session, void *data)
+{
+   if (session) session->data = data;
+}
+
+EAPI void *
+eina_debug_session_data_get(Eina_Debug_Session *session)
+{
+   if (session) return session->data;
+   else return NULL;
+}
+
 static void
 _signal_handler(int sig EINA_UNUSED,
       siginfo_t *si EINA_UNUSED, void *foo EINA_UNUSED)
diff --git a/src/lib/eina/eina_debug.h b/src/lib/eina/eina_debug.h
index a49bdade51..a7caeca98f 100644
--- a/src/lib/eina/eina_debug.h
+++ b/src/lib/eina/eina_debug.h
@@ -237,6 +237,24 @@ EAPI Eina_Debug_Dispatch_Cb eina_debug_session_dispatch_get(Eina_Debug_Session *
  */
 EAPI Eina_Debug_Error eina_debug_dispatch(Eina_Debug_Session *session, void *buffer);
 
+/**
+ * @brief Set data to a session
+ *
+ * @param session the session
+ * @param data the data to set
+ *
+ */
+EAPI void eina_debug_session_data_set(Eina_Debug_Session *session, void *data);
+
+/**
+ * @brief Get the data attached to a session
+ *
+ * @param session the session
+ *
+ * @return the data of the session
+ */
+EAPI void *eina_debug_session_data_get(Eina_Debug_Session *session);
+
 /**
  * @brief Register opcodes to a session
  *