diff --git a/src/Discord.Net.Core/Discord.Net.Core.xml b/src/Discord.Net.Core/Discord.Net.Core.xml
index ca9e9696f..13bbc8eb5 100644
--- a/src/Discord.Net.Core/Discord.Net.Core.xml
+++ b/src/Discord.Net.Core/Discord.Net.Core.xml
@@ -10089,6 +10089,11 @@
                 Gets the user that created this webhook.
             </summary>
         </member>
+        <member name="P:Discord.IWebhook.ApplicationId">
+            <summary>
+                Gets the ID of the application owning this webhook.
+            </summary>
+        </member>
         <member name="M:Discord.IWebhook.ModifyAsync(System.Action{Discord.WebhookProperties},Discord.RequestOptions)">
             <summary>
                 Modifies this webhook.
diff --git a/src/Discord.Net.Core/Entities/Webhooks/IWebhook.cs b/src/Discord.Net.Core/Entities/Webhooks/IWebhook.cs
index b2d017316..d5bc70d71 100644
--- a/src/Discord.Net.Core/Entities/Webhooks/IWebhook.cs
+++ b/src/Discord.Net.Core/Entities/Webhooks/IWebhook.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 
 namespace Discord
@@ -49,6 +49,11 @@ namespace Discord
         /// </summary>
         IUser Creator { get; }
 
+        /// <summary>
+        ///     Gets the ID of the application owning this webhook.
+        /// </summary>
+        ulong? ApplicationId { get; }
+
         /// <summary>
         ///     Modifies this webhook.
         /// </summary>
diff --git a/src/Discord.Net.Rest/API/Common/Webhook.cs b/src/Discord.Net.Rest/API/Common/Webhook.cs
index cbd5fdad5..ff1dca9bd 100644
--- a/src/Discord.Net.Rest/API/Common/Webhook.cs
+++ b/src/Discord.Net.Rest/API/Common/Webhook.cs
@@ -21,5 +21,7 @@ namespace Discord.API
 
         [JsonProperty("user")]
         public Optional<User> Creator { get; set; }
+        [JsonProperty("application_id")]
+        public Optional<ulong> ApplicationId { get; set; }
     }
 }
diff --git a/src/Discord.Net.Rest/API/Rest/ModifyWebhookMessageParams.cs b/src/Discord.Net.Rest/API/Rest/ModifyWebhookMessageParams.cs
index ba8fcbb4e..8298ff19c 100644
--- a/src/Discord.Net.Rest/API/Rest/ModifyWebhookMessageParams.cs
+++ b/src/Discord.Net.Rest/API/Rest/ModifyWebhookMessageParams.cs
@@ -12,5 +12,7 @@ namespace Discord.API.Rest
         public Optional<Embed[]> Embeds { get; set; }
         [JsonProperty("allowed_mentions")]
         public Optional<AllowedMentions> AllowedMentions { get; set; }
+        [JsonProperty("components")]
+        public Optional<API.ActionRowComponent[]> Components { get; set; }
     }
 }
diff --git a/src/Discord.Net.Rest/Discord.Net.Rest.xml b/src/Discord.Net.Rest/Discord.Net.Rest.xml
index c8865f786..e92b92725 100644
--- a/src/Discord.Net.Rest/Discord.Net.Rest.xml
+++ b/src/Discord.Net.Rest/Discord.Net.Rest.xml
@@ -4766,6 +4766,9 @@
         <member name="P:Discord.Rest.RestWebhook.Creator">
             <inheritdoc />
         </member>
+        <member name="P:Discord.Rest.RestWebhook.ApplicationId">
+            <inheritdoc />
+        </member>
         <member name="P:Discord.Rest.RestWebhook.CreatedAt">
             <inheritdoc />
         </member>
diff --git a/src/Discord.Net.Rest/Entities/Webhooks/RestWebhook.cs b/src/Discord.Net.Rest/Entities/Webhooks/RestWebhook.cs
index 9baddf003..0d24f08df 100644
--- a/src/Discord.Net.Rest/Entities/Webhooks/RestWebhook.cs
+++ b/src/Discord.Net.Rest/Entities/Webhooks/RestWebhook.cs
@@ -24,6 +24,8 @@ namespace Discord.Rest
         public ulong? GuildId { get; private set; }
         /// <inheritdoc />
         public IUser Creator { get; private set; }
