diff --git a/DisCatSharp/Entities/Interaction/Components/Button/DiscordButtonComponent.cs b/DisCatSharp/Entities/Interaction/Components/Button/DiscordButtonComponent.cs
index 6eed6dc4d..53e54557d 100644
--- a/DisCatSharp/Entities/Interaction/Components/Button/DiscordButtonComponent.cs
+++ b/DisCatSharp/Entities/Interaction/Components/Button/DiscordButtonComponent.cs
@@ -1,118 +1,129 @@
 // This file is part of the DisCatSharp project, based off DSharpPlus.
 //
 // Copyright (c) 2021-2022 AITSYS
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
 //
 // The above copyright notice and this permission notice shall be included in all
 // copies or substantial portions of the Software.
 //
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+using System;
+
 using DisCatSharp.Enums;
 
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Entities
 {
 
 	/// <summary>
 	/// Represents a button that can be pressed. Fires <see cref="DisCatSharp.DiscordClient.ComponentInteractionCreated"/> event when pressed.
 	/// </summary>
 	public sealed class DiscordButtonComponent : DiscordComponent
 	{
 		/// <summary>
 		/// The style of the button.
 		/// </summary>
 		[JsonProperty("style", NullValueHandling = NullValueHandling.Ignore)]
 		public ButtonStyle Style { get; internal set; }
 
 		/// <summary>
 		/// The text to apply to the button. If this is not specified <see cref="Emoji"/> becomes required.
 		/// </summary>
 		[JsonProperty("label", NullValueHandling = NullValueHandling.Ignore)]
 		public string Label { get; internal set; }
 
 		/// <summary>
 		/// Whether this button can be pressed.
 		/// </summary>
 		[JsonProperty("disabled", NullValueHandling = NullValueHandling.Ignore)]
 		public bool Disabled { get; internal set; }
 
 		/// <summary>
 		/// The emoji to add to the button. Can be used in conjunction with a label, or as standalone. Must be added if label is not specified.
 		/// </summary>
 		[JsonProperty("emoji", NullValueHandling = NullValueHandling.Ignore)]
 		public DiscordComponentEmoji Emoji { get; internal set; }
 
 		/// <summary>
 		/// Enables this component if it was disabled before.
 		/// </summary>
 		/// <returns>The current component.</returns>
 		public DiscordButtonComponent Enable()
 		{
 			this.Disabled = false;
 			return this;
 		}
 
 		/// <summary>
 		/// Disables this component.
 		/// </summary>
 		/// <returns>The current component.</returns>
 		public DiscordButtonComponent Disable()
 		{
 			this.Disabled = true;
 			return this;
 		}
 
 		/// <summary>
 		/// Constructs a new <see cref="DiscordButtonComponent"/>.
 		/// </summary>
 		public DiscordButtonComponent()
 		{
 			this.Type = ComponentType.Button;
 		}
 
 		/// <summary>
 		/// Constructs a new button based on another button.
 		/// </summary>
 		/// <param name="other">The button to copy.</param>
 		public DiscordButtonComponent(DiscordButtonComponent other) : this()
 		{
 			this.CustomId = other.CustomId;
 			this.Style = other.Style;
 			this.Label = other.Label;
 			this.Disabled = other.Disabled;
 			this.Emoji = other.Emoji;
 		}
 
 		/// <summary>
 		/// Constructs a new button with the specified options.
 		/// </summary>
 		/// <param name="style">The style/color of the button.</param>
 		/// <param name="customId">The Id to assign to the button. This is sent back when a user presses it.</param>
 		/// <param name="label">The text to display on the button, up to 80 characters. Can be left blank if <paramref name="emoji"/>is set.</param>
 		/// <param name="disabled">Whether this button should be initialized as being disabled. User sees a greyed out button that cannot be interacted with.</param>
 		/// <param name="emoji">The emoji to add to the button. This is required if <paramref name="label"/> is empty or null.</param>
-		public DiscordButtonComponent(ButtonStyle style, string customId, string label, bool disabled = false, DiscordComponentEmoji emoji = null)
+		/// <exception cref="ArgumentException">Is thrown when neither the <paramref name="emoji"/> nor the <paramref name="label"/> is set.</exception>
+		public DiscordButtonComponent(ButtonStyle style, string customId = null, string label = null, bool disabled = false, DiscordComponentEmoji emoji = null)
 		{
 			this.Style = style;
-			this.Label = label;
-			this.CustomId = customId;
+			this.CustomId = customId ?? Guid.NewGuid().ToString();
 			this.Disabled = disabled;
-			this.Emoji = emoji;
+			if (emoji != null)
+            {
+				this.Label = label;
+				this.Emoji = emoji;
+			}
+			else
+            {
+				this.Label = label ?? throw new ArgumentException("Label can only be null if emoji is set.");
+				this.Emoji = null;
+			}
 			this.Type = ComponentType.Button;
 		}
 	}
 }
