diff --git a/src/main/java/messagerosa/core/model/XMessage.java b/src/main/java/messagerosa/core/model/XMessage.java
index 91509f7..68d7e7a 100644
--- a/src/main/java/messagerosa/core/model/XMessage.java
+++ b/src/main/java/messagerosa/core/model/XMessage.java
@@ -5,6 +5,7 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Map;
+import java.util.UUID;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -45,6 +46,12 @@ public enum MessageType {
 		BROADCAST_TEXT
 	}
 
+	private UUID sessionId;
+
+	private String ownerOrgId;
+
+	private UUID ownerId;
+
 	//Persist
 	private String app;