+        /// <inheritdoc />
+        public ulong? ApplicationId { get; private set; }
 
         /// <inheritdoc />
         public DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id);
@@ -66,6 +68,8 @@ namespace Discord.Rest
                 GuildId = model.GuildId.Value;
             if (model.Name.IsSpecified)
                 Name = model.Name.Value;
+            if (model.ApplicationId.IsSpecified)
+                ApplicationId = model.ApplicationId.Value;
         }
 
         /// <inheritdoc />
diff --git a/src/Discord.Net.Rest/Extensions/EntityExtensions.cs b/src/Discord.Net.Rest/Extensions/EntityExtensions.cs
index f8676c783..0c2e0f8c2 100644
--- a/src/Discord.Net.Rest/Extensions/EntityExtensions.cs
+++ b/src/Discord.Net.Rest/Extensions/EntityExtensions.cs
@@ -68,6 +68,7 @@ namespace Discord.Rest
                 model.Video = entity.Video.Value.ToModel();
             return model;
         }
+
         public static API.AllowedMentions ToModel(this AllowedMentions entity)
         {
             return new API.AllowedMentions()
diff --git a/src/Discord.Net.Webhook/Discord.Net.Webhook.xml b/src/Discord.Net.Webhook/Discord.Net.Webhook.xml
index f629c2c29..d1bafb9a3 100644
--- a/src/Discord.Net.Webhook/Discord.Net.Webhook.xml
+++ b/src/Discord.Net.Webhook/Discord.Net.Webhook.xml
@@ -31,7 +31,7 @@
             <exception cref="T:System.ArgumentException">Thrown if the <paramref name="webhookUrl"/> is an invalid format.</exception>
             <exception cref="T:System.ArgumentNullException">Thrown if the <paramref name="webhookUrl"/> is null or whitespace.</exception>
         </member>
-        <member name="M:Discord.Webhook.DiscordWebhookClient.SendMessageAsync(System.String,System.Boolean,System.Collections.Generic.IEnumerable{Discord.Embed},System.String,System.String,Discord.RequestOptions,Discord.AllowedMentions)">
+        <member name="M:Discord.Webhook.DiscordWebhookClient.SendMessageAsync(System.String,System.Boolean,System.Collections.Generic.IEnumerable{Discord.Embed},System.String,System.String,Discord.RequestOptions,Discord.AllowedMentions,Discord.MessageComponent)">
             <summary> Sends a message to the channel for this webhook. </summary>
             <returns> Returns the ID of the created message. </returns>
         </member>
@@ -99,6 +99,11 @@
                 Gets or sets the allowed mentions of the message.
             </summary>
         </member>
+        <member name="P:Discord.Webhook.WebhookMessageProperties.Components">
+            <summary>
+                Gets or sets the components that the message should display.
+            </summary>
+        </member>
         <member name="M:Discord.Webhook.WebhookClientHelper.GetWebhookAsync(Discord.Webhook.DiscordWebhookClient,System.UInt64)">
             <exception cref="T:System.InvalidOperationException">Could not find a webhook with the supplied credentials.</exception>
         </member>
diff --git a/src/Discord.Net.Webhook/DiscordWebhookClient.cs b/src/Discord.Net.Webhook/DiscordWebhookClient.cs
index 91d077411..d4affb08b 100644
--- a/src/Discord.Net.Webhook/DiscordWebhookClient.cs
+++ b/src/Discord.Net.Webhook/DiscordWebhookClient.cs
@@ -88,8 +88,8 @@ namespace Discord.Webhook
         /// <summary> Sends a message to the channel for this webhook. </summary>
         /// <returns> Returns the ID of the created message. </returns>
         public Task<ulong> SendMessageAsync(string text = null, bool isTTS = false, IEnumerable<Embed> embeds = null,
-            string username = null, string avatarUrl = null, RequestOptions options = null, AllowedMentions allowedMentions = null)
-            => WebhookClientHelper.SendMessageAsync(this, text, isTTS, embeds, username, avatarUrl, allowedMentions, options);
+            string username = null, string avatarUrl = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageComponent component = null)
+            => WebhookClientHelper.SendMessageAsync(this, text, isTTS, embeds, username, avatarUrl, allowedMentions, options, component);
 
         /// <summary>
         ///     Modifies a message posted using this webhook.
