diff --git a/src/types/entities/voice_state.rs b/src/types/entities/voice_state.rs
index dd0ab15..b4d4ae5 100644
--- a/src/types/entities/voice_state.rs
+++ b/src/types/entities/voice_state.rs
@@ -12,7 +12,7 @@ use crate::types::{
 pub struct VoiceState {
     pub guild_id: Option<Snowflake>,
     pub guild: Option<Guild>,
-    pub channel_id: Snowflake,
+    pub channel_id: Option<Snowflake>,
     pub user_id: Snowflake,
     pub member: Option<GuildMember>,
     pub session_id: Snowflake,
diff --git a/src/types/events/message.rs b/src/types/events/message.rs
index 24eb0fa..94d9336 100644
--- a/src/types/events/message.rs
+++ b/src/types/events/message.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::types::{
     entities::{Emoji, GuildMember, Message, User},
-    utils::Snowflake,
+    utils::Snowflake, PublicUser,
 };
 
 use super::WebSocketEvent;
@@ -32,31 +32,9 @@ pub struct MessageCreate {
 #[derive(Debug, Serialize, Deserialize, Default)]
 /// See https://discord.com/developers/docs/topics/gateway-events#message-create-message-create-extra-fields
 pub struct MessageCreateUser {
-    pub id: String,
-    username: String,
-    discriminator: String,
-    avatar: Option<String>,
-    bot: Option<bool>,
-    system: Option<bool>,
-    mfa_enabled: Option<bool>,
-    accent_color: Option<String>,
-    locale: Option<String>,
-    verified: Option<bool>,
-    email: Option<String>,
-    premium_since: Option<String>,
-    premium_type: Option<i8>,
-    pronouns: Option<String>,
-    public_flags: Option<i32>,
-    banner: Option<String>,
-    bio: Option<String>,
-    theme_colors: Option<Vec<i32>>,
-    phone: Option<String>,
-    nsfw_allowed: Option<bool>,
-    premium: Option<bool>,
-    purchased_flags: Option<i32>,
-    premium_usage_flags: Option<i32>,
-    disabled: Option<bool>,
-    member: GuildMember
+    #[serde(flatten)]
+    user: PublicUser,
+    member: Option<GuildMember>
 }
 
 impl WebSocketEvent for MessageCreate {}
@@ -67,7 +45,7 @@ pub struct MessageUpdate {
     message: Message,
     guild_id: Option<String>,
     member: Option<GuildMember>,
-    mentions: Option<Vec<(User, GuildMember)>>, // Not sure if this is correct: https://discord.com/developers/docs/topics/gateway-events#message-create
+    mentions: Option<Vec<MessageCreateUser>>,
 }
 
 impl WebSocketEvent for MessageUpdate {}