diff --git a/src/client.rs b/src/client.rs
index a49f8f9..9704c57 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -279,6 +279,7 @@ pub enum ClientMessage {
         state: StatePath
     },
     FetchMessages {
+        room_id: RoomId,
         count: u64,
         end: MessageId,
     }
@@ -389,7 +390,9 @@ pub enum ServerMessage {
     // Returned on permission read
     StatePermission(StatePath,crate::state::PermissionTable),
     // Returned on subscribe, forwards state change message to client
-    StateChange(TaggedMessage),
+    StatePub(TaggedMessage),
+    MessagePub(TaggedMessage),
+    Post(TaggedMessage),
     OkMessage(MessageId),
     Token(String),
     Ok,
diff --git a/src/message.rs b/src/message.rs
index 82870b2..99a1b20 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -12,7 +12,7 @@ pub enum VerificationError {
 
 //Monotonically increasing messageID
 #[derive(Serialize,Deserialize,Debug,Clone)]
-pub struct MessageId(u64);
+pub struct MessageId(pub u64);
 
 #[derive(Serialize,Deserialize,Clone,Debug)]
 pub struct TaggedMessage {