diff --git a/disco/types/guild.py b/disco/types/guild.py
index a4cc0b4..f8853ee 100644
--- a/disco/types/guild.py
+++ b/disco/types/guild.py
@@ -153,6 +153,8 @@ class GuildMember(SlottedModel):
         When this user joined the guild.
     roles : list(snowflake)
         Roles this member is part of.
+    premium_since : datetime
+        When this users subscribed to the guild's premium
     """
     user = Field(User)
     guild_id = Field(snowflake)
@@ -161,6 +163,7 @@ class GuildMember(SlottedModel):
     deaf = Field(bool)
     joined_at = Field(datetime)
     roles = ListField(snowflake)
+    premium_since = Field(datetime)
 
     def __str__(self):
         return self.user.__str__()
@@ -300,6 +303,10 @@ class Guild(SlottedModel, Permissible):
         All of the guild's emojis.
     voice_states : dict(str, :class:`disco.types.voice.VoiceState`)
         All of the guild's voice states.
+    premium_tier : int
+        Guild's premium tier.
+    premium_subscription_count: int
+        The amount of users subscribed to the guild's premium.
     """
     id = Field(snowflake)
     owner_id = Field(snowflake)
@@ -324,6 +331,8 @@ class Guild(SlottedModel, Permissible):
     emojis = AutoDictField(GuildEmoji, 'id')
     voice_states = AutoDictField(VoiceState, 'session_id')
     member_count = Field(int)
+    premium_tier = Field(int)
+    premium_subscription_count = Field(int)
 
     def __init__(self, *args, **kwargs):
         super(Guild, self).__init__(*args, **kwargs)
@@ -507,11 +516,15 @@ class Guild(SlottedModel, Permissible):
     def get_emoji(self, emoji):
         return self.client.api.guilds_emojis_get(self.id, emoji)
 
-    def get_icon_url(self, fmt='webp', size=1024):
+    def get_icon_url(self, fmt=None, size=1024):
         if not self.icon:
             return ''
-
-        return 'https://cdn.discordapp.com/icons/{}/{}.{}?size={}'.format(self.id, self.icon, fmt, size)
+        if fmt is not None:
+            return 'https://cdn.discordapp.com/icons/{}/{}.{}?size={}'.format(self.id, self.icon, fmt, size)
+        if self.icon.startswith('a_'):
+            return 'https://cdn.discordapp.com/avatars/{}/{}.gif?size={}'.format(self.id, self.icon, size)
+        else:
+            return 'https://cdn.discordapp.com/avatars/{}/{}.webp?size={}'.format(self.id, self.icon, size)
 
     def get_splash_url(self, fmt='webp', size=1024):
         if not self.splash:
diff --git a/disco/types/message.py b/disco/types/message.py
index 01b020c..2b1aa35 100644
--- a/disco/types/message.py
+++ b/disco/types/message.py
@@ -22,6 +22,10 @@ class MessageType(object):
     CHANNEL_ICON_CHANGE = 5
     PINS_ADD = 6
     GUILD_MEMBER_JOIN = 7
+    USER_PREMIUM_GUILD_SUBSCRIPTION = 8
+    USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_1 = 9
+    USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_2 = 10
+    USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_3 = 11
 
 
 class Emoji(SlottedModel):