diff --git a/DisCatSharp/Entities/Interaction/Components/Text/DiscordTextComponent.cs b/DisCatSharp/Entities/Interaction/Components/Text/DiscordTextComponent.cs
index ed2c7350b..d89993e86 100644
--- a/DisCatSharp/Entities/Interaction/Components/Text/DiscordTextComponent.cs
+++ b/DisCatSharp/Entities/Interaction/Components/Text/DiscordTextComponent.cs
@@ -1,156 +1,159 @@
 // This file is part of the DisCatSharp project, based off DSharpPlus.
 //
 // Copyright (c) 2021-2022 AITSYS
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
 //
 // The above copyright notice and this permission notice shall be included in all
 // copies or substantial portions of the Software.
 //
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+using System;
+
 using DisCatSharp.Enums;
 
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Entities
 {
 
 	/// <summary>
 	/// Represents a text component that can be submitted. Fires <see cref="DisCatSharp.DiscordClient.ComponentInteractionCreated"/> event when submitted.
 	/// </summary>
 	public sealed class DiscordTextComponent : DiscordComponent
 	{
 		/// <summary>
 		/// The style of the text component.
 		/// </summary>
 		[JsonProperty("style", NullValueHandling = NullValueHandling.Ignore)]
 		public TextComponentStyle Style { get; internal set; }
 
 		/// <summary>
 		/// The text description to apply to the text component.
 		/// </summary>
 		[JsonProperty("label", NullValueHandling = NullValueHandling.Ignore)]
 		public string Label { get; internal set; }
 
 		/// <summary>
 		/// The placeholder for the text component.
 		/// </summary>
 		[JsonProperty("placeholder", NullValueHandling = NullValueHandling.Ignore)]
 		public string Placeholder { get; internal set; }
 
 		/// <summary>
 		/// The pre-filled value for the text component.
 		/// </summary>
 		[JsonProperty("value", NullValueHandling = NullValueHandling.Ignore)]
 		public string Value { get; internal set; }
 
 		/// <summary>
 		/// The minimal length of text input.
 		/// Defaults to 0.
 		/// </summary>
 		[JsonProperty("min_length", NullValueHandling = NullValueHandling.Ignore)]
 		public int? MinLength { get; internal set; } = 0;
 
 		/// <summary>
 		/// The maximal length of text input.
 		/// </summary>
 		[JsonProperty("max_length", NullValueHandling = NullValueHandling.Ignore)]
 		public int? MaxLength { get; internal set; }
 
 		// NOTE: Probably will be introduced in future
 		/*/// <summary>
         /// Whether this text component can be used.
         /// </summary>
         [JsonProperty("disabled", NullValueHandling = NullValueHandling.Ignore)]
         public bool Disabled { get; internal set; }*/
 
 		/// <summary>
 		/// Whether this text component is required.
 		/// Defaults to true.
 		/// </summary>
 		[JsonProperty("required", NullValueHandling = NullValueHandling.Ignore)]
 		public bool Required { get; internal set; }
 
 		/*/// <summary>
         /// Enables this component if it was disabled before.
         /// </summary>
         /// <returns>The current component.</returns>
         public DiscordTextComponent Enable()
         {
             this.Disabled = false;
             return this;
         }
 
         /// <summary>
         /// Disables this component.
         /// </summary>
         /// <returns>The current component.</returns>
         public DiscordTextComponent Disable()
         {
             this.Disabled = true;
             return this;
         }*/
 
 		/// <summary>
 		/// Constructs a new <see cref="DiscordTextComponent"/>.
 		/// </summary>
 		internal DiscordTextComponent()
 		{
 			this.Type = ComponentType.InputText;
 		}
 
 		/// <summary>
 		/// Constucts a new text component based on another text component.
 		/// </summary>
 		/// <param name="other">The button to copy.</param>
 		public DiscordTextComponent(DiscordTextComponent other) : this()
 		{
 			this.CustomId = other.CustomId;
 			this.Style = other.Style;
 			this.Label = other.Label;
 			//this.Disabled = other.Disabled;
 			this.MinLength = other.MinLength;
 			this.MaxLength = other.MaxLength;
 			this.Placeholder = other.Placeholder;
 			this.Required = other.Required;
 			this.Value = other.Value;
 		}
 
 		/// <summary>
 		/// Constructs a new text component field with the specified options.
 		/// </summary>
 		/// <param name="style">The style of the text component.</param>
 		/// <param name="customId">The Id to assign to the text component. This is sent back when a user presses it.</param>
-		/// <param name="label">The text to display before the text component, up to 80 characters.</param>
+		/// <param name="label">The text to display before the text component, up to 80 characters. Required, but set to null to avoid breaking change.</param>
 		/// <param name="placeholder">The placeholder for the text input.</param>
 		/// <param name="minLength">The minimal length of text input.</param>
 		/// <param name="maxLength">The maximal length of text input.</param>
 		/// <param name="required">Whether this text component should be required.</param>
 		/// <param name="defaultValue">Pre-filled value for text field.</param>
-		public DiscordTextComponent(TextComponentStyle style, string customId, string label, string placeholder = null, int? minLength = null, int? maxLength = null, bool required = true, string defaultValue = null)
+		/// <exception cref="ArgumentException">Is thrown when no label is set.</exception>
+		public DiscordTextComponent(TextComponentStyle style, string customId = null, string label = null, string placeholder = null, int? minLength = null, int? maxLength = null, bool required = true, string defaultValue = null)
 		{
 			this.Style = style;
-			this.Label = label;
-			this.CustomId = customId;
+			this.Label = label ?? throw new ArgumentException("A label is required.");
+			this.CustomId = customId ?? Guid.NewGuid().ToString();
 			this.MinLength = minLength;
 			this.MaxLength = maxLength;
 			this.Placeholder = placeholder;
 			//this.Disabled = disabled;
 			this.Required = required;
 			this.Value = defaultValue;
 			this.Type = ComponentType.InputText;
 		}
 	}
 }