diff --git a/src/Discord.Net.Webhook/Entities/Messages/WebhookMessageProperties.cs b/src/Discord.Net.Webhook/Entities/Messages/WebhookMessageProperties.cs
index dec7b6e3b..ca2ff10a0 100644
--- a/src/Discord.Net.Webhook/Entities/Messages/WebhookMessageProperties.cs
+++ b/src/Discord.Net.Webhook/Entities/Messages/WebhookMessageProperties.cs
@@ -22,5 +22,9 @@ namespace Discord.Webhook
         ///     Gets or sets the allowed mentions of the message.
         /// </summary>
         public Optional<AllowedMentions> AllowedMentions { get; set; }
+        /// <summary>
+        ///     Gets or sets the components that the message should display.
+        /// </summary>
+        public Optional<MessageComponent> Components { get; set; }
     }
 }
diff --git a/src/Discord.Net.Webhook/Entities/Webhooks/RestInternalWebhook.cs b/src/Discord.Net.Webhook/Entities/Webhooks/RestInternalWebhook.cs
index bbb160fcd..210d8eda0 100644
--- a/src/Discord.Net.Webhook/Entities/Webhooks/RestInternalWebhook.cs
+++ b/src/Discord.Net.Webhook/Entities/Webhooks/RestInternalWebhook.cs
@@ -17,6 +17,7 @@ namespace Discord.Webhook
         public string Name { get; private set; }
         public string AvatarId { get; private set; }
         public ulong? GuildId { get; private set; }
+        public ulong? ApplicationId {  get; private set; }
 
         public DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id);
 
@@ -44,6 +45,8 @@ namespace Discord.Webhook
                 GuildId = model.GuildId.Value;
             if (model.Name.IsSpecified)
                 Name = model.Name.Value;
+            if (model.ApplicationId.IsSpecified)
+                ApplicationId = model.ApplicationId.Value;
         }
 
         public string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
diff --git a/src/Discord.Net.Webhook/WebhookClientHelper.cs b/src/Discord.Net.Webhook/WebhookClientHelper.cs
index 528848f7f..6e3651323 100644
--- a/src/Discord.Net.Webhook/WebhookClientHelper.cs
+++ b/src/Discord.Net.Webhook/WebhookClientHelper.cs
@@ -21,7 +21,7 @@ namespace Discord.Webhook
             return RestInternalWebhook.Create(client, model);
         }
         public static async Task<ulong> SendMessageAsync(DiscordWebhookClient client,
-            string text, bool isTTS, IEnumerable<Embed> embeds, string username, string avatarUrl, AllowedMentions allowedMentions, RequestOptions options)
+            string text, bool isTTS, IEnumerable<Embed> embeds, string username, string avatarUrl, AllowedMentions allowedMentions, RequestOptions options, MessageComponent component)
         {
             var args = new CreateWebhookMessageParams
             {
@@ -37,6 +37,8 @@ namespace Discord.Webhook
                 args.AvatarUrl = avatarUrl;
             if (allowedMentions != null)
                 args.AllowedMentions = allowedMentions.ToModel();
+            if (component != null)
+                args.Components = component?.Components.Select(x => new API.ActionRowComponent(x)).ToArray();
 
             var model = await client.ApiClient.CreateWebhookMessageAsync(client.Webhook.Id, args, options: options).ConfigureAwait(false);
             return model.Id;
@@ -83,7 +85,8 @@ namespace Discord.Webhook
                         : Optional.Create<API.Embed[]>(),
                 AllowedMentions = args.AllowedMentions.IsSpecified
                     ? args.AllowedMentions.Value.ToModel()
-                    : Optional.Create<API.AllowedMentions>()
+                    : Optional.Create<API.AllowedMentions>(),
+                Components = args.Components.IsSpecified ? args.Components.Value?.Components.Select(x => new API.ActionRowComponent(x)).ToArray() : Optional<API.ActionRowComponent[]>.Unspecified,
             };
 
             await client.ApiClient.ModifyWebhookMessageAsync(client.Webhook.Id, messageId, apiArgs, options)