diff --git a/DisCatSharp.ApplicationCommands/ApplicationCommandsExtension.cs b/DisCatSharp.ApplicationCommands/ApplicationCommandsExtension.cs
index 3841ad09c..b1038a944 100644
--- a/DisCatSharp.ApplicationCommands/ApplicationCommandsExtension.cs
+++ b/DisCatSharp.ApplicationCommands/ApplicationCommandsExtension.cs
@@ -1,1820 +1,1754 @@
 // 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 System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
 using DisCatSharp.ApplicationCommands.Attributes;
 using DisCatSharp.ApplicationCommands.EventArgs;
 using DisCatSharp.Common;
 using DisCatSharp.Common.Utilities;
 using DisCatSharp.Entities;
 using DisCatSharp.Enums;
 using DisCatSharp.EventArgs;
 using DisCatSharp.Exceptions;
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
 using Newtonsoft.Json;
 
 namespace DisCatSharp.ApplicationCommands
 {
 	/// <summary>
 	/// A class that handles slash commands for a client.
 	/// </summary>
 	public sealed class ApplicationCommandsExtension : BaseExtension
 	{
 		/// <summary>
 		/// A list of methods for top level commands.
 		/// </summary>
 		private static List<CommandMethod> s_commandMethods { get; set; } = new();
 
 		/// <summary>
 		/// List of groups.
 		/// </summary>
 		private static List<GroupCommand> s_groupCommands { get; set; } = new();
 
 		/// <summary>
 		/// List of groups with subgroups.
 		/// </summary>
 		private static List<SubGroupCommand> s_subGroupCommands { get; set; } = new();
 
 		/// <summary>
 		/// List of context menus.
 		/// </summary>
 		private static List<ContextMenuCommand> s_contextMenuCommands { get; set; } = new();
 
 		/// <summary>
 		/// List of global commands on discords backend.
 		/// </summary>
 		internal static List<DiscordApplicationCommand> GlobalDiscordCommands { get; set; }
 
 		/// <summary>
 		/// List of guild commands on discords backend.
 		/// </summary>
 		internal static Dictionary<ulong, List<DiscordApplicationCommand>> GuildDiscordCommands { get; set; }
 
 		/// <summary>
 		/// Singleton modules.
 		/// </summary>
 		private static List<object> s_singletonModules { get; set; } = new();
 
 		/// <summary>
 		/// List of modules to register.
 		/// </summary>
 		private readonly List<KeyValuePair<ulong?, ApplicationCommandsModuleConfiguration>> _updateList = new();
 
 		/// <summary>
 		/// Configuration for Discord.
 		/// </summary>
 		internal static ApplicationCommandsConfiguration Configuration;
 
 		/// <summary>
 		/// Discord client.
 		/// </summary>
 		internal static DiscordClient ClientInternal;
 
 		/// <summary>
 		/// Set to true if anything fails when registering.
 		/// </summary>
 		private static bool s_errored { get; set; }
 
 		/// <summary>
 		/// Gets a list of registered commands. The key is the guild id (null if global).
 		/// </summary>
 		public IReadOnlyList<KeyValuePair<ulong?, IReadOnlyList<DiscordApplicationCommand>>> RegisteredCommands
 			=> s_registeredCommands;
 		private static readonly List<KeyValuePair<ulong?, IReadOnlyList<DiscordApplicationCommand>>> s_registeredCommands = new();
 
 		/// <summary>
 		/// Gets a list of registered global commands.
 		/// </summary>
 		public IReadOnlyList<DiscordApplicationCommand> GlobalCommands
 			=> GlobalCommandsInternal;
 		internal static readonly List<DiscordApplicationCommand> GlobalCommandsInternal = new();
 
 		/// <summary>
 		/// Gets a list of registered guild commands mapped by guild id.
 		/// </summary>
 		public IReadOnlyDictionary<ulong, IReadOnlyList<DiscordApplicationCommand>> GuildCommands
 		=> GuildCommandsInternal;
 		internal static readonly Dictionary<ulong, IReadOnlyList<DiscordApplicationCommand>> GuildCommandsInternal = new();
 
 		/// <summary>
 		/// Gets the registration count.
 		/// </summary>
 		private static int s_registrationCount { get; set; }
 
 		/// <summary>
 		/// Gets the expected count.
 		/// </summary>
 		private static int s_expectedCount { get; set; }
 
 		/// <summary>
 		/// Gets the guild ids where the applications.commands scope is missing.
 		/// </summary>
 		private IReadOnlyList<ulong> _missingScopeGuildIds;
 
 		/// <summary>
 		/// Gets whether debug is enabled.
 		/// </summary>
 		internal static bool DebugEnabled { get; set; }
 
 		internal static LogLevel ApplicationCommandsLogLevel
 			=> DebugEnabled ? LogLevel.Debug : LogLevel.Trace;
 
 		/// <summary>
 		/// Gets whether check through all guilds is enabled.
 		/// </summary>
 		internal static bool CheckAllGuilds { get; set; }
 
 		/// <summary>
 		/// Gets whether the registration check should be manually overriden.
 		/// </summary>
 		internal static bool ManOr { get; set; }
 
 		/// <summary>
 		/// Gets whether interactions should be automatically deffered.
 		/// </summary>
 		internal static bool AutoDeferEnabled { get; set; }
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="ApplicationCommandsExtension"/> class.
 		/// </summary>
 		/// <param name="configuration">The configuration.</param>
 		internal ApplicationCommandsExtension(ApplicationCommandsConfiguration configuration = null)
 		{
 			Configuration = configuration;
 			DebugEnabled = configuration?.DebugStartup ?? false;
 			CheckAllGuilds = configuration?.CheckAllGuilds ?? false;
 			ManOr = configuration?.ManualOverride ?? false;
 			AutoDeferEnabled = configuration?.AutoDefer ?? false;
 		}
 
 		/// <summary>
 		/// Runs setup.
 		/// <note type="caution">DO NOT RUN THIS MANUALLY. DO NOT DO ANYTHING WITH THIS.</note>
 		/// </summary>
 		/// <param name="client">The client to setup on.</param>
 		protected internal override void Setup(DiscordClient client)
 		{
 			if (this.Client != null)
 				throw new InvalidOperationException("What did I tell you?");
 
 			this.Client = client;
 			ClientInternal = client;
 
 			this._slashError = new AsyncEvent<ApplicationCommandsExtension, SlashCommandErrorEventArgs>("SLASHCOMMAND_ERRORED", TimeSpan.Zero, null);
 			this._slashExecuted = new AsyncEvent<ApplicationCommandsExtension, SlashCommandExecutedEventArgs>("SLASHCOMMAND_EXECUTED", TimeSpan.Zero, null);
 			this._contextMenuErrored = new AsyncEvent<ApplicationCommandsExtension, ContextMenuErrorEventArgs>("CONTEXTMENU_ERRORED", TimeSpan.Zero, null);
 			this._contextMenuExecuted = new AsyncEvent<ApplicationCommandsExtension, ContextMenuExecutedEventArgs>("CONTEXTMENU_EXECUTED", TimeSpan.Zero, null);
 			this._applicationCommandsModuleReady = new AsyncEvent<ApplicationCommandsExtension, ApplicationCommandsModuleReadyEventArgs>("APPLICATION_COMMANDS_MODULE_READY", TimeSpan.Zero, null);
 			this._applicationCommandsModuleStartupFinished = new AsyncEvent<ApplicationCommandsExtension, ApplicationCommandsModuleStartupFinishedEventArgs>("APPLICATION_COMMANDS_MODULE_STARTUP_FINISHED", TimeSpan.Zero, null);
 			this._globalApplicationCommandsRegistered = new AsyncEvent<ApplicationCommandsExtension, GlobalApplicationCommandsRegisteredEventArgs>("GLOBAL_COMMANDS_REGISTERED", TimeSpan.Zero, null);
 			this._guildApplicationCommandsRegistered = new AsyncEvent<ApplicationCommandsExtension, GuildApplicationCommandsRegisteredEventArgs>("GUILD_COMMANDS_REGISTERED", TimeSpan.Zero, null);
 
 			this.Client.GuildDownloadCompleted += async (c, e) => await this.UpdateAsync();
 			this.Client.InteractionCreated += this.CatchInteractionsOnStartup;
 			this.Client.ContextMenuInteractionCreated += this.CatchContextMenuInteractionsOnStartup;
 		}
 
 		private async Task CatchInteractionsOnStartup(DiscordClient sender, InteractionCreateEventArgs e)
 			=> await e.Interaction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, new DiscordInteractionResponseBuilder().AsEphemeral(true).WithContent("Attention: This application is still starting up. Application commands are unavailable for now."));
 
 		private async Task CatchContextMenuInteractionsOnStartup(DiscordClient sender, ContextMenuInteractionCreateEventArgs e)
 			=> await e.Interaction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, new DiscordInteractionResponseBuilder().AsEphemeral(true).WithContent("Attention: This application is still starting up. Context menu commands are unavailable for now."));
 
 		private void FinishedRegistration()
 		{
 			this.Client.InteractionCreated -= this.CatchInteractionsOnStartup;
 			this.Client.ContextMenuInteractionCreated -= this.CatchContextMenuInteractionsOnStartup;
 
 			this.Client.InteractionCreated += this.InteractionHandler;
 			this.Client.ContextMenuInteractionCreated += this.ContextMenuHandler;
 		}
 		/// <summary>
 		/// Cleans the module for a new start of the bot.
 		/// DO NOT USE IF YOU DON'T KNOW WHAT IT DOES.
 		/// </summary>
 		public void CleanModule()
 		{
 			this._updateList.Clear();
 			s_singletonModules.Clear();
 			s_errored = false;
 			s_expectedCount = 0;
 			s_registrationCount = 0;
 			s_commandMethods.Clear();
 			s_groupCommands.Clear();
 			s_contextMenuCommands.Clear();
 			s_subGroupCommands.Clear();
 			s_singletonModules.Clear();
 			s_registeredCommands.Clear();
 			GlobalCommandsInternal.Clear();
 			GuildCommandsInternal.Clear();
 		}
 
 		/// <summary>
 		/// Registers a command class.
 		/// </summary>
 		/// <typeparam name="T">The command class to register.</typeparam>
 		public void RegisterGlobalCommands<T>() where T : ApplicationCommandsModule
 		{
 			if (this.Client.ShardId == 0)
 				this._updateList.Add(new KeyValuePair<ulong?, ApplicationCommandsModuleConfiguration>(null, new ApplicationCommandsModuleConfiguration(typeof(T))));
 		}
 		/// <summary>
 		/// Registers a command class.
 		/// </summary>
 		/// <param name="type">The <see cref="System.Type"/> of the command class to register.</param>
 		public void RegisterGlobalCommands(Type type)
 		{
 			if (!typeof(ApplicationCommandsModule).IsAssignableFrom(type))
 				throw new ArgumentException("Command classes have to inherit from ApplicationCommandsModule", nameof(type));
 			//If sharding, only register for shard 0
 			if (this.Client.ShardId == 0)
 				this._updateList.Add(new KeyValuePair<ulong?, ApplicationCommandsModuleConfiguration>(null, new ApplicationCommandsModuleConfiguration(type)));
 		}
 
 		/// <summary>
 		/// Cleans all guild application commands.
 		/// <note type="caution">You normally don't need to execute it.</note>
 		/// </summary>
 		public async Task CleanGuildCommandsAsync()
 		{
 			foreach (var guild in this.Client.Guilds.Values)
 			{
 				await this.Client.BulkOverwriteGuildApplicationCommandsAsync(guild.Id, Array.Empty<DiscordApplicationCommand>());
 			}
 		}
 
 		/// <summary>
 		/// Cleans the global application commands.
 		/// <note type="caution">You normally don't need to execute it.</note>
 		/// </summary>
 		public async Task CleanGlobalCommandsAsync()
 			=> await this.Client.BulkOverwriteGlobalApplicationCommandsAsync(Array.Empty<DiscordApplicationCommand>());
 
 		/// <summary>
 		/// Registers a command class with permission and translation setup.
 		/// </summary>
 		/// <typeparam name="T">The command class to register.</typeparam>
 		/// <param name="guildId">The guild id to register it on.</param>
 		/// <param name="translationSetup">A callback to setup translations with.</param>
 		public void RegisterGuildCommands<T>(ulong guildId, Action<ApplicationCommandsTranslationContext> translationSetup = null) where T : ApplicationCommandsModule
 		{
 			if (this.Client.ShardId == 0)
 				this._updateList.Add(new KeyValuePair<ulong?, ApplicationCommandsModuleConfiguration>(guildId, new ApplicationCommandsModuleConfiguration(typeof(T), translationSetup)));
 		}
 
 		/// <summary>
 		/// Registers a command class with permission and translation setup.
 		/// </summary>
 		/// <param name="type">The <see cref="System.Type"/> of the command class to register.</param>
 		/// <param name="guildId">The guild id to register it on.</param>
 		/// <param name="translationSetup">A callback to setup translations with.</param>
 		public void RegisterGuildCommands(Type type, ulong guildId, Action<ApplicationCommandsTranslationContext> translationSetup = null)
 		{
 			if (!typeof(ApplicationCommandsModule).IsAssignableFrom(type))
 				throw new ArgumentException("Command classes have to inherit from ApplicationCommandsModule", nameof(type));
 			//If sharding, only register for shard 0
 			if (this.Client.ShardId == 0)
 				this._updateList.Add(new KeyValuePair<ulong?, ApplicationCommandsModuleConfiguration>(guildId, new ApplicationCommandsModuleConfiguration(type, translationSetup)));
 		}
 
 		/// <summary>
 		/// Registers a command class with permission setup but without a guild id.
 		/// </summary>
 		/// <typeparam name="T">The command class to register.</typeparam>
 		/// <param name="translationSetup">A callback to setup translations with.</param>
 		public void RegisterGlobalCommands<T>(Action<ApplicationCommandsTranslationContext> translationSetup = null) where T : ApplicationCommandsModule
         {
             if (this.Client.ShardId == 0)
                 this._updateList.Add(new KeyValuePair<ulong?, ApplicationCommandsModuleConfiguration>(null, new ApplicationCommandsModuleConfiguration(typeof(T), translationSetup)));
         }
 
 		/// <summary>
 		/// Registers a command class with permission setup but without a guild id.
 		/// </summary>
 		/// <param name="type">The <see cref="System.Type"/> of the command class to register.</param>
 		/// <param name="translationSetup">A callback to setup translations with.</param>
 		public void RegisterGlobalCommands(Type type, Action<ApplicationCommandsTranslationContext> translationSetup = null)
         {
             if (!typeof(ApplicationCommandsModule).IsAssignableFrom(type))
                 throw new ArgumentException("Command classes have to inherit from ApplicationCommandsModule", nameof(type));
             //If sharding, only register for shard 0
             if (this.Client.ShardId == 0)
                 this._updateList.Add(new KeyValuePair<ulong?, ApplicationCommandsModuleConfiguration>(null, new ApplicationCommandsModuleConfiguration(type, translationSetup)));
         }
 
 		/// <summary>
 		/// Fired when the application commands module is ready.
 		/// </summary>
 		public event AsyncEventHandler<ApplicationCommandsExtension, ApplicationCommandsModuleReadyEventArgs> ApplicationCommandsModuleReady
 		{
 			add => this._applicationCommandsModuleReady.Register(value);
 			remove => this._applicationCommandsModuleReady.Unregister(value);
 		}
 		private AsyncEvent<ApplicationCommandsExtension, ApplicationCommandsModuleReadyEventArgs> _applicationCommandsModuleReady;
 
 		/// <summary>
 		/// Fired when the application commands modules startup is finished.
 		/// </summary>
 		public event AsyncEventHandler<ApplicationCommandsExtension, ApplicationCommandsModuleStartupFinishedEventArgs> ApplicationCommandsModuleStartupFinished
 		{
 			add => this._applicationCommandsModuleStartupFinished.Register(value);
 			remove => this._applicationCommandsModuleStartupFinished.Unregister(value);
 		}
 		private AsyncEvent<ApplicationCommandsExtension, ApplicationCommandsModuleStartupFinishedEventArgs> _applicationCommandsModuleStartupFinished;
 
 
 		/// <summary>
 		/// Fired when guild commands are registered on a guild.
 		/// </summary>
 		public event AsyncEventHandler<ApplicationCommandsExtension, GuildApplicationCommandsRegisteredEventArgs> GuildApplicationCommandsRegistered
 		{
 			add => this._guildApplicationCommandsRegistered.Register(value);
 			remove => this._guildApplicationCommandsRegistered.Unregister(value);
 		}
 		private AsyncEvent<ApplicationCommandsExtension, GuildApplicationCommandsRegisteredEventArgs> _guildApplicationCommandsRegistered;
 
 		/// <summary>
 		/// Fired when the global commands are registered.
 		/// </summary>
 		public event AsyncEventHandler<ApplicationCommandsExtension, GlobalApplicationCommandsRegisteredEventArgs> GlobalApplicationCommandsRegistered
 		{
 			add => this._globalApplicationCommandsRegistered.Register(value);
 			remove => this._globalApplicationCommandsRegistered.Unregister(value);
 		}
 		private AsyncEvent<ApplicationCommandsExtension, GlobalApplicationCommandsRegisteredEventArgs> _globalApplicationCommandsRegistered;
 
 		/// <summary>
 		/// Used for RegisterCommands and the <see cref="DisCatSharp.DiscordClient.GuildDownloadCompleted"/> event.
 		/// </summary>
 		internal async Task UpdateAsync()
 		{
 			//Only update for shard 0
 			if (this.Client.ShardId == 0)
 			{
 				GlobalDiscordCommands = new();
 				GuildDiscordCommands = new();
 
-				var commandsPending = this._updateList.Select(x => x.Key).Distinct();
-				s_expectedCount = commandsPending.Count();
+				var commandsPending = this._updateList.Select(x => x.Key).Distinct().ToArray();
+				s_expectedCount = commandsPending.Length;
 
 				this.Client.Logger.Log(ApplicationCommandsLogLevel, $"Expected Count: {s_expectedCount}");
 
 				List<ulong> failedGuilds = new();
 				IEnumerable<DiscordApplicationCommand> globalCommands = null;
 				globalCommands = await this.Client.GetGlobalApplicationCommandsAsync(Configuration?.EnableLocalization ?? false) ?? null;
 				var guilds = CheckAllGuilds ? this.Client.Guilds?.Keys : this._updateList.Select(x => x.Key)?.Distinct().Where(x => x != null)?.Select(x => x.Value);
 
 				foreach (var guild in guilds)
 				{
-					IEnumerable<DiscordApplicationCommand> commands = null;
+					List<DiscordApplicationCommand> commands = null;
 					var unauthorized = false;
 					try
 					{
-						commands = await this.Client.GetGuildApplicationCommandsAsync(guild, Configuration?.EnableLocalization ?? false) ?? null;
+						commands = (await this.Client.GetGuildApplicationCommandsAsync(guild, Configuration?.EnableLocalization ?? false)).ToList();
 					}
 					catch (UnauthorizedException)
 					{
 						unauthorized = true;
 					}
 					finally
 					{
 						if (!unauthorized && commands != null && commands.Any())
-							GuildDiscordCommands.Add(guild, commands.ToList());
+							GuildDiscordCommands.Add(guild, commands);
 						else if (!unauthorized)
 							GuildDiscordCommands.Add(guild, null);
 						else
 							failedGuilds.Add(guild);
 					}
 				}
 
 				//Default should be to add the help and slash commands can be added without setting any configuration
 				//so this should still add the default help
 				if (Configuration is null || (Configuration is not null && Configuration.EnableDefaultHelp))
 				{
 					this._updateList.Add(new KeyValuePair<ulong?, ApplicationCommandsModuleConfiguration>
 						(null, new ApplicationCommandsModuleConfiguration(typeof(DefaultHelpModule))));
-					commandsPending = this._updateList.Select(x => x.Key).Distinct();
+					commandsPending = this._updateList.Select(x => x.Key).Distinct().ToArray();
 				}
 
 				if (globalCommands != null && globalCommands.Any())
 					GlobalDiscordCommands.AddRange(globalCommands);
 
-				foreach (var key in commandsPending.ToList())
+				foreach (var key in commandsPending)
 				{
 					this.Client.Logger.LogInformation(key.HasValue ? $"Registering commands in guild {key.Value}" : "Registering global commands.");
 					await this.RegisterCommands(this._updateList.Where(x => x.Key == key).Select(x => x.Value), key);
 				}
 
 				this._missingScopeGuildIds = failedGuilds;
 
 				await this._applicationCommandsModuleReady.InvokeAsync(this, new ApplicationCommandsModuleReadyEventArgs(Configuration?.ServiceProvider)
 				{
 					Handled = true,
 					GuildsWithoutScope = failedGuilds
 				});
 			}
 		}
 
 		/// <summary>
 		/// Method for registering commands for a target from modules.
 		/// </summary>
 		/// <param name="types">The types.</param>
 		/// <param name="guildId">The optional guild id.</param>
 		private async Task RegisterCommands(IEnumerable<ApplicationCommandsModuleConfiguration> types, ulong? guildId)
 		{
 			//Initialize empty lists to be added to the global ones at the end
 			var commandMethods = new List<CommandMethod>();
 			var groupCommands = new List<GroupCommand>();
 			var subGroupCommands = new List<SubGroupCommand>();
 			var contextMenuCommands = new List<ContextMenuCommand>();
 			var updateList = new List<DiscordApplicationCommand>();
 
 			var commandTypeSources = new List<KeyValuePair<Type, Type>>();
 
 			//Iterates over all the modules
 			foreach (var config in types)
 			{
 				var type = config.Type;
 				try
 				{
 					var module = type.GetTypeInfo();
-					var classes = new List<TypeInfo>();
 
 					var ctx = new ApplicationCommandsTranslationContext(type, module.FullName);
 					config.Translations?.Invoke(ctx);
 
-					//Add module to classes list if it's a group
-					if (module.GetCustomAttribute<SlashCommandGroupAttribute>() != null)
-					{
-						classes.Add(module);
-					}
-					else
-					{
-						//Otherwise add the nested groups
-						classes = module.DeclaredNestedTypes.Where(x => x.GetCustomAttribute<SlashCommandGroupAttribute>() != null).ToList();
-					}
+					var classes = module.GetCustomAttribute<SlashCommandGroupAttribute>() != null
+						? new[] {module} // Add module to classes list if it's a group
+						: module.DeclaredNestedTypes.Where(x => //Otherwise add the nested groups
+							x.GetCustomAttribute<SlashCommandGroupAttribute>() != null);
 
 					List<GroupTranslator> groupTranslations = null;
 
 					if (!string.IsNullOrEmpty(ctx.Translations))
 					{
 						groupTranslations = JsonConvert.DeserializeObject<List<GroupTranslator>>(ctx.Translations);
 					}
 
 					var slashGroupsTuple = NestedCommandWorker.ParseSlashGroupsAsync(type, classes, guildId, groupTranslations).Result;
 
 					if (slashGroupsTuple.applicationCommands != null && slashGroupsTuple.applicationCommands.Any())
 						updateList.AddRange(slashGroupsTuple.applicationCommands);
 
 					if (slashGroupsTuple.commandTypeSources != null && slashGroupsTuple.commandTypeSources.Any())
 						commandTypeSources.AddRange(slashGroupsTuple.commandTypeSources);
 
 					if (slashGroupsTuple.singletonModules != null && slashGroupsTuple.singletonModules.Any())
 						s_singletonModules.AddRange(slashGroupsTuple.singletonModules);
 
 					if (slashGroupsTuple.groupCommands != null && slashGroupsTuple.groupCommands.Any())
 						groupCommands.AddRange(slashGroupsTuple.groupCommands);
 
 					if (slashGroupsTuple.subGroupCommands != null && slashGroupsTuple.subGroupCommands.Any())
 						subGroupCommands.AddRange(slashGroupsTuple.subGroupCommands);
 
 					//Handles methods and context menus, only if the module isn't a group itself
 					if (module.GetCustomAttribute<SlashCommandGroupAttribute>() == null)
 					{
 						List<CommandTranslator> commandTranslations = null;
 
 						if (!string.IsNullOrEmpty(ctx.Translations))
 						{
 							commandTranslations = JsonConvert.DeserializeObject<List<CommandTranslator>>(ctx.Translations);
 						}
 
 						//Slash commands
 						var methods = module.DeclaredMethods.Where(x => x.GetCustomAttribute<SlashCommandAttribute>() != null);
 
 						var slashCommands = CommandWorker.ParseBasicSlashCommandsAsync(type, methods, guildId, commandTranslations).Result;
 
 						if (slashCommands.applicationCommands != null && slashCommands.applicationCommands.Any())
 							updateList.AddRange(slashCommands.applicationCommands);
 
 						if (slashCommands.commandTypeSources != null && slashCommands.commandTypeSources.Any())
 							commandTypeSources.AddRange(slashCommands.commandTypeSources);
 
 						if (slashCommands.commandMethods != null && slashCommands.commandMethods.Any())
 							commandMethods.AddRange(slashCommands.commandMethods);
 
 						//Context Menus
 						var contextMethods = module.DeclaredMethods.Where(x => x.GetCustomAttribute<ContextMenuAttribute>() != null);
 
 						var contextCommands = CommandWorker.ParseContextMenuCommands(type, contextMethods, commandTranslations).Result;
 
 						if (contextCommands.applicationCommands != null && contextCommands.applicationCommands.Any())
 							updateList.AddRange(contextCommands.applicationCommands);
 
 						if (contextCommands.commandTypeSources != null && contextCommands.commandTypeSources.Any())
 							commandTypeSources.AddRange(contextCommands.commandTypeSources);
 
 						if (contextCommands.contextMenuCommands != null && contextCommands.contextMenuCommands.Any())
 							contextMenuCommands.AddRange(contextCommands.contextMenuCommands);
 
 						//Accounts for lifespans
 						if (module.GetCustomAttribute<ApplicationCommandModuleLifespanAttribute>() != null && module.GetCustomAttribute<ApplicationCommandModuleLifespanAttribute>().Lifespan == ApplicationCommandModuleLifespan.Singleton)
 						{
 							s_singletonModules.Add(CreateInstance(module, Configuration?.ServiceProvider));
 						}
 					}
 				}
 				catch (Exception ex)
 				{
 					if (ex is BadRequestException brex)
 						this.Client.Logger.LogCritical(brex, $"There was an error registering application commands: {brex.JsonMessage}");
 					else
 						this.Client.Logger.LogCritical(ex, $"There was an error parsing the application commands");
 					s_errored = true;
 				}
 			}
 			if (!s_errored)
 			{
 				try
 				{
 					List<DiscordApplicationCommand> commands = new();
 
 					try
 					{
 						if (guildId == null)
 						{
 							if (updateList != null && updateList.Any())
 							{
 								var regCommands = RegistrationWorker.RegisterGlobalCommandsAsync(updateList).Result;
-								var actualCommands = regCommands.Distinct().ToList();
+								var actualCommands = regCommands.Distinct().ToArray();
 								commands.AddRange(actualCommands);
 								GlobalCommandsInternal.AddRange(actualCommands);
 							}
 							else
 							{
 								foreach (var cmd in GlobalDiscordCommands)
 								{
 									try
 									{
 										await this.Client.DeleteGlobalApplicationCommandAsync(cmd.Id);
 									}
 									catch (NotFoundException)
 									{
 										this.Client.Logger.Log(ApplicationCommandsLogLevel, $"Could not delete global command {cmd.Id}. Please clean up manually");
 									}
 								}
 							}
 						}
 						else
 						{
 							if (updateList != null && updateList.Any())
 							{
 								var regCommands = RegistrationWorker.RegisterGuilldCommandsAsync(guildId.Value, updateList).Result;
-								var actualCommands = regCommands.Distinct().ToList();
+								var actualCommands = regCommands.Distinct().ToArray();
 								commands.AddRange(actualCommands);
 								GuildCommandsInternal.Add(guildId.Value, actualCommands);
 								if (this.Client.Guilds.TryGetValue(guildId.Value, out var guild))
 								{
 									guild.InternalRegisteredApplicationCommands = new();
 									guild.InternalRegisteredApplicationCommands.AddRange(actualCommands);
 								}
 
 							}
 							else
 							{
 								foreach (var cmd in GuildDiscordCommands[guildId.Value])
 								{
 									try
 									{
 										await this.Client.DeleteGuildApplicationCommandAsync(guildId.Value, cmd.Id);
 									}
 									catch (NotFoundException)
 									{
 										this.Client.Logger.Log(ApplicationCommandsLogLevel, $"Could not delete guild command {cmd.Id} in guild {guildId.Value}. Please clean up manually");
 									}
 								}
 							}
 						}
 					}
 					catch (UnauthorizedException ex)
 					{
 						this.Client.Logger.LogError($"Could not register application commands for guild {guildId}.\nError: {ex.JsonMessage}");
 						return;
 					}
 					//Creates a guild command if a guild id is specified, otherwise global
 					//Checks against the ids and adds them to the command method lists
 					foreach (var command in commands)
 					{
 						if (commandMethods.GetFirstValueWhere(x => x.Name == command.Name, out var com))
 							com.CommandId = command.Id;
 						else if (groupCommands.GetFirstValueWhere(x => x.Name == command.Name, out var groupCom))
 							groupCom.CommandId = command.Id;
 						else if (subGroupCommands.GetFirstValueWhere(x => x.Name == command.Name, out var subCom))
 							subCom.CommandId = command.Id;
 						else if (contextMenuCommands.GetFirstValueWhere(x => x.Name == command.Name, out var cmCom))
 							cmCom.CommandId = command.Id;
 					}
 
 					//Adds to the global lists finally
 					s_commandMethods.AddRange(commandMethods);
 					s_groupCommands.AddRange(groupCommands);
 					s_subGroupCommands.AddRange(subGroupCommands);
 					s_contextMenuCommands.AddRange(contextMenuCommands);
 
-					s_registeredCommands.Add(new KeyValuePair<ulong?, IReadOnlyList<DiscordApplicationCommand>>(guildId, commands.ToList()));
+					s_registeredCommands.Add(new KeyValuePair<ulong?, IReadOnlyList<DiscordApplicationCommand>>(guildId, commands.ToArray()));
 
 					foreach (var command in commandMethods)
 					{
 						var app = types.First(t => t.Type == command.Method.DeclaringType);
 					}
 
 					this.Client.Logger.Log(ApplicationCommandsLogLevel, $"Expected Count: {s_expectedCount}\nCurrent Count: {s_registrationCount}");
 
 					if (guildId.HasValue)
 					{
 						await this._guildApplicationCommandsRegistered.InvokeAsync(this, new GuildApplicationCommandsRegisteredEventArgs(Configuration?.ServiceProvider)
 						{
 							Handled = true,
 							GuildId = guildId.Value,
 							RegisteredCommands = GuildCommandsInternal.Any(c => c.Key == guildId.Value) ? GuildCommandsInternal.FirstOrDefault(c => c.Key == guildId.Value).Value : null
 						});
 					}
 					else
 					{
 						await this._globalApplicationCommandsRegistered.InvokeAsync(this, new GlobalApplicationCommandsRegisteredEventArgs(Configuration?.ServiceProvider)
 						{
 							Handled = true,
 							RegisteredCommands = GlobalCommandsInternal
 						});
 					}
 
 					s_registrationCount++;
 					this.CheckRegistrationStartup(ManOr);
 				}
 				catch (Exception ex)
 				{
 					if (ex is BadRequestException brex)
 						this.Client.Logger.LogCritical(brex, $"There was an error registering application commands: {brex.JsonMessage}");
 					else
 						this.Client.Logger.LogCritical(ex, $"There was an general error registering application commands");
 					s_errored = true;
 				}
 			}
 		}
 
 		private async void CheckRegistrationStartup(bool man = false)
 		{
 			this.Client.Logger.Log(ApplicationCommandsLogLevel, $"Checking counts...\n\nExpected Count: {s_expectedCount}\nCurrent Count: {s_registrationCount}");
 
 			if ((s_registrationCount == s_expectedCount) || man)
 			{
 				await this._applicationCommandsModuleStartupFinished.InvokeAsync(this, new ApplicationCommandsModuleStartupFinishedEventArgs(Configuration?.ServiceProvider)
 				{
 					Handled = true,
 					RegisteredGlobalCommands = GlobalCommandsInternal,
 					RegisteredGuildCommands = GuildCommandsInternal,
 					GuildsWithoutScope = this._missingScopeGuildIds
 				});
 
 				this.FinishedRegistration();
 			}
 		}
 
 		/// <summary>
 		/// Interaction handler.
 		/// </summary>
 		/// <param name="client">The client.</param>
 		/// <param name="e">The event args.</param>
 		private Task InteractionHandler(DiscordClient client, InteractionCreateEventArgs e)
 		{
 			_ = Task.Run(async () =>
 			{
 				if (e.Interaction.Type == InteractionType.ApplicationCommand)
 				{
 					//Creates the context
 					var context = new InteractionContext
 					{
 						Interaction = e.Interaction,
 						Channel = e.Interaction.Channel,
 						Guild = e.Interaction.Guild,
 						User = e.Interaction.User,
 						Client = client,
 						ApplicationCommandsExtension = this,
 						CommandName = e.Interaction.Data.Name,
 						InteractionId = e.Interaction.Id,
 						Token = e.Interaction.Token,
 						Services = Configuration?.ServiceProvider,
-						ResolvedUserMentions = e.Interaction.Data.Resolved?.Users?.Values.ToList(),
-						ResolvedRoleMentions = e.Interaction.Data.Resolved?.Roles?.Values.ToList(),
-						ResolvedChannelMentions = e.Interaction.Data.Resolved?.Channels?.Values.ToList(),
-						ResolvedAttachments = e.Interaction.Data.Resolved?.Attachments?.Values.ToList(),
+						ResolvedUserMentions = e.Interaction.Data.Resolved?.Users?.Values.ToArray(),
+						ResolvedRoleMentions = e.Interaction.Data.Resolved?.Roles?.Values.ToArray(),
+						ResolvedChannelMentions = e.Interaction.Data.Resolved?.Channels?.Values.ToArray(),
+						ResolvedAttachments = e.Interaction.Data.Resolved?.Attachments?.Values.ToArray(),
 						Type = ApplicationCommandType.ChatInput,
 						Locale = e.Interaction.Locale,
 						GuildLocale = e.Interaction.GuildLocale
 					};
 
 					try
 					{
 						if (s_errored)
 							throw new InvalidOperationException("Slash commands failed to register properly on startup.");
 
 						var methods = s_commandMethods.Where(x => x.CommandId == e.Interaction.Data.Id);
 						var groups = s_groupCommands.Where(x => x.CommandId == e.Interaction.Data.Id);
 						var subgroups = s_subGroupCommands.Where(x => x.CommandId == e.Interaction.Data.Id);
 						if (!methods.Any() && !groups.Any() && !subgroups.Any())
 							throw new InvalidOperationException("A slash command was executed, but no command was registered for it.");
 
 						if (methods.Any())
 						{
 							var method = methods.First().Method;
 
 							var args = await this.ResolveInteractionCommandParameters(e, context, method, e.Interaction.Data.Options);
 
 							await this.RunCommandAsync(context, method, args);
 						}
 						else if (groups.Any())
 						{
 							var command = e.Interaction.Data.Options.First();
 							var method = groups.First().Methods.First(x => x.Key == command.Name).Value;
 
 							var args = await this.ResolveInteractionCommandParameters(e, context, method, e.Interaction.Data.Options.First().Options);
 
 							await this.RunCommandAsync(context, method, args);
 						}
 						else if (subgroups.Any())
 						{
 							var command = e.Interaction.Data.Options.First();
 							var group = subgroups.First().SubCommands.First(x => x.Name == command.Name);
 
 							var method = group.Methods.First(x => x.Key == command.Options.First().Name).Value;
 
 							var args = await this.ResolveInteractionCommandParameters(e, context, method, e.Interaction.Data.Options.First().Options.First().Options);
 
 							await this.RunCommandAsync(context, method, args);
 						}
 
 						await this._slashExecuted.InvokeAsync(this, new SlashCommandExecutedEventArgs(this.Client.ServiceProvider) { Context = context });
 					}
 					catch (Exception ex)
 					{
 						await this._slashError.InvokeAsync(this, new SlashCommandErrorEventArgs(this.Client.ServiceProvider) { Context = context, Exception = ex });
 					}
 				}
 				else if (e.Interaction.Type == InteractionType.AutoComplete)
 				{
 					if (s_errored)
 						throw new InvalidOperationException("Slash commands failed to register properly on startup.");
 
 					var methods = s_commandMethods.Where(x => x.CommandId == e.Interaction.Data.Id);
 					var groups = s_groupCommands.Where(x => x.CommandId == e.Interaction.Data.Id);
 					var subgroups = s_subGroupCommands.Where(x => x.CommandId == e.Interaction.Data.Id);
 					if (!methods.Any() && !groups.Any() && !subgroups.Any())
 						throw new InvalidOperationException("An autocomplete interaction was created, but no command was registered for it.");
 
 					try
 					{
 						if (methods.Any())
 						{
 							var focusedOption = e.Interaction.Data.Options.First(o => o.Focused);
 							var method = methods.First().Method;
 
 							var option = method.GetParameters().Skip(1).First(p => p.GetCustomAttribute<OptionAttribute>().Name == focusedOption.Name);
 							var provider = option.GetCustomAttribute<AutocompleteAttribute>().ProviderType;
 							var providerMethod = provider.GetMethod(nameof(IAutocompleteProvider.Provider));
 							var providerInstance = Activator.CreateInstance(provider);
 
 							var context = new AutocompleteContext
 							{
 								Interaction = e.Interaction,
 								Client = this.Client,
 								Services = Configuration?.ServiceProvider,
 								ApplicationCommandsExtension = this,
 								Guild = e.Interaction.Guild,
 								Channel = e.Interaction.Channel,
 								User = e.Interaction.User,
-								Options = e.Interaction.Data.Options.ToList(),
+								Options = e.Interaction.Data.Options.ToArray(),
 								FocusedOption = focusedOption,
 								Locale = e.Interaction.Locale,
 								GuildLocale = e.Interaction.GuildLocale
 							};
 
 							var choices = await (Task<IEnumerable<DiscordApplicationCommandAutocompleteChoice>>) providerMethod.Invoke(providerInstance, new[] { context });
 							await e.Interaction.CreateResponseAsync(InteractionResponseType.AutoCompleteResult, new DiscordInteractionResponseBuilder().AddAutoCompleteChoices(choices));
 						}
 						else if (groups.Any())
 						{
 							var command = e.Interaction.Data.Options.First();
 							var group = groups.First().Methods.First(x => x.Key == command.Name).Value;
 
 							var focusedOption = command.Options.First(o => o.Focused);
 							var option = group.GetParameters().Skip(1).First(p => p.GetCustomAttribute<OptionAttribute>().Name == focusedOption.Name);
 							var provider = option.GetCustomAttribute<AutocompleteAttribute>().ProviderType;
 							var providerMethod = provider.GetMethod(nameof(IAutocompleteProvider.Provider));
 							var providerInstance = Activator.CreateInstance(provider);
 
 							var context = new AutocompleteContext
 							{
 								Interaction = e.Interaction,
 								Services = Configuration?.ServiceProvider,
 								ApplicationCommandsExtension = this,
 								Guild = e.Interaction.Guild,
 								Channel = e.Interaction.Channel,
 								User = e.Interaction.User,
-								Options = command.Options.ToList(),
+								Options = command.Options.ToArray(),
 								FocusedOption = focusedOption,
 								Locale = e.Interaction.Locale,
 								GuildLocale = e.Interaction.GuildLocale
 							};
 
 							var choices = await (Task<IEnumerable<DiscordApplicationCommandAutocompleteChoice>>) providerMethod.Invoke(providerInstance, new[] { context });
 							await e.Interaction.CreateResponseAsync(InteractionResponseType.AutoCompleteResult, new DiscordInteractionResponseBuilder().AddAutoCompleteChoices(choices));
 						}
 						else if (subgroups.Any())
                         {
                             var command = e.Interaction.Data.Options.First();
                             var group = subgroups.First().SubCommands.First(x => x.Name == command.Name).Methods.First(x => x.Key == command.Options.First().Name).Value;
 
                             var focusedOption = command.Options.First().Options.First(o => o.Focused);
 
                             var option = group.GetParameters().Skip(1).First(p => p.GetCustomAttribute<OptionAttribute>().Name == focusedOption.Name);
                             var provider = option.GetCustomAttribute<AutocompleteAttribute>().ProviderType;
                             var providerMethod = provider.GetMethod(nameof(IAutocompleteProvider.Provider));
                             var providerInstance = Activator.CreateInstance(provider);
 
                             var context = new AutocompleteContext
                             {
                                 Interaction = e.Interaction,
                                 Services = Configuration?.ServiceProvider,
                                 ApplicationCommandsExtension = this,
                                 Guild = e.Interaction.Guild,
                                 Channel = e.Interaction.Channel,
                                 User = e.Interaction.User,
-                                Options = command.Options.First().Options.ToList(),
+                                Options = command.Options.First().Options.ToArray(),
                                 FocusedOption = focusedOption,
 								Locale = e.Interaction.Locale,
 								GuildLocale = e.Interaction.GuildLocale
 							};
 
                             var choices = await (Task<IEnumerable<DiscordApplicationCommandAutocompleteChoice>>) providerMethod.Invoke(providerInstance, new[] { context });
                             await e.Interaction.CreateResponseAsync(InteractionResponseType.AutoCompleteResult, new DiscordInteractionResponseBuilder().AddAutoCompleteChoices(choices));
                         }
 					}
 					catch (Exception ex)
 					{
 						this.Client.Logger.LogError(ex, "Error in autocomplete interaction");
 					}
 				}
 			});
 			return Task.CompletedTask;
 		}
 
 		/// <summary>
 		/// Context menu handler.
 		/// </summary>
 		/// <param name="client">The client.</param>
 		/// <param name="e">The event args.</param>
 		private Task ContextMenuHandler(DiscordClient client, ContextMenuInteractionCreateEventArgs e)
 		{
 			_ = Task.Run(async () =>
 			{
 				//Creates the context
 				var context = new ContextMenuContext
 				{
 					Interaction = e.Interaction,
 					Channel = e.Interaction.Channel,
 					Client = client,
 					Services = Configuration?.ServiceProvider,
 					CommandName = e.Interaction.Data.Name,
 					ApplicationCommandsExtension = this,
 					Guild = e.Interaction.Guild,
 					InteractionId = e.Interaction.Id,
 					User = e.Interaction.User,
 					Token = e.Interaction.Token,
 					TargetUser = e.TargetUser,
 					TargetMessage = e.TargetMessage,
 					Type = e.Type,
 					Locale = e.Interaction.Locale,
 					GuildLocale = e.Interaction.GuildLocale
 				};
 
 				try
 				{
 					if (s_errored)
 						throw new InvalidOperationException("Context menus failed to register properly on startup.");
 
 					//Gets the method for the command
 					var method = s_contextMenuCommands.FirstOrDefault(x => x.CommandId == e.Interaction.Data.Id);
 
 					if (method == null)
 						throw new InvalidOperationException("A context menu was executed, but no command was registered for it.");
 
 					await this.RunCommandAsync(context, method.Method, new[] { context });
 
 					await this._contextMenuExecuted.InvokeAsync(this, new ContextMenuExecutedEventArgs(this.Client.ServiceProvider) { Context = context });
 				}
 				catch (Exception ex)
 				{
 					await this._contextMenuErrored.InvokeAsync(this, new ContextMenuErrorEventArgs(this.Client.ServiceProvider) { Context = context, Exception = ex });
 				}
 			});
 
 			return Task.CompletedTask;
 		}
 
 		/// <summary>
 		/// Runs a command.
 		/// </summary>
 		/// <param name="context">The base context.</param>
 		/// <param name="method">The method info.</param>
 		/// <param name="args">The arguments.</param>
 		[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0066:Convert switch statement to expression", Justification = "<Pending>")]
 		internal async Task RunCommandAsync(BaseContext context, MethodInfo method, IEnumerable<object> args)
 		{
 			object classInstance;
 
 			//Accounts for lifespans
 			var moduleLifespan = (method.DeclaringType.GetCustomAttribute<ApplicationCommandModuleLifespanAttribute>() != null ? method.DeclaringType.GetCustomAttribute<ApplicationCommandModuleLifespanAttribute>()?.Lifespan : ApplicationCommandModuleLifespan.Transient) ?? ApplicationCommandModuleLifespan.Transient;
 			switch (moduleLifespan)
 			{
 				case ApplicationCommandModuleLifespan.Scoped:
 					//Accounts for static methods and adds DI
 					classInstance = method.IsStatic ? ActivatorUtilities.CreateInstance(Configuration?.ServiceProvider.CreateScope().ServiceProvider, method.DeclaringType) : CreateInstance(method.DeclaringType, Configuration?.ServiceProvider.CreateScope().ServiceProvider);
 					break;
 
 				case ApplicationCommandModuleLifespan.Transient:
 					//Accounts for static methods and adds DI
 					classInstance = method.IsStatic ? ActivatorUtilities.CreateInstance(Configuration?.ServiceProvider, method.DeclaringType) : CreateInstance(method.DeclaringType, Configuration?.ServiceProvider);
 					break;
 
 				//If singleton, gets it from the singleton list
 				case ApplicationCommandModuleLifespan.Singleton:
 					classInstance = s_singletonModules.First(x => ReferenceEquals(x.GetType(), method.DeclaringType));
 					break;
 
 				default:
 					throw new Exception($"An unknown {nameof(ApplicationCommandModuleLifespanAttribute)} scope was specified on command {context.CommandName}");
 			}
 
 			ApplicationCommandsModule module = null;
 			if (classInstance is ApplicationCommandsModule mod)
 				module = mod;
 
 			// Slash commands
 			if (context is InteractionContext slashContext)
 			{
 				await this.RunPreexecutionChecksAsync(method, slashContext);
 
 				var shouldExecute = await (module?.BeforeSlashExecutionAsync(slashContext) ?? Task.FromResult(true));
 
 				if (shouldExecute)
 				{
 					if (AutoDeferEnabled)
 						await context.CreateResponseAsync(InteractionResponseType.DeferredChannelMessageWithSource);
 					await (Task)method.Invoke(classInstance, args.ToArray());
 
 					await (module?.AfterSlashExecutionAsync(slashContext) ?? Task.CompletedTask);
 				}
 			}
 			// Context menus
 			if (context is ContextMenuContext contextMenuContext)
 			{
 				await this.RunPreexecutionChecksAsync(method, contextMenuContext);
 
 				var shouldExecute = await (module?.BeforeContextMenuExecutionAsync(contextMenuContext) ?? Task.FromResult(true));
 
 				if (shouldExecute)
 				{
 					if (AutoDeferEnabled)
 						await context.CreateResponseAsync(InteractionResponseType.DeferredChannelMessageWithSource);
 					await (Task)method.Invoke(classInstance, args.ToArray());
 
 					await (module?.AfterContextMenuExecutionAsync(contextMenuContext) ?? Task.CompletedTask);
 				}
 			}
 		}
 
 		/// <summary>
 		/// Property injection
 		/// </summary>
 		/// <param name="t">The type.</param>
 		/// <param name="services">The services.</param>
 		internal static object CreateInstance(Type t, IServiceProvider services)
 		{
 			var ti = t.GetTypeInfo();
 			var constructors = ti.DeclaredConstructors
 				.Where(xci => xci.IsPublic)
 				.ToArray();
 
 			if (constructors.Length != 1)
 				throw new ArgumentException("Specified type does not contain a public constructor or contains more than one public constructor.");
 
 			var constructor = constructors[0];
 			var constructorArgs = constructor.GetParameters();
 			var args = new object[constructorArgs.Length];
 
 			if (constructorArgs.Length != 0 && services == null)
 				throw new InvalidOperationException("Dependency collection needs to be specified for parameterized constructors.");
 
 			// inject via constructor
 			if (constructorArgs.Length != 0)
 				for (var i = 0; i < args.Length; i++)
 					args[i] = services.GetRequiredService(constructorArgs[i].ParameterType);
 
 			var moduleInstance = Activator.CreateInstance(t, args);
 
 			// inject into properties
 			var props = t.GetRuntimeProperties().Where(xp => xp.CanWrite && xp.SetMethod != null && !xp.SetMethod.IsStatic && xp.SetMethod.IsPublic);
 			foreach (var prop in props)
 			{
 				if (prop.GetCustomAttribute<DontInjectAttribute>() != null)
 					continue;
 
 				var service = services.GetService(prop.PropertyType);
 				if (service == null)
 					continue;
 
 				prop.SetValue(moduleInstance, service);
 			}
 
 			// inject into fields
 			var fields = t.GetRuntimeFields().Where(xf => !xf.IsInitOnly && !xf.IsStatic && xf.IsPublic);
 			foreach (var field in fields)
 			{
 				if (field.GetCustomAttribute<DontInjectAttribute>() != null)
 					continue;
 
 				var service = services.GetService(field.FieldType);
 				if (service == null)
 					continue;
 
 				field.SetValue(moduleInstance, service);
 			}
 
 			return moduleInstance;
 		}
 
 		/// <summary>
 		/// Resolves the slash command parameters.
 		/// </summary>
 		/// <param name="e">The event arguments.</param>
 		/// <param name="context">The interaction context.</param>
 		/// <param name="method">The method info.</param>
 		/// <param name="options">The options.</param>
 		private async Task<List<object>> ResolveInteractionCommandParameters(InteractionCreateEventArgs e, InteractionContext context, MethodInfo method, IEnumerable<DiscordInteractionDataOption> options)
 		{
 			var args = new List<object> { context };
 			var parameters = method.GetParameters().Skip(1);
 
 			foreach (var parameter in parameters)
 			{
 				//Accounts for optional arguments without values given
 				if (parameter.IsOptional && (options == null || (!options?.Any(x => x.Name == parameter.GetCustomAttribute<OptionAttribute>().Name.ToLower()) ?? true)))
 					args.Add(parameter.DefaultValue);
 				else
 				{
 					var option = options.Single(x => x.Name == parameter.GetCustomAttribute<OptionAttribute>().Name.ToLower());
 
 					if (parameter.ParameterType == typeof(string))
 						args.Add(option.Value.ToString());
 					else if (parameter.ParameterType.IsEnum)
 						args.Add(Enum.Parse(parameter.ParameterType, (string)option.Value));
 					else if (parameter.ParameterType == typeof(long) || parameter.ParameterType == typeof(long?))
 						args.Add((long?)option.Value);
 					else if (parameter.ParameterType == typeof(bool) || parameter.ParameterType == typeof(bool?))
 						args.Add((bool?)option.Value);
 					else if (parameter.ParameterType == typeof(double) || parameter.ParameterType == typeof(double?))
 						args.Add((double?)option.Value);
 					else if (parameter.ParameterType == typeof(int) || parameter.ParameterType == typeof(int?))
 						args.Add((int?)option.Value);
 					else if (parameter.ParameterType == typeof(DiscordAttachment))
 					{
 						//Checks through resolved
 						if (e.Interaction.Data.Resolved.Attachments != null &&
 							e.Interaction.Data.Resolved.Attachments.TryGetValue((ulong)option.Value, out var attachment))
 							args.Add(attachment);
 						else
 							args.Add(new DiscordAttachment() { Id = (ulong)option.Value, Discord = this.Client.ApiClient.Discord });
 					}
 					else if (parameter.ParameterType == typeof(DiscordUser))
 					{
 						//Checks through resolved
 						if (e.Interaction.Data.Resolved.Members != null &&
 							e.Interaction.Data.Resolved.Members.TryGetValue((ulong)option.Value, out var member))
 							args.Add(member);
 						else if (e.Interaction.Data.Resolved.Users != null &&
 								 e.Interaction.Data.Resolved.Users.TryGetValue((ulong)option.Value, out var user))
 							args.Add(user);
 						else
 							args.Add(await this.Client.GetUserAsync((ulong)option.Value));
 					}
 					else if (parameter.ParameterType == typeof(DiscordChannel))
 					{
 						//Checks through resolved
 						if (e.Interaction.Data.Resolved.Channels != null &&
 							e.Interaction.Data.Resolved.Channels.TryGetValue((ulong)option.Value, out var channel))
 							args.Add(channel);
 						else
 							args.Add(e.Interaction.Guild.GetChannel((ulong)option.Value));
 					}
 					else if (parameter.ParameterType == typeof(DiscordRole))
 					{
 						//Checks through resolved
 						if (e.Interaction.Data.Resolved.Roles != null &&
 							e.Interaction.Data.Resolved.Roles.TryGetValue((ulong)option.Value, out var role))
 							args.Add(role);
 						else
 							args.Add(e.Interaction.Guild.GetRole((ulong)option.Value));
 					}
 					else if (parameter.ParameterType == typeof(SnowflakeObject))
 					{
 						//Checks through resolved
 						if (e.Interaction.Data.Resolved.Roles != null && e.Interaction.Data.Resolved.Roles.TryGetValue((ulong)option.Value, out var role))
 							args.Add(role);
 						else if (e.Interaction.Data.Resolved.Members != null && e.Interaction.Data.Resolved.Members.TryGetValue((ulong)option.Value, out var member))
 							args.Add(member);
 						else if (e.Interaction.Data.Resolved.Users != null && e.Interaction.Data.Resolved.Users.TryGetValue((ulong)option.Value, out var user))
 							args.Add(user);
 						else
 							throw new ArgumentException("Error resolving mentionable option.");
 					}
 					else
 						throw new ArgumentException($"Error resolving interaction.");
 				}
 			}
 
 			return args;
 		}
 
 		/// <summary>
 		/// Runs the pre-execution checks.
 		/// </summary>
 		/// <param name="method">The method info.</param>
 		/// <param name="context">The base context.</param>
 		private async Task RunPreexecutionChecksAsync(MethodInfo method, BaseContext context)
 		{
 			if (context is InteractionContext ctx)
 			{
 				//Gets all attributes from parent classes as well and stuff
 				var attributes = new List<SlashCheckBaseAttribute>();
 				attributes.AddRange(method.GetCustomAttributes<SlashCheckBaseAttribute>(true));
 				attributes.AddRange(method.DeclaringType.GetCustomAttributes<SlashCheckBaseAttribute>());
 				if (method.DeclaringType.DeclaringType != null)
 				{
 					attributes.AddRange(method.DeclaringType.DeclaringType.GetCustomAttributes<SlashCheckBaseAttribute>());
 					if (method.DeclaringType.DeclaringType.DeclaringType != null)
 					{
 						attributes.AddRange(method.DeclaringType.DeclaringType.DeclaringType.GetCustomAttributes<SlashCheckBaseAttribute>());
 					}
 				}
 
 				var dict = new Dictionary<SlashCheckBaseAttribute, bool>();
 				foreach (var att in attributes)
 				{
 					//Runs the check and adds the result to a list
 					var result = await att.ExecuteChecksAsync(ctx);
 					dict.Add(att, result);
 				}
 
 				//Checks if any failed, and throws an exception
 				if (dict.Any(x => x.Value == false))
-					throw new SlashExecutionChecksFailedException { FailedChecks = dict.Where(x => x.Value == false).Select(x => x.Key).ToList() };
+					throw new SlashExecutionChecksFailedException { FailedChecks = dict.Where(x => x.Value == false).Select(x => x.Key).ToArray() };
 			}
 			if (context is ContextMenuContext cMctx)
 			{
 				var attributes = new List<ContextMenuCheckBaseAttribute>();
 				attributes.AddRange(method.GetCustomAttributes<ContextMenuCheckBaseAttribute>(true));
 				attributes.AddRange(method.DeclaringType.GetCustomAttributes<ContextMenuCheckBaseAttribute>());
 				if (method.DeclaringType.DeclaringType != null)
 				{
 					attributes.AddRange(method.DeclaringType.DeclaringType.GetCustomAttributes<ContextMenuCheckBaseAttribute>());
 					if (method.DeclaringType.DeclaringType.DeclaringType != null)
 					{
 						attributes.AddRange(method.DeclaringType.DeclaringType.DeclaringType.GetCustomAttributes<ContextMenuCheckBaseAttribute>());
 					}
 				}
 
 				var dict = new Dictionary<ContextMenuCheckBaseAttribute, bool>();
 				foreach (var att in attributes)
 				{
 					//Runs the check and adds the result to a list
 					var result = await att.ExecuteChecksAsync(cMctx);
 					dict.Add(att, result);
 				}
 
 				//Checks if any failed, and throws an exception
 				if (dict.Any(x => x.Value == false))
-					throw new ContextMenuExecutionChecksFailedException { FailedChecks = dict.Where(x => x.Value == false).Select(x => x.Key).ToList() };
-			}
-		}
-
-		/// <summary>
-		/// Gets the choice attributes from choice provider.
-		/// </summary>
-		/// <param name="customAttributes">The custom attributes.</param>
-		/// <param name="guildId">The optional guild id</param>
-		private static async Task<List<DiscordApplicationCommandOptionChoice>> GetChoiceAttributesFromProvider(IEnumerable<ChoiceProviderAttribute> customAttributes, ulong? guildId = null)
-		{
-			var choices = new List<DiscordApplicationCommandOptionChoice>();
-			foreach (var choiceProviderAttribute in customAttributes)
-			{
-				var method = choiceProviderAttribute.ProviderType.GetMethod(nameof(IChoiceProvider.Provider));
-
-				if (method == null)
-					throw new ArgumentException("ChoiceProviders must inherit from IChoiceProvider.");
-				else
-				{
-					var instance = Activator.CreateInstance(choiceProviderAttribute.ProviderType);
-
-					// Abstract class offers more properties that can be set
-					if (choiceProviderAttribute.ProviderType.IsSubclassOf(typeof(ChoiceProvider)))
-					{
-						choiceProviderAttribute.ProviderType.GetProperty(nameof(ChoiceProvider.GuildId))
-							?.SetValue(instance, guildId);
-
-						choiceProviderAttribute.ProviderType.GetProperty(nameof(ChoiceProvider.Services))
-							?.SetValue(instance, Configuration.ServiceProvider);
-					}
-
-					//Gets the choices from the method
-					var result = await (Task<IEnumerable<DiscordApplicationCommandOptionChoice>>)method.Invoke(instance, null);
-
-					if (result.Any())
-					{
-						choices.AddRange(result);
-					}
-				}
+					throw new ContextMenuExecutionChecksFailedException { FailedChecks = dict.Where(x => x.Value == false).Select(x => x.Key).ToArray() };
 			}
-
-			return choices;
-		}
-
-		/// <summary>
-		/// Gets the choice attributes from enum parameter.
-		/// </summary>
-		/// <param name="enumParam">The enum parameter.</param>
-		private static List<DiscordApplicationCommandOptionChoice> GetChoiceAttributesFromEnumParameter(Type enumParam)
-		{
-			var choices = new List<DiscordApplicationCommandOptionChoice>();
-			foreach (Enum enumValue in Enum.GetValues(enumParam))
-			{
-				choices.Add(new DiscordApplicationCommandOptionChoice(enumValue.GetName(), enumValue.ToString()));
-			}
-			return choices;
 		}
 
 		/// <summary>
 		/// Gets the parameter type.
 		/// </summary>
 		/// <param name="type">The type.</param>
 		private static ApplicationCommandOptionType GetParameterType(Type type)
 		{
 			var parameterType = type == typeof(string)
 				? ApplicationCommandOptionType.String
 				: type == typeof(long) || type == typeof(long?) || type == typeof(int) || type == typeof(int?)
 				? ApplicationCommandOptionType.Integer
 				: type == typeof(bool) || type == typeof(bool?)
 				? ApplicationCommandOptionType.Boolean
 				: type == typeof(double) || type == typeof(double?)
 				? ApplicationCommandOptionType.Number
 				: type == typeof(DiscordAttachment)
 				? ApplicationCommandOptionType.Attachment
 				: type == typeof(DiscordChannel)
 				? ApplicationCommandOptionType.Channel
 				: type == typeof(DiscordUser)
 				? ApplicationCommandOptionType.User
 				: type == typeof(DiscordRole)
 				? ApplicationCommandOptionType.Role
 				: type == typeof(SnowflakeObject)
 				? ApplicationCommandOptionType.Mentionable
 				: type.IsEnum
 				? ApplicationCommandOptionType.String
 				: throw new ArgumentException("Cannot convert type! Argument types must be string, int, long, bool, double, DiscordChannel, DiscordUser, DiscordRole, SnowflakeObject, DiscordAttachment or an Enum.");
 			return parameterType;
 		}
 
-		/// <summary>
-		/// Gets the choice attributes from parameter.
-		/// </summary>
-		/// <param name="choiceAttributes">The choice attributes.</param>
-		private static List<DiscordApplicationCommandOptionChoice> GetChoiceAttributesFromParameter(IEnumerable<ChoiceAttribute> choiceAttributes) =>
-			!choiceAttributes.Any()
-				? null
-				: choiceAttributes.Select(att => new DiscordApplicationCommandOptionChoice(att.Name, att.Value)).ToList();
-
 		/// <summary>
 		/// Parses the parameters.
 		/// </summary>
 		/// <param name="parameters">The parameters.</param>
 		/// <param name="guildId">The optional guild id.</param>
 		internal static async Task<List<DiscordApplicationCommandOption>> ParseParametersAsync(IEnumerable<ParameterInfo> parameters, ulong? guildId)
 		{
 			var options = new List<DiscordApplicationCommandOption>();
 			foreach (var parameter in parameters)
 			{
 				//Gets the attribute
 				var optionAttribute = parameter.GetCustomAttribute<OptionAttribute>();
 				if (optionAttribute == null)
 					throw new ArgumentException("Arguments must have the Option attribute!");
 
 				var minimumValue = parameter.GetCustomAttribute<MinimumAttribute>()?.Value ?? null;
 				var maximumValue = parameter.GetCustomAttribute<MaximumAttribute>()?.Value ?? null;
 
 
 				var autocompleteAttribute = parameter.GetCustomAttribute<AutocompleteAttribute>();
 				if (optionAttribute.Autocomplete && autocompleteAttribute == null)
 					throw new ArgumentException("Autocomplete options must have the Autocomplete attribute!");
 				if (!optionAttribute.Autocomplete && autocompleteAttribute != null)
 					throw new ArgumentException("Setting an autocomplete provider requires the option to have autocomplete set to true!");
 
 				//Sets the type
 				var type = parameter.ParameterType;
 				var parameterType = GetParameterType(type);
 
 				//Handles choices
 				//From attributes
-				var choices = GetChoiceAttributesFromParameter(parameter.GetCustomAttributes<ChoiceAttribute>());
+				IEnumerable<DiscordApplicationCommandOptionChoice> choices = null;
 				//From enums
 				if (parameter.ParameterType.IsEnum)
 				{
-					choices = GetChoiceAttributesFromEnumParameter(parameter.ParameterType);
+					choices = Enum.GetValues(parameter.ParameterType).OfType<int>().Select(enumValue =>
+						new DiscordApplicationCommandOptionChoice(enumValue.GetName(), enumValue.ToString()));
 				}
 				//From choice provider
 				var choiceProviders = parameter.GetCustomAttributes<ChoiceProviderAttribute>();
 				if (choiceProviders.Any())
 				{
-					choices = await GetChoiceAttributesFromProvider(choiceProviders, guildId);
+					choices = (await Task.WhenAll(choiceProviders.Select(async choiceProviderAttribute =>
+					{
+						var method = choiceProviderAttribute.ProviderType.GetMethod(nameof(IChoiceProvider.Provider));
+
+						if (method == null)
+							throw new ArgumentException("ChoiceProviders must inherit from IChoiceProvider.");
+
+						var instance = Activator.CreateInstance(choiceProviderAttribute.ProviderType);
+
+						// Abstract class offers more properties that can be set
+						if (choiceProviderAttribute.ProviderType.IsSubclassOf(typeof(ChoiceProvider)))
+						{
+							choiceProviderAttribute.ProviderType.GetProperty(nameof(ChoiceProvider.GuildId))
+								?.SetValue(instance, guildId);
+
+							choiceProviderAttribute.ProviderType.GetProperty(nameof(ChoiceProvider.Services))
+								?.SetValue(instance, Configuration.ServiceProvider);
+						}
+
+						//Gets the choices from the method
+						return await (Task<IEnumerable<DiscordApplicationCommandOptionChoice>>)method.Invoke(instance, null);
+					}))).SelectMany(x => x);
 				}
 
+				choices ??= GetChoiceAttributesFromParameter(parameter.GetCustomAttributes<ChoiceAttribute>());
+
+				IEnumerable<DiscordApplicationCommandOptionChoice> GetChoiceAttributesFromParameter(IEnumerable<ChoiceAttribute> choiceAttributes) =>
+					!choiceAttributes.Any()
+						? null
+						: choiceAttributes.Select(att => new DiscordApplicationCommandOptionChoice(att.Name, att.Value));
+
 				var channelTypes = parameter.GetCustomAttribute<ChannelTypesAttribute>()?.ChannelTypes ?? null;
 
 				options.Add(new DiscordApplicationCommandOption(optionAttribute.Name, optionAttribute.Description, parameterType, !parameter.IsOptional, choices, null, channelTypes, optionAttribute.Autocomplete, minimumValue, maximumValue));
 			}
 
 			return options;
 		}
 
 		/// <summary>
 		/// <para>Refreshes your commands, used for refreshing choice providers or applying commands registered after the ready event on the discord client.
 		/// Should only be run on the slash command extension linked to shard 0 if sharding.</para>
 		/// <para>Not recommended and should be avoided since it can make slash commands be unresponsive for a while.</para>
 		/// </summary>
 		public async Task RefreshCommandsAsync()
 		{
 			s_commandMethods.Clear();
 			s_groupCommands.Clear();
 			s_subGroupCommands.Clear();
 			s_registeredCommands.Clear();
 			s_contextMenuCommands.Clear();
 			GlobalDiscordCommands.Clear();
 			GuildDiscordCommands.Clear();
 			GuildCommandsInternal.Clear();
 			GlobalCommandsInternal.Clear();
 			GlobalDiscordCommands = null;
 			GuildDiscordCommands = null;
 			s_errored = false;
 
 			if (Configuration != null && Configuration.EnableDefaultHelp)
 			{
 				this._updateList.RemoveAll(x => x.Value.Type == typeof(DefaultHelpModule));
 			}
 
 			await this.UpdateAsync();
 		}
 
 		/// <summary>
 		/// Fires when the execution of a slash command fails.
 		/// </summary>
 		public event AsyncEventHandler<ApplicationCommandsExtension, SlashCommandErrorEventArgs> SlashCommandErrored
 		{
 			add => this._slashError.Register(value);
 			remove => this._slashError.Unregister(value);
 		}
 		private AsyncEvent<ApplicationCommandsExtension, SlashCommandErrorEventArgs> _slashError;
 
 		/// <summary>
 		/// Fires when the execution of a slash command is successful.
 		/// </summary>
 		public event AsyncEventHandler<ApplicationCommandsExtension, SlashCommandExecutedEventArgs> SlashCommandExecuted
 		{
 			add => this._slashExecuted.Register(value);
 			remove => this._slashExecuted.Unregister(value);
 		}
 		private AsyncEvent<ApplicationCommandsExtension, SlashCommandExecutedEventArgs> _slashExecuted;
 
 		/// <summary>
 		/// Fires when the execution of a context menu fails.
 		/// </summary>
 		public event AsyncEventHandler<ApplicationCommandsExtension, ContextMenuErrorEventArgs> ContextMenuErrored
 		{
 			add => this._contextMenuErrored.Register(value);
 			remove => this._contextMenuErrored.Unregister(value);
 		}
 		private AsyncEvent<ApplicationCommandsExtension, ContextMenuErrorEventArgs> _contextMenuErrored;
 
 		/// <summary>
 		/// Fire when the execution of a context menu is successful.
 		/// </summary>
 		public event AsyncEventHandler<ApplicationCommandsExtension, ContextMenuExecutedEventArgs> ContextMenuExecuted
 		{
 			add => this._contextMenuExecuted.Register(value);
 			remove => this._contextMenuExecuted.Unregister(value);
 		}
 		private AsyncEvent<ApplicationCommandsExtension, ContextMenuExecutedEventArgs> _contextMenuExecuted;
 	}
 
 	/// <summary>
 	/// Holds configuration data for setting up an application command.
 	/// </summary>
 	internal class ApplicationCommandsModuleConfiguration
 	{
 		/// <summary>
 		/// The type of the command module.
 		/// </summary>
 		public Type Type { get; }
 
 		/// <summary>
 		/// The translation setup.
 		/// </summary>
 		public Action<ApplicationCommandsTranslationContext> Translations { get; }
 
 		/// <summary>
 		/// Creates a new command configuration.
 		/// </summary>
 		/// <param name="type">The type of the command module.</param>
 		/// <param name="translations">The translation setup callback.</param>
 		public ApplicationCommandsModuleConfiguration(Type type, Action<ApplicationCommandsTranslationContext> translations = null)
 		{
 			this.Type = type;
 			this.Translations = translations;
 		}
 	}
 
 	/// <summary>
 	/// Links a command to its original command module.
 	/// </summary>
 	internal class ApplicationCommandSourceLink
 	{
 		/// <summary>
 		/// The command.
 		/// </summary>
 		public DiscordApplicationCommand ApplicationCommand { get; set; }
 
 		/// <summary>
 		/// The base/root module the command is contained in.
 		/// </summary>
 		public Type RootCommandContainerType { get; set; }
 
 		/// <summary>
 		/// The direct group the command is contained in.
 		/// </summary>
 		public Type CommandContainerType { get; set; }
 	}
 
 	/// <summary>
 	/// The command method.
 	/// </summary>
 	internal class CommandMethod
 	{
 		/// <summary>
 		/// Gets or sets the command id.
 		/// </summary>
 		public ulong CommandId { get; set; }
 
 		/// <summary>
 		/// Gets or sets the name.
 		/// </summary>
 		public string Name { get; set; }
 
 		/// <summary>
 		/// Gets or sets the method.
 		/// </summary>
 		public MethodInfo Method { get; set; }
 	}
 
 	/// <summary>
 	/// The group command.
 	/// </summary>
 	internal class GroupCommand
 	{
 		/// <summary>
 		/// Gets or sets the command id.
 		/// </summary>
 		public ulong CommandId { get; set; }
 
 		/// <summary>
 		/// Gets or sets the name.
 		/// </summary>
 		public string Name { get; set; }
 
 		/// <summary>
 		/// Gets or sets the methods.
 		/// </summary>
 		public List<KeyValuePair<string, MethodInfo>> Methods { get; set; } = null;
 	}
 
 	/// <summary>
 	/// The sub group command.
 	/// </summary>
 	internal class SubGroupCommand
 	{
 		/// <summary>
 		/// Gets or sets the command id.
 		/// </summary>
 		public ulong CommandId { get; set; }
 
 		/// <summary>
 		/// Gets or sets the name.
 		/// </summary>
 		public string Name { get; set; }
 
 		/// <summary>
 		/// Gets or sets the sub commands.
 		/// </summary>
 		public List<GroupCommand> SubCommands { get; set; } = new();
 	}
 
 	/// <summary>
 	/// The context menu command.
 	/// </summary>
 	internal class ContextMenuCommand
 	{
 		/// <summary>
 		/// Gets or sets the command id.
 		/// </summary>
 		public ulong CommandId { get; set; }
 
 		/// <summary>
 		/// Gets or sets the name.
 		/// </summary>
 		public string Name { get; set; }
 
 		/// <summary>
 		/// Gets or sets the method.
 		/// </summary>
 		public MethodInfo Method { get; set; }
 	}
 
 	#region Default Help
 	/// <summary>
 	/// Represents the default help module.
 	/// </summary>
 	internal class DefaultHelpModule : ApplicationCommandsModule
 	{
 		public class DefaultHelpAutoCompleteProvider : IAutocompleteProvider
 		{
 			public async Task<IEnumerable<DiscordApplicationCommandAutocompleteChoice>> Provider(AutocompleteContext context)
 			{
 				var options = new List<DiscordApplicationCommandAutocompleteChoice>();
 
-				IEnumerable<DiscordApplicationCommand> slashCommands = null;
+				IEnumerable<DiscordApplicationCommand> slashCommands;
 				var globalCommandsTask = context.Client.GetGlobalApplicationCommandsAsync();
 				if (context.Guild != null)
 				{
 					var guildCommandsTask = context.Client.GetGuildApplicationCommandsAsync(context.Guild.Id);
 					await Task.WhenAll(globalCommandsTask, guildCommandsTask);
 					slashCommands = globalCommandsTask.Result.Concat(guildCommandsTask.Result)
 						.Where(ac => !ac.Name.Equals("help", StringComparison.OrdinalIgnoreCase))
 						.GroupBy(ac => ac.Name).Select(x => x.First())
-						.Where(ac => ac.Name.StartsWith(context.Options[0].Value.ToString(), StringComparison.OrdinalIgnoreCase))
-						.ToList();
+						.Where(ac => ac.Name.StartsWith(context.Options[0].Value.ToString(), StringComparison.OrdinalIgnoreCase));
 				}
 				else
 				{
 					await Task.WhenAll(globalCommandsTask);
 					slashCommands = globalCommandsTask.Result
 						.Where(ac => !ac.Name.Equals("help", StringComparison.OrdinalIgnoreCase))
 						.GroupBy(ac => ac.Name).Select(x => x.First())
-						.Where(ac => ac.Name.StartsWith(context.Options[0].Value.ToString(), StringComparison.OrdinalIgnoreCase))
-						.ToList();
+						.Where(ac => ac.Name.StartsWith(context.Options[0].Value.ToString(), StringComparison.OrdinalIgnoreCase));
 				}
 
 				foreach (var sc in slashCommands.Take(25))
 				{
 					options.Add(new DiscordApplicationCommandAutocompleteChoice(sc.Name, sc.Name.Trim()));
 				}
 				return options.AsEnumerable();
 			}
 		}
 
 		public class DefaultHelpAutoCompleteLevelOneProvider : IAutocompleteProvider
 		{
 			public async Task<IEnumerable<DiscordApplicationCommandAutocompleteChoice>> Provider(AutocompleteContext context)
 			{
-				var options = new List<DiscordApplicationCommandAutocompleteChoice>();
-				IEnumerable<DiscordApplicationCommand> slashCommands = null;
+				IEnumerable<DiscordApplicationCommand> slashCommands;
 				var globalCommandsTask = context.Client.GetGlobalApplicationCommandsAsync();
 				if (context.Guild != null)
 				{
 					var guildCommandsTask = context.Client.GetGuildApplicationCommandsAsync(context.Guild.Id);
 					await Task.WhenAll(globalCommandsTask, guildCommandsTask);
 					slashCommands = globalCommandsTask.Result.Concat(guildCommandsTask.Result)
 						.Where(ac => !ac.Name.Equals("help", StringComparison.OrdinalIgnoreCase))
 						.GroupBy(ac => ac.Name).Select(x => x.First());
 				}
 				else
 				{
 					await Task.WhenAll(globalCommandsTask);
 					slashCommands = globalCommandsTask.Result
 						.Where(ac => !ac.Name.Equals("help", StringComparison.OrdinalIgnoreCase))
 						.GroupBy(ac => ac.Name).Select(x => x.First());
 				}
 
 				var command = slashCommands.FirstOrDefault(ac =>
 					ac.Name.Equals(context.Options[0].Value.ToString().Trim(),StringComparison.OrdinalIgnoreCase));
 				if (command is null || command.Options is null)
-				{
-					options.Add(new DiscordApplicationCommandAutocompleteChoice("no_options_for_this_command", "no_options_for_this_command"));
-				}
-				else
-				{
-					var opt = command.Options.Where(c => c.Type is ApplicationCommandOptionType.SubCommandGroup or ApplicationCommandOptionType.SubCommand
-														 && c.Name.StartsWith(context.Options[1].Value.ToString(), StringComparison.InvariantCultureIgnoreCase)).ToList();
-					foreach (var option in opt.Take(25))
-					{
-						options.Add(new DiscordApplicationCommandAutocompleteChoice(option.Name, option.Name.Trim()));
-					}
-				}
-				return options.AsEnumerable();
+					return new [] { new DiscordApplicationCommandAutocompleteChoice("no_options_for_this_command", "no_options_for_this_command") };
+
+				return command.Options.Where(c => c.Type is ApplicationCommandOptionType.SubCommandGroup or ApplicationCommandOptionType.SubCommand
+				                                  && c.Name.StartsWith(context.Options[1].Value.ToString(), StringComparison.InvariantCultureIgnoreCase))
+					.Take(25)
+					.Select(option => new DiscordApplicationCommandAutocompleteChoice(option.Name, option.Name.Trim()));
 			}
 		}
 
 		public class DefaultHelpAutoCompleteLevelTwoProvider : IAutocompleteProvider
 		{
 			public async Task<IEnumerable<DiscordApplicationCommandAutocompleteChoice>> Provider(AutocompleteContext context)
 			{
-				var options = new List<DiscordApplicationCommandAutocompleteChoice>();
-				IEnumerable<DiscordApplicationCommand> slashCommands = null;
+				IEnumerable<DiscordApplicationCommand> slashCommands;
 				var globalCommandsTask = context.Client.GetGlobalApplicationCommandsAsync();
 				if (context.Guild != null)
 				{
 					var guildCommandsTask = context.Client.GetGuildApplicationCommandsAsync(context.Guild.Id);
 					await Task.WhenAll(globalCommandsTask, guildCommandsTask);
 					slashCommands = globalCommandsTask.Result.Concat(guildCommandsTask.Result)
 						.Where(ac => !ac.Name.Equals("help", StringComparison.OrdinalIgnoreCase))
 						.GroupBy(ac => ac.Name).Select(x => x.First());
 				}
 				else
 				{
 					await Task.WhenAll(globalCommandsTask);
 					slashCommands = globalCommandsTask.Result
 						.Where(ac => !ac.Name.Equals("help", StringComparison.OrdinalIgnoreCase))
 						.GroupBy(ac => ac.Name).Select(x => x.First());
 				}
 
 				var command = slashCommands.FirstOrDefault(ac =>
 					ac.Name.Equals(context.Options[0].Value.ToString().Trim(), StringComparison.OrdinalIgnoreCase));
 				if (command.Options is null)
-				{
-					options.Add(new DiscordApplicationCommandAutocompleteChoice("no_options_for_this_command", "no_options_for_this_command"));
-					return options.AsEnumerable();
-				}
+					return new [] { new DiscordApplicationCommandAutocompleteChoice("no_options_for_this_command", "no_options_for_this_command") };
+
 				var foundCommand = command.Options.FirstOrDefault(op => op.Name.Equals(context.Options[1].Value.ToString().Trim(), StringComparison.OrdinalIgnoreCase));
 				if (foundCommand is null || foundCommand.Options is null)
-				{
-					options.Add(new DiscordApplicationCommandAutocompleteChoice("no_options_for_this_command", "no_options_for_this_command"));
-				}
-				else
-				{
-					var opt = foundCommand.Options.Where(x => x.Type == ApplicationCommandOptionType.SubCommand &&
-															  x.Name.StartsWith(context.Options[2].Value.ToString(), StringComparison.OrdinalIgnoreCase)).ToList();
-					foreach (var option in opt.Take(25))
-					{
-						options.Add(new DiscordApplicationCommandAutocompleteChoice(option.Name, option.Name.Trim()));
-					}
-				}
-				return options.AsEnumerable();
+					return new [] { new DiscordApplicationCommandAutocompleteChoice("no_options_for_this_command", "no_options_for_this_command") };
+
+				return foundCommand.Options.Where(x => x.Type == ApplicationCommandOptionType.SubCommand
+				                                       && x.Name.StartsWith(context.Options[2].Value.ToString(), StringComparison.OrdinalIgnoreCase))
+					.Take(25)
+					.Select(option => new DiscordApplicationCommandAutocompleteChoice(option.Name, option.Name.Trim()));
 			}
 		}
 
 		[SlashCommand("help", "Displays command help")]
 		internal async Task DefaultHelpAsync(InteractionContext ctx,
 			[Autocomplete(typeof(DefaultHelpAutoCompleteProvider))]
 			[Option("option_one", "top level command to provide help for", true)] string commandName,
 			[Autocomplete(typeof(DefaultHelpAutoCompleteLevelOneProvider))]
 			[Option("option_two", "subgroup or command to provide help for", true)] string commandOneName = null,
 			[Autocomplete(typeof(DefaultHelpAutoCompleteLevelTwoProvider))]
 			[Option("option_three", "command to provide help for", true)] string commandTwoName = null)
 		{
 			var globalCommandsTask = ctx.Client.GetGlobalApplicationCommandsAsync();
 			var guildCommandsTask= ctx.Client.GetGuildApplicationCommandsAsync(ctx.Guild.Id);
 
 			await Task.WhenAll(globalCommandsTask, guildCommandsTask);
 
 			var applicationCommands = globalCommandsTask.Result.Concat(guildCommandsTask.Result)
 				.Where(ac => !ac.Name.Equals("help", StringComparison.OrdinalIgnoreCase))
-				.GroupBy(ac => ac.Name).Select(x => x.First())
-				.ToList();
-			if (applicationCommands.Count < 1)
+				.GroupBy(ac => ac.Name).Select(x => x.First());
+			if (!applicationCommands.Any())
 			{
 				await ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, new DiscordInteractionResponseBuilder()
 					.WithContent($"There are no slash commands for guild {ctx.Guild.Name}").AsEphemeral(true));
 				return;
 			}
 			if (commandTwoName is not null && !commandTwoName.Equals("no_options_for_this_command"))
 			{
-				var commandsWithSubCommands = applicationCommands.FindAll(ac => ac.Options is not null && ac.Options.Any(op => op.Type == ApplicationCommandOptionType.SubCommandGroup));
+				var commandsWithSubCommands = applicationCommands.Where(ac => ac.Options is not null && ac.Options.Any(op => op.Type == ApplicationCommandOptionType.SubCommandGroup));
 				var cmdParent = commandsWithSubCommands.FirstOrDefault(cm => cm.Options.Any(op => op.Name.Equals(commandOneName))).Options
 						.FirstOrDefault(opt => opt.Name.Equals(commandOneName,StringComparison.OrdinalIgnoreCase));
 				var cmd = cmdParent.Options.FirstOrDefault(op => op.Name.Equals(commandTwoName,StringComparison.OrdinalIgnoreCase));
 				var discordEmbed = new DiscordEmbedBuilder
 				{
 					Title = "Help",
 					Description = $"{Formatter.InlineCode(cmd.Name)}: {cmd.Description ?? "No description provided."}"
 				};
 				if (cmd.Options is not null)
 				{
-					var commandOptions = cmd.Options.ToList();
 					var sb = new StringBuilder();
 
-					foreach (var option in commandOptions)
+					foreach (var option in cmd.Options)
 						sb.Append('`').Append(option.Name).Append(" (").Append(")`: ").Append(option.Description ?? "No description provided.").Append('\n');
 
 					sb.Append('\n');
 					discordEmbed.AddField(new DiscordEmbedField("Arguments", sb.ToString().Trim()));
 				}
 				await ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource,
 					new DiscordInteractionResponseBuilder().AddEmbed(discordEmbed).AsEphemeral(true));
 			}
 			else if (commandOneName is not null && commandTwoName is null && !commandOneName.Equals("no_options_for_this_command"))
 			{
-				var commandsWithOptions = applicationCommands.FindAll(ac => ac.Options is not null && ac.Options.All(op => op.Type == ApplicationCommandOptionType.SubCommand));
+				var commandsWithOptions = applicationCommands.Where(ac => ac.Options is not null && ac.Options.All(op => op.Type == ApplicationCommandOptionType.SubCommand));
 				var subCommandParent = commandsWithOptions.FirstOrDefault(cm => cm.Name.Equals(commandName,StringComparison.OrdinalIgnoreCase));
 				var subCommand = subCommandParent.Options.FirstOrDefault(op => op.Name.Equals(commandOneName,StringComparison.OrdinalIgnoreCase));
 				var discordEmbed = new DiscordEmbedBuilder
 				{
 					Title = "Help",
 					Description = $"{Formatter.InlineCode(subCommand.Name)}: {subCommand.Description ?? "No description provided."}"
 				};
 				if (subCommand.Options is not null)
 				{
-					var commandOptions = subCommand.Options.ToList();
 					var sb = new StringBuilder();
 
-					foreach (var option in commandOptions)
+					foreach (var option in subCommand.Options)
 						sb.Append('`').Append(option.Name).Append(" (").Append(")`: ").Append(option.Description ?? "No description provided.").Append('\n');
 
 					sb.Append('\n');
 					discordEmbed.AddField(new DiscordEmbedField("Arguments", sb.ToString().Trim()));
 				}
 				await ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource,
 					new DiscordInteractionResponseBuilder().AddEmbed(discordEmbed).AsEphemeral(true));
 			}
 			else
 			{
 				var command = applicationCommands.FirstOrDefault(cm => cm.Name.Equals(commandName, StringComparison.OrdinalIgnoreCase));
 				if (command is null)
 				{
 					await ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, new DiscordInteractionResponseBuilder()
 							.WithContent($"No command called {commandName} in guild {ctx.Guild.Name}").AsEphemeral(true));
 					return;
 				}
 				var discordEmbed = new DiscordEmbedBuilder
 				{
 					Title = "Help",
 					Description = $"{Formatter.InlineCode(command.Name)}: {command.Description ?? "No description provided."}"
 				};
 				if (command.Options is not null)
 				{
-					var commandOptions = command.Options.ToList();
 					var sb = new StringBuilder();
 
-					foreach (var option in commandOptions)
+					foreach (var option in command.Options)
 						sb.Append('`').Append(option.Name).Append(" (").Append(")`: ").Append(option.Description ?? "No description provided.").Append('\n');
 
 					sb.Append('\n');
 					discordEmbed.AddField(new DiscordEmbedField("Arguments", sb.ToString().Trim()));
 				}
 				await ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource,
 					new DiscordInteractionResponseBuilder().AddEmbed(discordEmbed).AsEphemeral(true));
 			}
 		}
 	}
 	#endregion
 }
diff --git a/DisCatSharp.ApplicationCommands/Attributes/SlashCommand/RequireOwnerOrIdAttribute.cs b/DisCatSharp.ApplicationCommands/Attributes/SlashCommand/RequireOwnerOrIdAttribute.cs
index 614915592..8db17413b 100644
--- a/DisCatSharp.ApplicationCommands/Attributes/SlashCommand/RequireOwnerOrIdAttribute.cs
+++ b/DisCatSharp.ApplicationCommands/Attributes/SlashCommand/RequireOwnerOrIdAttribute.cs
@@ -1,67 +1,67 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
 
 namespace DisCatSharp.ApplicationCommands.Attributes
 {
 	/// <summary>
 	/// Requires ownership of the bot or a whitelisted id to execute this command.
 	/// </summary>
 	[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited = false)]
 	public sealed class ApplicationCommandRequireOwnerOrIdAttribute : SlashCheckBaseAttribute
 	{
 		/// <summary>
 		/// Allowed user ids
 		/// </summary>
 		public IReadOnlyList<ulong> UserIds { get; }
 
 		/// <summary>
 		/// Defines that usage of this command is restricted to the owner or whitelisted ids of the bot.
 		/// </summary>
 		/// <param name="userIds">List of allowed user ids</param>
 		public ApplicationCommandRequireOwnerOrIdAttribute(params ulong[] userIds)
 		{
-			this.UserIds = new ReadOnlyCollection<ulong>(userIds);
+			this.UserIds = userIds;
 		}
 
 		/// <summary>
 		/// Executes the a check.
 		/// </summary>
 		/// <param name="ctx">The command context.</param>s
 		public override Task<bool> ExecuteChecksAsync(InteractionContext ctx)
 		{
 			var app = ctx.Client.CurrentApplication;
 			var me = ctx.Client.CurrentUser;
 
 			var owner = app != null ? Task.FromResult(app.Owners.Any(x => x.Id == ctx.User.Id)) : Task.FromResult(ctx.User.Id == me.Id);
 
 			var allowed = this.UserIds.Contains(ctx.User.Id);
 
 			return allowed ? Task.FromResult(true) : owner;
 		}
 	}
 }
diff --git a/DisCatSharp.ApplicationCommands/Workers/ApplicationCommandWorker.cs b/DisCatSharp.ApplicationCommands/Workers/ApplicationCommandWorker.cs
index 7958c9a08..f40a349c6 100644
--- a/DisCatSharp.ApplicationCommands/Workers/ApplicationCommandWorker.cs
+++ b/DisCatSharp.ApplicationCommands/Workers/ApplicationCommandWorker.cs
@@ -1,383 +1,381 @@
 // 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 System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 
 using DisCatSharp.Entities;
 using DisCatSharp.Enums;
 
 namespace DisCatSharp.ApplicationCommands
 {
 	/// <summary>
 	/// Represents a <see cref="CommandWorker"/>.
 	/// </summary>
 	internal class CommandWorker
 	{
 		/// <summary>
 		/// Parses context menu application commands.
 		/// </summary>
 		/// <param name="type">The type.</param>
 		/// <param name="methods">List of method infos.</param>
 		/// <param name="translator">The optional command translations.</param>
 		/// <returns>Too much.</returns>
 		internal static Task<
 			(
 				List<DiscordApplicationCommand> applicationCommands,
 				List<KeyValuePair<Type, Type>> commandTypeSources,
 				List<ContextMenuCommand> contextMenuCommands,
 				bool withLocalization
 			)
 			> ParseContextMenuCommands(Type type, IEnumerable<MethodInfo> methods, List<CommandTranslator> translator = null)
 		{
 			List<DiscordApplicationCommand> commands = new();
 			List<KeyValuePair<Type, Type>> commandTypeSources = new();
 			List<ContextMenuCommand> contextMenuCommands = new();
 
 
 			foreach (var contextMethod in methods)
 			{
 				var contextAttribute = contextMethod.GetCustomAttribute<ContextMenuAttribute>();
 
 				DiscordApplicationCommandLocalization nameLocalizations = null;
 
 				var commandTranslation = translator?.Single(c => c.Name == contextAttribute.Name && c.Type == contextAttribute.Type);
 				if (commandTranslation != null)
 					nameLocalizations = commandTranslation.NameTranslations;
 
 				var command = new DiscordApplicationCommand(contextAttribute.Name, null, null, contextAttribute.Type, nameLocalizations, null, contextAttribute.DefaultMemberPermissions, contextAttribute.DmPermission);
 
 				var parameters = contextMethod.GetParameters();
 				if (parameters.Length == 0 || parameters == null || !ReferenceEquals(parameters.FirstOrDefault()?.ParameterType, typeof(ContextMenuContext)))
 					throw new ArgumentException($"The first argument must be a ContextMenuContext!");
 				if (parameters.Length > 1)
 					throw new ArgumentException($"A context menu cannot have parameters!");
 
 				contextMenuCommands.Add(new ContextMenuCommand { Method = contextMethod, Name = contextAttribute.Name });
 
 				commands.Add(command);
 				commandTypeSources.Add(new KeyValuePair<Type, Type>(type, type));
 			}
 
 			return Task.FromResult((commands, commandTypeSources, contextMenuCommands, translator != null));
 		}
 
 		/// <summary>
 		/// Parses single application commands.
 		/// </summary>
 		/// <param name="type">The type.</param>
 		/// <param name="methods">List of method infos.</param>
 		/// <param name="guildId">The optional guild id.</param>
 		/// <param name="translator">The optional command translations.</param>
 		/// <returns>Too much.</returns>
 		internal static async Task<
 			(
 				List<DiscordApplicationCommand> applicationCommands,
 				List<KeyValuePair<Type, Type>> commandTypeSources,
 				List<CommandMethod> commandMethods,
 				bool withLocalization
 			)
 			> ParseBasicSlashCommandsAsync(Type type, IEnumerable<MethodInfo> methods, ulong? guildId = null, List<CommandTranslator> translator = null)
 		{
 			List<DiscordApplicationCommand> commands = new();
 			List<KeyValuePair<Type, Type>> commandTypeSources = new();
 			List<CommandMethod> commandMethods = new();
 
 			foreach (var method in methods)
 			{
 				var commandAttribute = method.GetCustomAttribute<SlashCommandAttribute>();
 
 				var parameters = method.GetParameters();
 				if (parameters.Length == 0 || parameters == null || !ReferenceEquals(parameters.FirstOrDefault()?.ParameterType, typeof(InteractionContext)))
 					throw new ArgumentException($"The first argument must be an InteractionContext!");
 				var options = await ApplicationCommandsExtension.ParseParametersAsync(parameters.Skip(1), guildId);
 
 				commandMethods.Add(new CommandMethod { Method = method, Name = commandAttribute.Name });
 
 				DiscordApplicationCommandLocalization nameLocalizations = null;
 				DiscordApplicationCommandLocalization descriptionLocalizations = null;
 				List<DiscordApplicationCommandOption> localizedOptions = null;
 
 				var commandTranslation = translator?.Single(c => c.Name == commandAttribute.Name && c.Type == ApplicationCommandType.ChatInput);
 
 				if (commandTranslation != null && commandTranslation.Options != null)
 				{
 					localizedOptions = new List<DiscordApplicationCommandOption>(options.Count);
 					foreach (var option in options)
 					{
 						var choices = option.Choices != null ? new List<DiscordApplicationCommandOptionChoice>(option.Choices.Count) : null;
 						if (option.Choices != null)
 						{
 							foreach (var choice in option.Choices)
 							{
 								choices.Add(new DiscordApplicationCommandOptionChoice(choice.Name, choice.Value, commandTranslation.Options.Single(o => o.Name == option.Name).Choices.Single(c => c.Name == choice.Name).NameTranslations));
 							}
 						}
 
 						localizedOptions.Add(new DiscordApplicationCommandOption(option.Name, option.Description, option.Type, option.Required,
 							choices, option.Options, option.ChannelTypes, option.AutoComplete, option.MinimumValue, option.MaximumValue,
 							commandTranslation.Options.Single(o => o.Name == option.Name).NameTranslations, commandTranslation.Options.Single(o => o.Name == option.Name).DescriptionTranslations
 						));
 					}
 
 					nameLocalizations = commandTranslation.NameTranslations;
 					descriptionLocalizations = commandTranslation.DescriptionTranslations;
 				}
 
 				var payload = new DiscordApplicationCommand(commandAttribute.Name, commandAttribute.Description, (localizedOptions != null && localizedOptions.Any() ? localizedOptions : null) ?? (options != null && options.Any() ? options : null), ApplicationCommandType.ChatInput, nameLocalizations, descriptionLocalizations, commandAttribute.DefaultMemberPermissions, commandAttribute.DmPermission);
 				commands.Add(payload);
 				commandTypeSources.Add(new KeyValuePair<Type, Type>(type, type));
 			}
 
 			return (commands, commandTypeSources, commandMethods, translator != null);
 		}
 	}
 
 	/// <summary>
 	/// Represents a <see cref="NestedCommandWorker"/>.
 	/// </summary>
 	internal class NestedCommandWorker
 	{
 		/// <summary>
 		/// Parses application command groups.
 		/// </summary>
 		/// <param name="type">The type.</param>
 		/// <param name="types">List of type infos.</param>
 		/// <param name="guildId">The optional guild id.</param>
 		/// <param name="translator">The optional group translations.</param>
 		/// <returns>Too much.</returns>
 		internal static async Task<
 			(
 				List<DiscordApplicationCommand> applicationCommands,
 				List<KeyValuePair<Type, Type>> commandTypeSources,
 				List<object> singletonModules,
 				List<GroupCommand> groupCommands,
 				List<SubGroupCommand> subGroupCommands,
 				bool withLocalization
 			)
-			> ParseSlashGroupsAsync(Type type, List<TypeInfo> types, ulong? guildId = null, List<GroupTranslator> translator = null)
+			> ParseSlashGroupsAsync(Type type, IEnumerable<TypeInfo> types, ulong? guildId = null, List<GroupTranslator> translator = null)
 		{
 			List<DiscordApplicationCommand> commands = new();
 			List<KeyValuePair<Type, Type>> commandTypeSources = new();
 			List<GroupCommand> groupCommands = new();
 			List<SubGroupCommand> subGroupCommands = new();
 			List<object> singletonModules = new();
 
 			//Handles groups
 			foreach (var subclassInfo in types)
 			{
 				//Gets the attribute and methods in the group
 				var groupAttribute = subclassInfo.GetCustomAttribute<SlashCommandGroupAttribute>();
-				var submethods = subclassInfo.DeclaredMethods.Where(x => x.GetCustomAttribute<SlashCommandAttribute>() != null).ToList();
-				var subclasses = subclassInfo.DeclaredNestedTypes.Where(x => x.GetCustomAttribute<SlashCommandGroupAttribute>() != null).ToList();
+				var submethods = subclassInfo.DeclaredMethods.Where(x => x.GetCustomAttribute<SlashCommandAttribute>() != null);
+				var subclasses = subclassInfo.DeclaredNestedTypes.Where(x => x.GetCustomAttribute<SlashCommandGroupAttribute>() != null);
 				if (subclasses.Any() && submethods.Any())
 				{
 					throw new ArgumentException("Slash command groups cannot have both subcommands and subgroups!");
 				}
 
 				DiscordApplicationCommandLocalization nameLocalizations = null;
 				DiscordApplicationCommandLocalization descriptionLocalizations = null;
 
 				if (translator != null)
 				{
 					var commandTranslation = translator.Single(c => c.Name == groupAttribute.Name);
 					if (commandTranslation != null)
 					{
 						nameLocalizations = commandTranslation.NameTranslations;
 						descriptionLocalizations = commandTranslation.DescriptionTranslations;
 					}
 				}
 
 				//Initializes the command
 				var payload = new DiscordApplicationCommand(groupAttribute.Name, groupAttribute.Description, nameLocalizations: nameLocalizations, descriptionLocalizations: descriptionLocalizations, defaultMemberPermissions: groupAttribute.DefaultMemberPermissions, dmPermission: groupAttribute.DmPermission);
 				commandTypeSources.Add(new KeyValuePair<Type, Type>(type, type));
 
 				var commandMethods = new List<KeyValuePair<string, MethodInfo>>();
 				//Handles commands in the group
 				foreach (var submethod in submethods)
 				{
 					var commandAttribute = submethod.GetCustomAttribute<SlashCommandAttribute>();
 
 					//Gets the parameters and accounts for InteractionContext
 					var parameters = submethod.GetParameters();
 					if (parameters.Length == 0 || parameters == null || !ReferenceEquals(parameters.First().ParameterType, typeof(InteractionContext)))
 						throw new ArgumentException($"The first argument must be an InteractionContext!");
 
 					var options = await ApplicationCommandsExtension.ParseParametersAsync(parameters.Skip(1), guildId);
 
 					DiscordApplicationCommandLocalization subNameLocalizations = null;
 					DiscordApplicationCommandLocalization subDescriptionLocalizations = null;
 					List<DiscordApplicationCommandOption> localizedOptions = null;
 
 					var commandTranslation = translator?.Single(c => c.Name == payload.Name);
 
 					if (commandTranslation?.Commands != null)
 					{
 
 						var subCommandTranslation = commandTranslation.Commands.Single(sc => sc.Name == commandAttribute.Name);
 						if (subCommandTranslation.Options != null)
 						{
 							localizedOptions = new List<DiscordApplicationCommandOption>(options.Count);
 							foreach (var option in options)
 							{
 								var choices = option.Choices != null ? new List<DiscordApplicationCommandOptionChoice>(option.Choices.Count) : null;
 								if (option.Choices != null)
 								{
 									foreach (var choice in option.Choices)
 									{
 										choices.Add(new DiscordApplicationCommandOptionChoice(choice.Name, choice.Value, subCommandTranslation.Options.Single(o => o.Name == option.Name).Choices.Single(c => c.Name == choice.Name).NameTranslations));
 									}
 								}
 
 								localizedOptions.Add(new DiscordApplicationCommandOption(option.Name, option.Description, option.Type, option.Required,
 									choices, option.Options, option.ChannelTypes, option.AutoComplete, option.MinimumValue, option.MaximumValue,
 									subCommandTranslation.Options.Single(o => o.Name == option.Name).NameTranslations, subCommandTranslation.Options.Single(o => o.Name == option.Name).DescriptionTranslations
 								));
 							}
 						}
 
 						subNameLocalizations = subCommandTranslation.NameTranslations;
 						subDescriptionLocalizations = subCommandTranslation.DescriptionTranslations;
 					}
 
 
 					//Creates the subcommand and adds it to the main command
 					var subpayload = new DiscordApplicationCommandOption(commandAttribute.Name, commandAttribute.Description, ApplicationCommandOptionType.SubCommand, null, null, localizedOptions ?? options, nameLocalizations: subNameLocalizations, descriptionLocalizations: subDescriptionLocalizations);
 					payload = new DiscordApplicationCommand(payload.Name, payload.Description, payload.Options?.Append(subpayload) ?? new[] { subpayload }, nameLocalizations: payload.NameLocalizations, descriptionLocalizations: payload.DescriptionLocalizations, defaultMemberPermissions: payload.DefaultMemberPermissions, dmPermission: payload.DmPermission);
 					commandTypeSources.Add(new KeyValuePair<Type, Type>(subclassInfo, type));
 
 					//Adds it to the method lists
 					commandMethods.Add(new KeyValuePair<string, MethodInfo>(commandAttribute.Name, submethod));
 					groupCommands.Add(new GroupCommand { Name = groupAttribute.Name, Methods = commandMethods });
 				}
 
 				var command = new SubGroupCommand { Name = groupAttribute.Name };
 				//Handles subgroups
 				foreach (var subclass in subclasses)
 				{
 					var subgroupAttribute = subclass.GetCustomAttribute<SlashCommandGroupAttribute>();
 					var subsubmethods = subclass.DeclaredMethods.Where(x => x.GetCustomAttribute<SlashCommandAttribute>() != null);
 
 					var options = new List<DiscordApplicationCommandOption>();
 
 					var currentMethods = new List<KeyValuePair<string, MethodInfo>>();
 
 
 					DiscordApplicationCommandLocalization subNameLocalizations = null;
 					DiscordApplicationCommandLocalization subDescriptionLocalizations = null;
 
 					if (translator != null)
 					{
 						var commandTranslation = translator.Single(c => c.Name == payload.Name);
 						if (commandTranslation != null && commandTranslation.SubGroups != null)
 						{
 
 							var subCommandTranslation = commandTranslation.SubGroups.Single(sc => sc.Name == subgroupAttribute.Name);
 
 							if (subCommandTranslation != null)
 							{
 								subNameLocalizations = subCommandTranslation.NameTranslations;
 								subDescriptionLocalizations = subCommandTranslation.DescriptionTranslations;
 							}
 						}
 					}
 
 					//Similar to the one for regular groups
 					foreach (var subsubmethod in subsubmethods)
 					{
-						var suboptions = new List<DiscordApplicationCommandOption>();
 						var commatt = subsubmethod.GetCustomAttribute<SlashCommandAttribute>();
 						var parameters = subsubmethod.GetParameters();
 						if (parameters.Length == 0 || parameters == null || !ReferenceEquals(parameters.First().ParameterType, typeof(InteractionContext)))
 							throw new ArgumentException($"The first argument must be an InteractionContext!");
 
-						suboptions = suboptions.Concat(await ApplicationCommandsExtension.ParseParametersAsync(parameters.Skip(1), guildId)).ToList();
+						var suboptions = await ApplicationCommandsExtension.ParseParametersAsync(parameters.Skip(1), guildId);
 
 						DiscordApplicationCommandLocalization subSubNameLocalizations = null;
 						DiscordApplicationCommandLocalization subSubDescriptionLocalizations = null;
-						List<DiscordApplicationCommandOption> localizedOptions = null;
+						IEnumerable<DiscordApplicationCommandOption> localizedOptions = null;
 
 						var commandTranslation = translator?.Single(c => c.Name == payload.Name);
 
 						var subCommandTranslation = commandTranslation?.SubGroups?.Single(sc => sc.Name == commatt.Name);
 
 						var subSubCommandTranslation = subCommandTranslation?.Commands.Single(sc => sc.Name == commatt.Name);
 
 						if (subSubCommandTranslation != null && subSubCommandTranslation.Options != null)
 						{
-							localizedOptions = new List<DiscordApplicationCommandOption>(suboptions.Count);
-							foreach (var option in suboptions)
+							localizedOptions = suboptions.Select(option =>
 							{
 								var choices = option.Choices != null ? new List<DiscordApplicationCommandOptionChoice>(option.Choices.Count) : null;
 								if (option.Choices != null)
 								{
 									foreach (var choice in option.Choices)
 									{
 										choices.Add(new DiscordApplicationCommandOptionChoice(choice.Name, choice.Value, subSubCommandTranslation.Options.Single(o => o.Name == option.Name).Choices.Single(c => c.Name == choice.Name).NameTranslations));
 									}
 								}
 
-								localizedOptions.Add(new DiscordApplicationCommandOption(option.Name, option.Description, option.Type, option.Required,
+								return new DiscordApplicationCommandOption(option.Name, option.Description, option.Type, option.Required,
 									choices, option.Options, option.ChannelTypes, option.AutoComplete, option.MinimumValue, option.MaximumValue,
 									subSubCommandTranslation.Options.Single(o => o.Name == option.Name).NameTranslations, subSubCommandTranslation.Options.Single(o => o.Name == option.Name).DescriptionTranslations
-								));
-							}
+								);
+							});
 
 							subSubNameLocalizations = subSubCommandTranslation.NameTranslations;
 							subSubDescriptionLocalizations = subSubCommandTranslation.DescriptionTranslations;
 						}
 
 						var subsubpayload = new DiscordApplicationCommandOption(commatt.Name, commatt.Description, ApplicationCommandOptionType.SubCommand, null, null, (localizedOptions != null && localizedOptions.Any() ? localizedOptions : null) ?? (suboptions != null && suboptions.Any() ? suboptions : null), nameLocalizations: subSubNameLocalizations, descriptionLocalizations: subSubDescriptionLocalizations);
 						options.Add(subsubpayload);
 						commandMethods.Add(new KeyValuePair<string, MethodInfo>(commatt.Name, subsubmethod));
 						currentMethods.Add(new KeyValuePair<string, MethodInfo>(commatt.Name, subsubmethod));
 					}
 
 					//Adds the group to the command and method lists
 					var subpayload = new DiscordApplicationCommandOption(subgroupAttribute.Name, subgroupAttribute.Description, ApplicationCommandOptionType.SubCommandGroup, null, null, options, nameLocalizations: subNameLocalizations, descriptionLocalizations: subDescriptionLocalizations);
 					command.SubCommands.Add(new GroupCommand { Name = subgroupAttribute.Name, Methods = currentMethods });
 					payload = new DiscordApplicationCommand(payload.Name, payload.Description, payload.Options?.Append(subpayload) ?? new[] { subpayload }, nameLocalizations: payload.NameLocalizations, descriptionLocalizations: payload.DescriptionLocalizations, defaultMemberPermissions: payload.DefaultMemberPermissions, dmPermission: payload.DmPermission);
 					commandTypeSources.Add(new KeyValuePair<Type, Type>(subclass, type));
 
 					//Accounts for lifespans for the sub group
 					if (subclass.GetCustomAttribute<ApplicationCommandModuleLifespanAttribute>() != null && subclass.GetCustomAttribute<ApplicationCommandModuleLifespanAttribute>().Lifespan == ApplicationCommandModuleLifespan.Singleton)
 					{
 						singletonModules.Add(ApplicationCommandsExtension.CreateInstance(subclass, ApplicationCommandsExtension.Configuration?.ServiceProvider));
 					}
 				}
 				if (command.SubCommands.Any()) subGroupCommands.Add(command);
 				commands.Add(payload);
 
 				//Accounts for lifespans
 				if (subclassInfo.GetCustomAttribute<ApplicationCommandModuleLifespanAttribute>() != null && subclassInfo.GetCustomAttribute<ApplicationCommandModuleLifespanAttribute>().Lifespan == ApplicationCommandModuleLifespan.Singleton)
 				{
 					singletonModules.Add(ApplicationCommandsExtension.CreateInstance(subclassInfo, ApplicationCommandsExtension.Configuration?.ServiceProvider));
 				}
 			}
 
 			return (commands, commandTypeSources, singletonModules, groupCommands, subGroupCommands, translator != null);
 		}
 	}
 }
diff --git a/DisCatSharp.CommandsNext/Attributes/AliasesAttribute.cs b/DisCatSharp.CommandsNext/Attributes/AliasesAttribute.cs
index f4c4b6399..6ee1b9f94 100644
--- a/DisCatSharp.CommandsNext/Attributes/AliasesAttribute.cs
+++ b/DisCatSharp.CommandsNext/Attributes/AliasesAttribute.cs
@@ -1,53 +1,53 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 
 namespace DisCatSharp.CommandsNext.Attributes
 {
 	/// <summary>
 	/// Adds aliases to this command or group.
 	/// </summary>
 	[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)]
 	public sealed class AliasesAttribute : Attribute
 	{
 		/// <summary>
 		/// Gets this group's aliases.
 		/// </summary>
 		public IReadOnlyList<string> Aliases { get; }
 
 		/// <summary>
 		/// Adds aliases to this command or group.
 		/// </summary>
 		/// <param name="aliases">Aliases to add to this command or group.</param>
 		public AliasesAttribute(params string[] aliases)
 		{
 			if (aliases.Any(xa => xa == null || xa.Any(xc => char.IsWhiteSpace(xc))))
 				throw new ArgumentException("Aliases cannot contain whitespace characters or null strings.", nameof(aliases));
 
-			this.Aliases = new ReadOnlyCollection<string>(aliases);
+			this.Aliases = aliases;
 		}
 	}
 }
diff --git a/DisCatSharp.CommandsNext/Attributes/RequireOwnerOrIdAttribute.cs b/DisCatSharp.CommandsNext/Attributes/RequireOwnerOrIdAttribute.cs
index a6a58fca9..c91433f5e 100644
--- a/DisCatSharp.CommandsNext/Attributes/RequireOwnerOrIdAttribute.cs
+++ b/DisCatSharp.CommandsNext/Attributes/RequireOwnerOrIdAttribute.cs
@@ -1,69 +1,69 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
 
 namespace DisCatSharp.CommandsNext.Attributes
 {
 	/// <summary>
 	/// Requires ownership of the bot or a whitelisted id to execute this command.
 	/// </summary>
 	[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited = false)]
 	public sealed class RequireOwnerOrIdAttribute : CheckBaseAttribute
 	{
 		/// <summary>
 		/// Allowed user ids
 		/// </summary>
 		public IReadOnlyList<ulong> UserIds { get; }
 
 		/// <summary>
 		/// Defines that usage of this command is restricted to the owner or whitelisted ids of the bot.
 		/// </summary>
 		/// <param name="userIds">List of allowed user ids</param>
 		public RequireOwnerOrIdAttribute(params ulong[] userIds)
 		{
-			this.UserIds = new ReadOnlyCollection<ulong>(userIds);
+			this.UserIds = userIds;
 		}
 
 		/// <summary>
 		/// Executes the a check.
 		/// </summary>
 		/// <param name="ctx">The command context.</param>
 		/// <param name="help">If true, help - returns true.</param>
 		public override async Task<bool> ExecuteCheckAsync(CommandContext ctx, bool help)
 		{
 			var app = ctx.Client.CurrentApplication;
 			var me = ctx.Client.CurrentUser;
 
 			var owner = app != null ? await Task.FromResult(app.Owners.Any(x => x.Id == ctx.User.Id)) : await Task.FromResult(ctx.User.Id == me.Id);
 
 			var allowed = this.UserIds.Contains(ctx.User.Id);
 
 			return owner || allowed;
 
 		}
 	}
 }
diff --git a/DisCatSharp.CommandsNext/Attributes/RequireRolesAttribute.cs b/DisCatSharp.CommandsNext/Attributes/RequireRolesAttribute.cs
index 81e1576c2..27ff99398 100644
--- a/DisCatSharp.CommandsNext/Attributes/RequireRolesAttribute.cs
+++ b/DisCatSharp.CommandsNext/Attributes/RequireRolesAttribute.cs
@@ -1,108 +1,108 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
 
 namespace DisCatSharp.CommandsNext.Attributes
 {
 	/// <summary>
 	/// Defines that usage of this command is restricted to members with specified role. Note that it's much preferred to restrict access using <see cref="RequirePermissionsAttribute"/>.
 	/// </summary>
 	[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited = false)]
 	public sealed class RequireRolesAttribute : CheckBaseAttribute
 	{
 		/// <summary>
 		/// Gets the name of the role required to execute this command.
 		/// </summary>
 		public IReadOnlyList<string> RoleNames { get; }
 
 		/// <summary>
 		/// Gets the role checking mode. Refer to <see cref="RoleCheckMode"/> for more information.
 		/// </summary>
 		public RoleCheckMode CheckMode { get; }
 
 		/// <summary>
 		/// Defines that usage of this command is restricted to members with specified role. Note that it's much preferred to restrict access using <see cref="RequirePermissionsAttribute"/>.
 		/// </summary>
 		/// <param name="checkMode">Role checking mode.</param>
 		/// <param name="roleNames">Names of the role to be verified by this check.</param>
 		public RequireRolesAttribute(RoleCheckMode checkMode, params string[] roleNames)
 		{
 			this.CheckMode = checkMode;
-			this.RoleNames = new ReadOnlyCollection<string>(roleNames);
+			this.RoleNames = roleNames;
 		}
 
 		/// <summary>
 		/// Executes the a check.
 		/// </summary>
 		/// <param name="ctx">The command context.</param>
 		/// <param name="help">If true, help - returns true.</param>
 		public override Task<bool> ExecuteCheckAsync(CommandContext ctx, bool help)
 		{
 			if (ctx.Guild == null || ctx.Member == null)
 				return Task.FromResult(false);
 
 			var rns = ctx.Member.Roles.Select(xr => xr.Name);
 			var rnc = rns.Count();
 			var ins = rns.Intersect(this.RoleNames, ctx.CommandsNext.GetStringComparer());
 			var inc = ins.Count();
 
 			return this.CheckMode switch
 			{
 				RoleCheckMode.All => Task.FromResult(this.RoleNames.Count == inc),
 				RoleCheckMode.SpecifiedOnly => Task.FromResult(rnc == inc),
 				RoleCheckMode.None => Task.FromResult(inc == 0),
 				_ => Task.FromResult(inc > 0),
 			};
 		}
 	}
 
 	/// <summary>
 	/// Specifies how does <see cref="RequireRolesAttribute"/> check for roles.
 	/// </summary>
 	public enum RoleCheckMode
 	{
 		/// <summary>
 		/// Member is required to have any of the specified roles.
 		/// </summary>
 		Any,
 
 		/// <summary>
 		/// Member is required to have all of the specified roles.
 		/// </summary>
 		All,
 
 		/// <summary>
 		/// Member is required to have exactly the same roles as specified; no extra roles may be present.
 		/// </summary>
 		SpecifiedOnly,
 
 		/// <summary>
 		/// Member is required to have none of the specified roles.
 		/// </summary>
 		None
 	}
 }
diff --git a/DisCatSharp.CommandsNext/CommandsNextExtension.cs b/DisCatSharp.CommandsNext/CommandsNextExtension.cs
index d0e8ae7ac..1df141643 100644
--- a/DisCatSharp.CommandsNext/CommandsNextExtension.cs
+++ b/DisCatSharp.CommandsNext/CommandsNextExtension.cs
@@ -1,1089 +1,1091 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 
 using DisCatSharp.CommandsNext.Attributes;
 using DisCatSharp.CommandsNext.Builders;
 using DisCatSharp.CommandsNext.Converters;
 using DisCatSharp.CommandsNext.Entities;
 using DisCatSharp.CommandsNext.Exceptions;
 using DisCatSharp.Common.Utilities;
 using DisCatSharp.Entities;
 using DisCatSharp.EventArgs;
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
 namespace DisCatSharp.CommandsNext
 {
 	/// <summary>
 	/// This is the class which handles command registration, management, and execution.
 	/// </summary>
 	public class CommandsNextExtension : BaseExtension
 	{
 		/// <summary>
 		/// Gets the config.
 		/// </summary>
 		private readonly CommandsNextConfiguration _config;
 
 		/// <summary>
 		/// Gets the help formatter.
 		/// </summary>
 		private readonly HelpFormatterFactory _helpFormatter;
 
 		/// <summary>
 		/// Gets the convert generic.
 		/// </summary>
 		private readonly MethodInfo _convertGeneric;
 
 		/// <summary>
 		/// Gets the user friendly type names.
 		/// </summary>
 		private readonly Dictionary<Type, string> _userFriendlyTypeNames;
 		/// <summary>
 		/// Gets the argument converters.
 		/// </summary>
 		internal Dictionary<Type, IArgumentConverter> ArgumentConverters { get; }
 
 		/// <summary>
 		/// Gets the service provider this CommandsNext module was configured with.
 		/// </summary>
 		public IServiceProvider Services
 			=> this._config.ServiceProvider;
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="CommandsNextExtension"/> class.
 		/// </summary>
 		/// <param name="cfg">The cfg.</param>
 		internal CommandsNextExtension(CommandsNextConfiguration cfg)
 		{
 			this._config = new CommandsNextConfiguration(cfg);
 			this._topLevelCommands = new Dictionary<string, Command>();
 			this._registeredCommandsLazy = new Lazy<IReadOnlyDictionary<string, Command>>(() => new ReadOnlyDictionary<string, Command>(this._topLevelCommands));
 			this._helpFormatter = new HelpFormatterFactory();
 			this._helpFormatter.SetFormatterType<DefaultHelpFormatter>();
 
 			this.ArgumentConverters = new Dictionary<Type, IArgumentConverter>
 			{
 				[typeof(string)] = new StringConverter(),
 				[typeof(bool)] = new BoolConverter(),
 				[typeof(sbyte)] = new Int8Converter(),
 				[typeof(byte)] = new Uint8Converter(),
 				[typeof(short)] = new Int16Converter(),
 				[typeof(ushort)] = new Uint16Converter(),
 				[typeof(int)] = new Int32Converter(),
 				[typeof(uint)] = new Uint32Converter(),
 				[typeof(long)] = new Int64Converter(),
 				[typeof(ulong)] = new Uint64Converter(),
 				[typeof(float)] = new Float32Converter(),
 				[typeof(double)] = new Float64Converter(),
 				[typeof(decimal)] = new Float128Converter(),
 				[typeof(DateTime)] = new DateTimeConverter(),
 				[typeof(DateTimeOffset)] = new DateTimeOffsetConverter(),
 				[typeof(TimeSpan)] = new TimeSpanConverter(),
 				[typeof(Uri)] = new UriConverter(),
 				[typeof(DiscordUser)] = new DiscordUserConverter(),
 				[typeof(DiscordMember)] = new DiscordMemberConverter(),
 				[typeof(DiscordRole)] = new DiscordRoleConverter(),
 				[typeof(DiscordChannel)] = new DiscordChannelConverter(),
 				[typeof(DiscordGuild)] = new DiscordGuildConverter(),
 				[typeof(DiscordMessage)] = new DiscordMessageConverter(),
 				[typeof(DiscordEmoji)] = new DiscordEmojiConverter(),
 				[typeof(DiscordThreadChannel)] = new DiscordThreadChannelConverter(),
 				[typeof(DiscordInvite)] = new DiscordInviteConverter(),
 				[typeof(DiscordColor)] = new DiscordColorConverter(),
 				[typeof(DiscordScheduledEvent)] = new DiscordScheduledEventConverter(),
 			};
 
 			this._userFriendlyTypeNames = new Dictionary<Type, string>()
 			{
 				[typeof(string)] = "string",
 				[typeof(bool)] = "boolean",
 				[typeof(sbyte)] = "signed byte",
 				[typeof(byte)] = "byte",
 				[typeof(short)] = "short",
 				[typeof(ushort)] = "unsigned short",
 				[typeof(int)] = "int",
 				[typeof(uint)] = "unsigned int",
 				[typeof(long)] = "long",
 				[typeof(ulong)] = "unsigned long",
 				[typeof(float)] = "float",
 				[typeof(double)] = "double",
 				[typeof(decimal)] = "decimal",
 				[typeof(DateTime)] = "date and time",
 				[typeof(DateTimeOffset)] = "date and time",
 				[typeof(TimeSpan)] = "time span",
 				[typeof(Uri)] = "URL",
 				[typeof(DiscordUser)] = "user",
 				[typeof(DiscordMember)] = "member",
 				[typeof(DiscordRole)] = "role",
 				[typeof(DiscordChannel)] = "channel",
 				[typeof(DiscordGuild)] = "guild",
 				[typeof(DiscordMessage)] = "message",
 				[typeof(DiscordEmoji)] = "emoji",
 				[typeof(DiscordThreadChannel)] = "thread",
 				[typeof(DiscordInvite)] = "invite",
 				[typeof(DiscordColor)] = "color",
 				[typeof(DiscordScheduledEvent)] = "event"
 			};
 
 			foreach (var xt in this.ArgumentConverters.Keys.ToArray())
 			{
 				var xti = xt.GetTypeInfo();
 				if (!xti.IsValueType)
 					continue;
 
 				var xcvt = typeof(NullableConverter<>).MakeGenericType(xt);
 				var xnt = typeof(Nullable<>).MakeGenericType(xt);
 				if (this.ArgumentConverters.ContainsKey(xcvt))
 					continue;
 
 				var xcv = Activator.CreateInstance(xcvt) as IArgumentConverter;
 				this.ArgumentConverters[xnt] = xcv;
 				this._userFriendlyTypeNames[xnt] = this._userFriendlyTypeNames[xt];
 			}
 
 			var t = this.GetType();
 			var ms = t.GetTypeInfo().DeclaredMethods;
 			var m = ms.FirstOrDefault(xm => xm.Name == "ConvertArgumentToObj" && xm.ContainsGenericParameters && !xm.IsStatic && xm.IsPrivate);
 			this._convertGeneric = m;
 		}
 
 		/// <summary>
 		/// Sets the help formatter to use with the default help command.
 		/// </summary>
 		/// <typeparam name="T">Type of the formatter to use.</typeparam>
 		public void SetHelpFormatter<T>() where T : BaseHelpFormatter => this._helpFormatter.SetFormatterType<T>();
 
 		#region DiscordClient Registration
 		/// <summary>
 		/// DO NOT USE THIS MANUALLY.
 		/// </summary>
 		/// <param name="client">DO NOT USE THIS MANUALLY.</param>
 		/// <exception cref="System.InvalidOperationException"/>
 		protected internal override void Setup(DiscordClient client)
 		{
 			if (this.Client != null)
 				throw new InvalidOperationException("What did I tell you?");
 
 			this.Client = client;
 
 			this._executed = new AsyncEvent<CommandsNextExtension, CommandExecutionEventArgs>("COMMAND_EXECUTED", TimeSpan.Zero, this.Client.EventErrorHandler);
 			this._error = new AsyncEvent<CommandsNextExtension, CommandErrorEventArgs>("COMMAND_ERRORED", TimeSpan.Zero, this.Client.EventErrorHandler);
 
 			if (this._config.UseDefaultCommandHandler)
 				this.Client.MessageCreated += this.HandleCommandsAsync;
 			else
 				this.Client.Logger.LogWarning(CommandsNextEvents.Misc, "Not attaching default command handler - if this is intentional, you can ignore this message");
 
 			if (this._config.EnableDefaultHelp)
 			{
 				this.RegisterCommands(typeof(DefaultHelpModule), null, null, out var tcmds);
 
 				if (this._config.DefaultHelpChecks != null)
 				{
 					var checks = this._config.DefaultHelpChecks.ToArray();
 
 					foreach (var cb in tcmds)
 						cb.WithExecutionChecks(checks);
 				}
 
 				if (tcmds != null)
 					foreach (var xc in tcmds)
 						this.AddToCommandDictionary(xc.Build(null));
 			}
 
 		}
 		#endregion
 
 		#region Command Handling
 		/// <summary>
 		/// Handles the commands async.
 		/// </summary>
 		/// <param name="sender">The sender.</param>
 		/// <param name="e">The e.</param>
 		/// <returns>A Task.</returns>
 		private async Task HandleCommandsAsync(DiscordClient sender, MessageCreateEventArgs e)
 		{
 			if (e.Author.IsBot) // bad bot
 				return;
 
 			if (!this._config.EnableDms && e.Channel.IsPrivate)
 				return;
 
 			var mpos = -1;
 			if (this._config.EnableMentionPrefix)
 				mpos = e.Message.GetMentionPrefixLength(this.Client.CurrentUser);
 
 			if (this._config.StringPrefixes?.Any() == true)
 				foreach (var pfix in this._config.StringPrefixes)
 					if (mpos == -1 && !string.IsNullOrWhiteSpace(pfix))
 						mpos = e.Message.GetStringPrefixLength(pfix, this._config.CaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase);
 
 			if (mpos == -1 && this._config.PrefixResolver != null)
 				mpos = await this._config.PrefixResolver(e.Message).ConfigureAwait(false);
 
 			if (mpos == -1)
 				return;
 
 			var pfx = e.Message.Content[..mpos];
 			var cnt = e.Message.Content[mpos..];
 
 			var __ = 0;
 			var fname = cnt.ExtractNextArgument(ref __);
 
 			var cmd = this.FindCommand(cnt, out var args);
 			var ctx = this.CreateContext(e.Message, pfx, cmd, args);
 			if (cmd == null)
 			{
 				await this._error.InvokeAsync(this, new CommandErrorEventArgs(this.Client.ServiceProvider) { Context = ctx, Exception = new CommandNotFoundException(fname) }).ConfigureAwait(false);
 				return;
 			}
 
 			_ = Task.Run(async () => await this.ExecuteCommandAsync(ctx).ConfigureAwait(false));
 		}
 
 		/// <summary>
 		/// Finds a specified command by its qualified name, then separates arguments.
 		/// </summary>
 		/// <param name="commandString">Qualified name of the command, optionally with arguments.</param>
 		/// <param name="rawArguments">Separated arguments.</param>
 		/// <returns>Found command or null if none was found.</returns>
 		public Command FindCommand(string commandString, out string rawArguments)
 		{
 			rawArguments = null;
 
 			var ignoreCase = !this._config.CaseSensitive;
 			var pos = 0;
 			var next = commandString.ExtractNextArgument(ref pos);
 			if (next == null)
 				return null;
 
 			if (!this.RegisteredCommands.TryGetValue(next, out var cmd))
 			{
 				if (!ignoreCase)
 					return null;
 
 				next = next.ToLowerInvariant();
 				var cmdKvp = this.RegisteredCommands.FirstOrDefault(x => x.Key.ToLowerInvariant() == next);
 				if (cmdKvp.Value == null)
 					return null;
 
 				cmd = cmdKvp.Value;
 			}
 
 			if (cmd is not CommandGroup)
 			{
 				rawArguments = commandString[pos..].Trim();
 				return cmd;
 			}
 
 			while (cmd is CommandGroup)
 			{
 				var cm2 = cmd as CommandGroup;
 				var oldPos = pos;
 				next = commandString.ExtractNextArgument(ref pos);
 				if (next == null)
 					break;
 
 				if (ignoreCase)
 				{
 					next = next.ToLowerInvariant();
 					cmd = cm2.Children.FirstOrDefault(x => x.Name.ToLowerInvariant() == next || x.Aliases?.Any(xx => xx.ToLowerInvariant() == next) == true);
 				}
 				else
 				{
 					cmd = cm2.Children.FirstOrDefault(x => x.Name == next || x.Aliases?.Contains(next) == true);
 				}
 
 				if (cmd == null)
 				{
 					cmd = cm2;
 					pos = oldPos;
 					break;
 				}
 			}
 
 			rawArguments = commandString[pos..].Trim();
 			return cmd;
 		}
 
 		/// <summary>
 		/// Creates a command execution context from specified arguments.
 		/// </summary>
 		/// <param name="msg">Message to use for context.</param>
 		/// <param name="prefix">Command prefix, used to execute commands.</param>
 		/// <param name="cmd">Command to execute.</param>
 		/// <param name="rawArguments">Raw arguments to pass to command.</param>
 		/// <returns>Created command execution context.</returns>
 		public CommandContext CreateContext(DiscordMessage msg, string prefix, Command cmd, string rawArguments = null)
 		{
 			var ctx = new CommandContext
 			{
 				Client = this.Client,
 				Command = cmd,
 				Message = msg,
 				Config = this._config,
 				RawArgumentString = rawArguments ?? "",
 				Prefix = prefix,
 				CommandsNext = this,
 				Services = this.Services
 			};
 
 			if (cmd != null && (cmd.Module is TransientCommandModule || cmd.Module == null))
 			{
 				var scope = ctx.Services.CreateScope();
 				ctx.ServiceScopeContext = new CommandContext.ServiceContext(ctx.Services, scope);
 				ctx.Services = scope.ServiceProvider;
 			}
 
 			return ctx;
 		}
 
 		/// <summary>
 		/// Executes specified command from given context.
 		/// </summary>
 		/// <param name="ctx">Context to execute command from.</param>
 		/// <returns></returns>
 		public async Task ExecuteCommandAsync(CommandContext ctx)
 		{
 			try
 			{
 				var cmd = ctx.Command;
 				await this.RunAllChecksAsync(cmd, ctx).ConfigureAwait(false);
 
 				var res = await cmd.ExecuteAsync(ctx).ConfigureAwait(false);
 
 				if (res.IsSuccessful)
 					await this._executed.InvokeAsync(this, new CommandExecutionEventArgs(this.Client.ServiceProvider) { Context = res.Context }).ConfigureAwait(false);
 				else
 					await this._error.InvokeAsync(this, new CommandErrorEventArgs(this.Client.ServiceProvider) { Context = res.Context, Exception = res.Exception }).ConfigureAwait(false);
 			}
 			catch (Exception ex)
 			{
 				await this._error.InvokeAsync(this, new CommandErrorEventArgs(this.Client.ServiceProvider) { Context = ctx, Exception = ex }).ConfigureAwait(false);
 			}
 			finally
 			{
 				if (ctx.ServiceScopeContext.IsInitialized)
 					ctx.ServiceScopeContext.Dispose();
 			}
 		}
 
 		/// <summary>
 		/// Runs the all checks async.
 		/// </summary>
 		/// <param name="cmd">The cmd.</param>
 		/// <param name="ctx">The ctx.</param>
 		/// <returns>A Task.</returns>
 		private async Task RunAllChecksAsync(Command cmd, CommandContext ctx)
 		{
 			if (cmd.Parent != null)
 				await this.RunAllChecksAsync(cmd.Parent, ctx).ConfigureAwait(false);
 
 			var fchecks = await cmd.RunChecksAsync(ctx, false).ConfigureAwait(false);
 			if (fchecks.Any())
 				throw new ChecksFailedException(cmd, ctx, fchecks);
 		}
 		#endregion
 
 		#region Command Registration
 		/// <summary>
 		/// Gets a dictionary of registered top-level commands.
 		/// </summary>
 		public IReadOnlyDictionary<string, Command> RegisteredCommands
 			=> this._registeredCommandsLazy.Value;
 
 		/// <summary>
 		/// Gets or sets the top level commands.
 		/// </summary>
 		private readonly Dictionary<string, Command> _topLevelCommands;
 		private readonly Lazy<IReadOnlyDictionary<string, Command>> _registeredCommandsLazy;
 
 		/// <summary>
 		/// Registers all commands from a given assembly. The command classes need to be public to be considered for registration.
 		/// </summary>
 		/// <param name="assembly">Assembly to register commands from.</param>
 		public void RegisterCommands(Assembly assembly)
 		{
 			var types = assembly.ExportedTypes.Where(xt =>
 			{
 				var xti = xt.GetTypeInfo();
 				return xti.IsModuleCandidateType() && !xti.IsNested;
 			});
 			foreach (var xt in types)
 				this.RegisterCommands(xt);
 		}
 
 		/// <summary>
 		/// Registers all commands from a given command class.
 		/// </summary>
 		/// <typeparam name="T">Class which holds commands to register.</typeparam>
 		public void RegisterCommands<T>() where T : BaseCommandModule
 		{
 			var t = typeof(T);
 			this.RegisterCommands(t);
 		}
 
 		/// <summary>
 		/// Registers all commands from a given command class.
 		/// </summary>
 		/// <param name="t">Type of the class which holds commands to register.</param>
 		public void RegisterCommands(Type t)
 		{
 			if (t == null)
 				throw new ArgumentNullException(nameof(t), "Type cannot be null.");
 
 			if (!t.IsModuleCandidateType())
 				throw new ArgumentNullException(nameof(t), "Type must be a class, which cannot be abstract or static.");
 
 			this.RegisterCommands(t, null, null, out var tempCommands);
 
 			if (tempCommands != null)
 				foreach (var command in tempCommands)
 					this.AddToCommandDictionary(command.Build(null));
 		}
 
 		/// <summary>
 		/// Registers the commands.
 		/// </summary>
 		/// <param name="t">The type.</param>
 		/// <param name="currentParent">The current parent.</param>
 		/// <param name="inheritedChecks">The inherited checks.</param>
 		/// <param name="foundCommands">The found commands.</param>
 		private void RegisterCommands(Type t, CommandGroupBuilder currentParent, IEnumerable<CheckBaseAttribute> inheritedChecks, out List<CommandBuilder> foundCommands)
 		{
 			var ti = t.GetTypeInfo();
 
 			var lifespan = ti.GetCustomAttribute<ModuleLifespanAttribute>();
 			var moduleLifespan = lifespan != null ? lifespan.Lifespan : ModuleLifespan.Singleton;
 
 			var module = new CommandModuleBuilder()
 				.WithType(t)
 				.WithLifespan(moduleLifespan)
 				.Build(this.Services);
 
 			// restrict parent lifespan to more or equally restrictive
 			if (currentParent?.Module is TransientCommandModule && moduleLifespan != ModuleLifespan.Transient)
 				throw new InvalidOperationException("In a transient module, child modules can only be transient.");
 
 			// check if we are anything
 			var groupBuilder = new CommandGroupBuilder(module);
 			var isModule = false;
 			var moduleAttributes = ti.GetCustomAttributes();
 			var moduleHidden = false;
 			var moduleChecks = new List<CheckBaseAttribute>();
 
 			foreach (var xa in moduleAttributes)
 			{
 				switch (xa)
 				{
 					case GroupAttribute g:
 						isModule = true;
 						var moduleName = g.Name;
 						if (moduleName == null)
 						{
 							moduleName = ti.Name;
 
 							if (moduleName.EndsWith("Group") && moduleName != "Group")
 								moduleName = moduleName[0..^5];
 							else if (moduleName.EndsWith("Module") && moduleName != "Module")
 								moduleName = moduleName[0..^6];
 							else if (moduleName.EndsWith("Commands") && moduleName != "Commands")
 								moduleName = moduleName[0..^8];
 						}
 
 						if (!this._config.CaseSensitive)
 							moduleName = moduleName.ToLowerInvariant();
 
 						groupBuilder.WithName(moduleName);
 
 						if (inheritedChecks != null)
 							foreach (var chk in inheritedChecks)
 								groupBuilder.WithExecutionCheck(chk);
 
 						foreach (var mi in ti.DeclaredMethods.Where(x => x.IsCommandCandidate(out _) && x.GetCustomAttribute<GroupCommandAttribute>() != null))
 							groupBuilder.WithOverload(new CommandOverloadBuilder(mi));
 						break;
 
 					case AliasesAttribute a:
 						foreach (var xalias in a.Aliases)
 							groupBuilder.WithAlias(this._config.CaseSensitive ? xalias : xalias.ToLowerInvariant());
 						break;
 
 					case HiddenAttribute h:
 						groupBuilder.WithHiddenStatus(true);
 						moduleHidden = true;
 						break;
 
 					case DescriptionAttribute d:
 						groupBuilder.WithDescription(d.Description);
 						break;
 
 					case CheckBaseAttribute c:
 						moduleChecks.Add(c);
 						groupBuilder.WithExecutionCheck(c);
 						break;
 
 					default:
 						groupBuilder.WithCustomAttribute(xa);
 						break;
 				}
 			}
 
 			if (!isModule)
 			{
 				groupBuilder = null;
 				if (inheritedChecks != null)
 					moduleChecks.AddRange(inheritedChecks);
 			}
 
 			// candidate methods
 			var methods = ti.DeclaredMethods;
 			var commands = new List<CommandBuilder>();
 			var commandBuilders = new Dictionary<string, CommandBuilder>();
 			foreach (var m in methods)
 			{
 				if (!m.IsCommandCandidate(out _))
 					continue;
 
 				var attrs = m.GetCustomAttributes();
 				if (attrs.FirstOrDefault(xa => xa is CommandAttribute) is not CommandAttribute cattr)
 					continue;
 
 				var commandName = cattr.Name;
 				if (commandName == null)
 				{
 					commandName = m.Name;
 					if (commandName.EndsWith("Async") && commandName != "Async")
 						commandName = commandName[0..^5];
 				}
 
 				if (!this._config.CaseSensitive)
 					commandName = commandName.ToLowerInvariant();
 
 				if (!commandBuilders.TryGetValue(commandName, out var commandBuilder))
 				{
 					commandBuilders.Add(commandName, commandBuilder = new CommandBuilder(module).WithName(commandName));
 
 					if (!isModule)
 						if (currentParent != null)
 							currentParent.WithChild(commandBuilder);
 						else
 							commands.Add(commandBuilder);
 					else
 						groupBuilder.WithChild(commandBuilder);
 				}
 
 				commandBuilder.WithOverload(new CommandOverloadBuilder(m));
 
 				if (!isModule && moduleChecks.Any())
 					foreach (var chk in moduleChecks)
 						commandBuilder.WithExecutionCheck(chk);
 
 				foreach (var xa in attrs)
 				{
 					switch (xa)
 					{
 						case AliasesAttribute a:
 							foreach (var xalias in a.Aliases)
 								commandBuilder.WithAlias(this._config.CaseSensitive ? xalias : xalias.ToLowerInvariant());
 							break;
 
 						case CheckBaseAttribute p:
 							commandBuilder.WithExecutionCheck(p);
 							break;
 
 						case DescriptionAttribute d:
 							commandBuilder.WithDescription(d.Description);
 							break;
 
 						case HiddenAttribute h:
 							commandBuilder.WithHiddenStatus(true);
 							break;
 
 						default:
 							commandBuilder.WithCustomAttribute(xa);
 							break;
 					}
 				}
 
 				if (!isModule && moduleHidden)
 					commandBuilder.WithHiddenStatus(true);
 			}
 
 			// candidate types
 			var types = ti.DeclaredNestedTypes
 				.Where(xt => xt.IsModuleCandidateType() && xt.DeclaredConstructors.Any(xc => xc.IsPublic));
 			foreach (var type in types)
 			{
 				this.RegisterCommands(type.AsType(),
 					groupBuilder,
 					!isModule ? moduleChecks : null,
 					out var tempCommands);
 
 				if (isModule)
 					foreach (var chk in moduleChecks)
 						groupBuilder.WithExecutionCheck(chk);
 
 				if (isModule && tempCommands != null)
 					foreach (var xtcmd in tempCommands)
 						groupBuilder.WithChild(xtcmd);
 				else if (tempCommands != null)
 					commands.AddRange(tempCommands);
 			}
 
 			if (isModule && currentParent == null)
 				commands.Add(groupBuilder);
 			else if (isModule)
 				currentParent.WithChild(groupBuilder);
 			foundCommands = commands;
 		}
 
 		/// <summary>
 		/// Builds and registers all supplied commands.
 		/// </summary>
 		/// <param name="cmds">Commands to build and register.</param>
 		public void RegisterCommands(params CommandBuilder[] cmds)
 		{
 			foreach (var cmd in cmds)
 				this.AddToCommandDictionary(cmd.Build(null));
 		}
 
 		/// <summary>
 		/// Unregisters specified commands from CommandsNext.
 		/// </summary>
 		/// <param name="cmds">Commands to unregister.</param>
 		public void UnregisterCommands(params Command[] cmds)
 		{
 			if (cmds.Any(x => x.Parent != null))
 				throw new InvalidOperationException("Cannot unregister nested commands.");
 
-			var keys = this.RegisteredCommands.Where(x => cmds.Contains(x.Value)).Select(x => x.Key).ToList();
-			foreach (var key in keys)
+			foreach (var key in this.RegisteredCommands
+				         .Where(x => cmds.Contains(x.Value))
+				         .Select(x => x.Key)
+				         .ToList()) // This is necessary.
 				this._topLevelCommands.Remove(key);
 		}
 
 		/// <summary>
 		/// Adds the to command dictionary.
 		/// </summary>
 		/// <param name="cmd">The cmd.</param>
 		private void AddToCommandDictionary(Command cmd)
 		{
 			if (cmd.Parent != null)
 				return;
 
 			if (this._topLevelCommands.ContainsKey(cmd.Name) || (cmd.Aliases != null && cmd.Aliases.Any(xs => this._topLevelCommands.ContainsKey(xs))))
 				throw new DuplicateCommandException(cmd.QualifiedName);
 
 			this._topLevelCommands[cmd.Name] = cmd;
 			if (cmd.Aliases != null)
 				foreach (var xs in cmd.Aliases)
 					this._topLevelCommands[xs] = cmd;
 		}
 		#endregion
 
 		#region Default Help
 		/// <summary>
 		/// Represents the default help module.
 		/// </summary>
 		[ModuleLifespan(ModuleLifespan.Transient)]
 		public class DefaultHelpModule : BaseCommandModule
 		{
 			/// <summary>
 			/// Defaults the help async.
 			/// </summary>
 			/// <param name="ctx">The ctx.</param>
 			/// <param name="command">The command.</param>
 			/// <returns>A Task.</returns>
 			[Command("help"), Description("Displays command help.")]
 			public async Task DefaultHelpAsync(CommandContext ctx, [Description("Command to provide help for.")] params string[] command)
 			{
 				var topLevel = ctx.CommandsNext._topLevelCommands.Values.Distinct();
 				var helpBuilder = ctx.CommandsNext._helpFormatter.Create(ctx);
 
 				if (command != null && command.Any())
 				{
 					Command cmd = null;
 					var searchIn = topLevel;
 					foreach (var c in command)
 					{
 						if (searchIn == null)
 						{
 							cmd = null;
 							break;
 						}
 
 						cmd = ctx.Config.CaseSensitive
 							? searchIn.FirstOrDefault(xc => xc.Name == c || (xc.Aliases != null && xc.Aliases.Contains(c)))
 							: searchIn.FirstOrDefault(xc => xc.Name.ToLowerInvariant() == c.ToLowerInvariant() || (xc.Aliases != null && xc.Aliases.Select(xs => xs.ToLowerInvariant()).Contains(c.ToLowerInvariant())));
 
 						if (cmd == null)
 							break;
 
 						var failedChecks = await cmd.RunChecksAsync(ctx, true).ConfigureAwait(false);
 						if (failedChecks.Any())
 							throw new ChecksFailedException(cmd, ctx, failedChecks);
 
 						searchIn = cmd is CommandGroup ? (cmd as CommandGroup).Children : null;
 					}
 
 					if (cmd == null)
 						throw new CommandNotFoundException(string.Join(" ", command));
 
 					helpBuilder.WithCommand(cmd);
 
 					if (cmd is CommandGroup group)
 					{
 						var commandsToSearch = group.Children.Where(xc => !xc.IsHidden);
 						var eligibleCommands = new List<Command>();
 						foreach (var candidateCommand in commandsToSearch)
 						{
 							if (candidateCommand.ExecutionChecks == null || !candidateCommand.ExecutionChecks.Any())
 							{
 								eligibleCommands.Add(candidateCommand);
 								continue;
 							}
 
 							var candidateFailedChecks = await candidateCommand.RunChecksAsync(ctx, true).ConfigureAwait(false);
 							if (!candidateFailedChecks.Any())
 								eligibleCommands.Add(candidateCommand);
 						}
 
 						if (eligibleCommands.Any())
 							helpBuilder.WithSubcommands(eligibleCommands.OrderBy(xc => xc.Name));
 					}
 				}
 				else
 				{
 					var commandsToSearch = topLevel.Where(xc => !xc.IsHidden);
 					var eligibleCommands = new List<Command>();
 					foreach (var sc in commandsToSearch)
 					{
 						if (sc.ExecutionChecks == null || !sc.ExecutionChecks.Any())
 						{
 							eligibleCommands.Add(sc);
 							continue;
 						}
 
 						var candidateFailedChecks = await sc.RunChecksAsync(ctx, true).ConfigureAwait(false);
 						if (!candidateFailedChecks.Any())
 							eligibleCommands.Add(sc);
 					}
 
 					if (eligibleCommands.Any())
 						helpBuilder.WithSubcommands(eligibleCommands.OrderBy(xc => xc.Name));
 				}
 
 				var helpMessage = helpBuilder.Build();
 
 				var builder = new DiscordMessageBuilder().WithContent(helpMessage.Content).WithEmbed(helpMessage.Embed);
 
 				if (!ctx.Config.DmHelp || ctx.Channel is DiscordDmChannel || ctx.Guild == null)
 					await ctx.RespondAsync(builder).ConfigureAwait(false);
 				else
 					await ctx.Member.SendMessageAsync(builder).ConfigureAwait(false);
 
 			}
 		}
 		#endregion
 
 		#region Sudo
 		/// <summary>
 		/// Creates a fake command context to execute commands with.
 		/// </summary>
 		/// <param name="actor">The user or member to use as message author.</param>
 		/// <param name="channel">The channel the message is supposed to appear from.</param>
 		/// <param name="messageContents">Contents of the message.</param>
 		/// <param name="prefix">Command prefix, used to execute commands.</param>
 		/// <param name="cmd">Command to execute.</param>
 		/// <param name="rawArguments">Raw arguments to pass to command.</param>
 		/// <returns>Created fake context.</returns>
 		public CommandContext CreateFakeContext(DiscordUser actor, DiscordChannel channel, string messageContents, string prefix, Command cmd, string rawArguments = null)
 		{
 			var epoch = new DateTimeOffset(2015, 1, 1, 0, 0, 0, TimeSpan.Zero);
 			var now = DateTimeOffset.UtcNow;
 			var timeSpan = (ulong)(now - epoch).TotalMilliseconds;
 
 			// create fake message
 			var msg = new DiscordMessage
 			{
 				Discord = this.Client,
 				Author = actor,
 				ChannelId = channel.Id,
 				Content = messageContents,
 				Id = timeSpan << 22,
 				Pinned = false,
 				MentionEveryone = messageContents.Contains("@everyone"),
 				IsTts = false,
 				AttachmentsInternal = new List<DiscordAttachment>(),
 				EmbedsInternal = new List<DiscordEmbed>(),
 				TimestampRaw = now.ToString("yyyy-MM-ddTHH:mm:sszzz"),
 				ReactionsInternal = new List<DiscordReaction>()
 			};
 
-			var mentionedUsers = new List<DiscordUser>();
+			List<DiscordUser> mentionedUsers = null;
 			var mentionedRoles = msg.Channel.Guild != null ? new List<DiscordRole>() : null;
 			var mentionedChannels = msg.Channel.Guild != null ? new List<DiscordChannel>() : null;
 
 			if (!string.IsNullOrWhiteSpace(msg.Content))
 			{
 				if (msg.Channel.Guild != null)
 				{
 					mentionedUsers = Utilities.GetUserMentions(msg).Select(xid => msg.Channel.Guild.MembersInternal.TryGetValue(xid, out var member) ? member : null).Cast<DiscordUser>().ToList();
 					mentionedRoles = Utilities.GetRoleMentions(msg).Select(xid => msg.Channel.Guild.GetRole(xid)).ToList();
 					mentionedChannels = Utilities.GetChannelMentions(msg).Select(xid => msg.Channel.Guild.GetChannel(xid)).ToList();
 				}
 				else
 				{
 					mentionedUsers = Utilities.GetUserMentions(msg).Select(this.Client.GetCachedOrEmptyUserInternal).ToList();
 				}
 			}
 
-			msg.MentionedUsersInternal = mentionedUsers;
+			msg.MentionedUsersInternal = mentionedUsers ?? new();
 			msg.MentionedRolesInternal = mentionedRoles;
 			msg.MentionedChannelsInternal = mentionedChannels;
 
 			var ctx = new CommandContext
 			{
 				Client = this.Client,
 				Command = cmd,
 				Message = msg,
 				Config = this._config,
 				RawArgumentString = rawArguments ?? "",
 				Prefix = prefix,
 				CommandsNext = this,
 				Services = this.Services
 			};
 
 			if (cmd != null && (cmd.Module is TransientCommandModule || cmd.Module == null))
 			{
 				var scope = ctx.Services.CreateScope();
 				ctx.ServiceScopeContext = new CommandContext.ServiceContext(ctx.Services, scope);
 				ctx.Services = scope.ServiceProvider;
 			}
 
 			return ctx;
 		}
 		#endregion
 
 		#region Type Conversion
 		/// <summary>
 		/// Converts a string to specified type.
 		/// </summary>
 		/// <typeparam name="T">Type to convert to.</typeparam>
 		/// <param name="value">Value to convert.</param>
 		/// <param name="ctx">Context in which to convert to.</param>
 		/// <returns>Converted object.</returns>
 		public async Task<T> ConvertArgument<T>(string value, CommandContext ctx)
 		{
 			var t = typeof(T);
 			if (!this.ArgumentConverters.ContainsKey(t))
 				throw new ArgumentException("There is no converter specified for given type.", nameof(T));
 
 			if (this.ArgumentConverters[t] is not IArgumentConverter<T> cv)
 				throw new ArgumentException("Invalid converter registered for this type.", nameof(T));
 
 			var cvr = await cv.ConvertAsync(value, ctx).ConfigureAwait(false);
 			return !cvr.HasValue ? throw new ArgumentException("Could not convert specified value to given type.", nameof(value)) : cvr.Value;
 		}
 
 		/// <summary>
 		/// Converts a string to specified type.
 		/// </summary>
 		/// <param name="value">Value to convert.</param>
 		/// <param name="ctx">Context in which to convert to.</param>
 		/// <param name="type">Type to convert to.</param>
 		/// <returns>Converted object.</returns>
 		public async Task<object> ConvertArgument(string value, CommandContext ctx, Type type)
 		{
 			var m = this._convertGeneric.MakeGenericMethod(type);
 			try
 			{
 				return await (m.Invoke(this, new object[] { value, ctx }) as Task<object>).ConfigureAwait(false);
 			}
 			catch (TargetInvocationException ex)
 			{
 				throw ex.InnerException;
 			}
 		}
 
 		/// <summary>
 		/// Registers an argument converter for specified type.
 		/// </summary>
 		/// <typeparam name="T">Type for which to register the converter.</typeparam>
 		/// <param name="converter">Converter to register.</param>
 		public void RegisterConverter<T>(IArgumentConverter<T> converter)
 		{
 			if (converter == null)
 				throw new ArgumentNullException(nameof(converter), "Converter cannot be null.");
 
 			var t = typeof(T);
 			var ti = t.GetTypeInfo();
 			this.ArgumentConverters[t] = converter;
 
 			if (!ti.IsValueType)
 				return;
 
 			var nullableConverterType = typeof(NullableConverter<>).MakeGenericType(t);
 			var nullableType = typeof(Nullable<>).MakeGenericType(t);
 			if (this.ArgumentConverters.ContainsKey(nullableType))
 				return;
 
 			var nullableConverter = Activator.CreateInstance(nullableConverterType) as IArgumentConverter;
 			this.ArgumentConverters[nullableType] = nullableConverter;
 		}
 
 		/// <summary>
 		/// Unregisters an argument converter for specified type.
 		/// </summary>
 		/// <typeparam name="T">Type for which to unregister the converter.</typeparam>
 		public void UnregisterConverter<T>()
 		{
 			var t = typeof(T);
 			var ti = t.GetTypeInfo();
 			if (this.ArgumentConverters.ContainsKey(t))
 				this.ArgumentConverters.Remove(t);
 
 			if (this._userFriendlyTypeNames.ContainsKey(t))
 				this._userFriendlyTypeNames.Remove(t);
 
 			if (!ti.IsValueType)
 				return;
 
 			var nullableType = typeof(Nullable<>).MakeGenericType(t);
 			if (!this.ArgumentConverters.ContainsKey(nullableType))
 				return;
 
 			this.ArgumentConverters.Remove(nullableType);
 			this._userFriendlyTypeNames.Remove(nullableType);
 		}
 
 		/// <summary>
 		/// Registers a user-friendly type name.
 		/// </summary>
 		/// <typeparam name="T">Type to register the name for.</typeparam>
 		/// <param name="value">Name to register.</param>
 		public void RegisterUserFriendlyTypeName<T>(string value)
 		{
 			if (string.IsNullOrWhiteSpace(value))
 				throw new ArgumentNullException(nameof(value), "Name cannot be null or empty.");
 
 			var t = typeof(T);
 			var ti = t.GetTypeInfo();
 			if (!this.ArgumentConverters.ContainsKey(t))
 				throw new InvalidOperationException("Cannot register a friendly name for a type which has no associated converter.");
 
 			this._userFriendlyTypeNames[t] = value;
 
 			if (!ti.IsValueType)
 				return;
 
 			var nullableType = typeof(Nullable<>).MakeGenericType(t);
 			this._userFriendlyTypeNames[nullableType] = value;
 		}
 
 		/// <summary>
 		/// Converts a type into user-friendly type name.
 		/// </summary>
 		/// <param name="t">Type to convert.</param>
 		/// <returns>User-friendly type name.</returns>
 		public string GetUserFriendlyTypeName(Type t)
 		{
 			if (this._userFriendlyTypeNames.ContainsKey(t))
 				return this._userFriendlyTypeNames[t];
 
 			var ti = t.GetTypeInfo();
 			if (ti.IsGenericTypeDefinition && t.GetGenericTypeDefinition() == typeof(Nullable<>))
 			{
 				var tn = ti.GenericTypeArguments[0];
 				return this._userFriendlyTypeNames.ContainsKey(tn) ? this._userFriendlyTypeNames[tn] : tn.Name;
 			}
 
 			return t.Name;
 		}
 		#endregion
 
 		#region Helpers
 		/// <summary>
 		/// Allows easier interoperability with reflection by turning the <see cref="Task{T}"/> returned by <see cref="ConvertArgument"/>
 		/// into a task containing <see cref="object"/>, using the provided generic type information.
 		/// </summary>
 		private async Task<object> ConvertArgumentToObj<T>(string value, CommandContext ctx)
 			=> await this.ConvertArgument<T>(value, ctx).ConfigureAwait(false);
 
 		/// <summary>
 		/// Gets the configuration-specific string comparer. This returns <see cref="StringComparer.Ordinal"/> or <see cref="StringComparer.OrdinalIgnoreCase"/>,
 		/// depending on whether <see cref="CommandsNextConfiguration.CaseSensitive"/> is set to <see langword="true"/> or <see langword="false"/>.
 		/// </summary>
 		/// <returns>A string comparer.</returns>
 		internal IEqualityComparer<string> GetStringComparer()
 			=> this._config.CaseSensitive
 				? StringComparer.Ordinal
 				: StringComparer.OrdinalIgnoreCase;
 		#endregion
 
 		#region Events
 		/// <summary>
 		/// Triggered whenever a command executes successfully.
 		/// </summary>
 		public event AsyncEventHandler<CommandsNextExtension, CommandExecutionEventArgs> CommandExecuted
 		{
 			add => this._executed.Register(value);
 			remove => this._executed.Unregister(value);
 		}
 		private AsyncEvent<CommandsNextExtension, CommandExecutionEventArgs> _executed;
 
 		/// <summary>
 		/// Triggered whenever a command throws an exception during execution.
 		/// </summary>
 		public event AsyncEventHandler<CommandsNextExtension, CommandErrorEventArgs> CommandErrored
 		{
 			add => this._error.Register(value);
 			remove => this._error.Unregister(value);
 		}
 		private AsyncEvent<CommandsNextExtension, CommandErrorEventArgs> _error;
 
 		/// <summary>
 		/// Ons the command executed.
 		/// </summary>
 		/// <param name="e">The e.</param>
 		/// <returns>A Task.</returns>
 		private Task OnCommandExecuted(CommandExecutionEventArgs e)
 			=> this._executed.InvokeAsync(this, e);
 
 		/// <summary>
 		/// Ons the command errored.
 		/// </summary>
 		/// <param name="e">The e.</param>
 		/// <returns>A Task.</returns>
 		private Task OnCommandErrored(CommandErrorEventArgs e)
 			=> this._error.InvokeAsync(this, e);
 		#endregion
 	}
 }
diff --git a/DisCatSharp.CommandsNext/Entities/Builders/CommandBuilder.cs b/DisCatSharp.CommandsNext/Entities/Builders/CommandBuilder.cs
index dc30b0444..579ddcb3f 100644
--- a/DisCatSharp.CommandsNext/Entities/Builders/CommandBuilder.cs
+++ b/DisCatSharp.CommandsNext/Entities/Builders/CommandBuilder.cs
@@ -1,306 +1,306 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 
 using DisCatSharp.CommandsNext.Attributes;
 using DisCatSharp.CommandsNext.Entities;
 using DisCatSharp.CommandsNext.Exceptions;
 
 namespace DisCatSharp.CommandsNext.Builders
 {
 	/// <summary>
 	/// Represents an interface to build a command.
 	/// </summary>
 	public class CommandBuilder
 	{
 		/// <summary>
 		/// Gets the name set for this command.
 		/// </summary>
 		public string Name { get; private set; }
 
 		/// <summary>
 		/// Gets the aliases set for this command.
 		/// </summary>
 		public IReadOnlyList<string> Aliases { get; }
 
 		/// <summary>
 		/// Gets the alias list.
 		/// </summary>
 		private readonly List<string> _aliasList;
 
 		/// <summary>
 		/// Gets the description set for this command.
 		/// </summary>
 		public string Description { get; private set; }
 
 		/// <summary>
 		/// Gets whether this command will be hidden or not.
 		/// </summary>
 		public bool IsHidden { get; private set; }
 
 		/// <summary>
 		/// Gets the execution checks defined for this command.
 		/// </summary>
 		public IReadOnlyList<CheckBaseAttribute> ExecutionChecks { get; }
 
 		/// <summary>
 		/// Gets the execution check list.
 		/// </summary>
 		private readonly List<CheckBaseAttribute> _executionCheckList;
 
 		/// <summary>
 		/// Gets the collection of this command's overloads.
 		/// </summary>
 		public IReadOnlyList<CommandOverloadBuilder> Overloads { get; }
 
 		/// <summary>
 		/// Gets the overload list.
 		/// </summary>
 		private readonly List<CommandOverloadBuilder> _overloadList;
 
 		/// <summary>
 		/// Gets the overload argument sets.
 		/// </summary>
 		private readonly HashSet<string> _overloadArgumentSets;
 
 		/// <summary>
 		/// Gets the module on which this command is to be defined.
 		/// </summary>
 		public ICommandModule Module { get; }
 
 		/// <summary>
 		/// Gets custom attributes defined on this command.
 		/// </summary>
 		public IReadOnlyList<Attribute> CustomAttributes { get; }
 
 		/// <summary>
 		/// Gets the custom attribute list.
 		/// </summary>
 		private readonly List<Attribute> _customAttributeList;
 
 		/// <summary>
 		/// Creates a new module-less command builder.
 		/// </summary>
 		public CommandBuilder()
 			: this(null)
 		{ }
 
 		/// <summary>
 		/// Creates a new command builder.
 		/// </summary>
 		/// <param name="module">Module on which this command is to be defined.</param>
 		public CommandBuilder(ICommandModule module)
 		{
 			this._aliasList = new List<string>();
-			this.Aliases = new ReadOnlyCollection<string>(this._aliasList);
+			this.Aliases = this._aliasList.AsReadOnly();
 
 			this._executionCheckList = new List<CheckBaseAttribute>();
-			this.ExecutionChecks = new ReadOnlyCollection<CheckBaseAttribute>(this._executionCheckList);
+			this.ExecutionChecks = this._executionCheckList.AsReadOnly();
 
 			this._overloadArgumentSets = new HashSet<string>();
 			this._overloadList = new List<CommandOverloadBuilder>();
-			this.Overloads = new ReadOnlyCollection<CommandOverloadBuilder>(this._overloadList);
+			this.Overloads = this._overloadList.AsReadOnly();
 
 			this.Module = module;
 
 			this._customAttributeList = new List<Attribute>();
-			this.CustomAttributes = new ReadOnlyCollection<Attribute>(this._customAttributeList);
+			this.CustomAttributes = this._customAttributeList.AsReadOnly();
 		}
 
 		/// <summary>
 		/// Sets the name for this command.
 		/// </summary>
 		/// <param name="name">Name for this command.</param>
 		/// <returns>This builder.</returns>
 		public CommandBuilder WithName(string name)
 		{
 			if (name == null || name.ToCharArray().Any(xc => char.IsWhiteSpace(xc)))
 				throw new ArgumentException("Command name cannot be null or contain any whitespace characters.", nameof(name));
 
 			if (this.Name != null)
 				throw new InvalidOperationException("This command already has a name.");
 
 			if (this._aliasList.Contains(name))
 				throw new ArgumentException("Command name cannot be one of its aliases.", nameof(name));
 
 			this.Name = name;
 			return this;
 		}
 
 		/// <summary>
 		/// Adds aliases to this command.
 		/// </summary>
 		/// <param name="aliases">Aliases to add to the command.</param>
 		/// <returns>This builder.</returns>
 		public CommandBuilder WithAliases(params string[] aliases)
 		{
 			if (aliases == null || !aliases.Any())
 				throw new ArgumentException("You need to pass at least one alias.", nameof(aliases));
 
 			foreach (var alias in aliases)
 				this.WithAlias(alias);
 
 			return this;
 		}
 
 		/// <summary>
 		/// Adds an alias to this command.
 		/// </summary>
 		/// <param name="alias">Alias to add to the command.</param>
 		/// <returns>This builder.</returns>
 		public CommandBuilder WithAlias(string alias)
 		{
 			if (alias.ToCharArray().Any(xc => char.IsWhiteSpace(xc)))
 				throw new ArgumentException("Aliases cannot contain whitespace characters or null strings.", nameof(alias));
 
 			if (this.Name == alias || this._aliasList.Contains(alias))
 				throw new ArgumentException("Aliases cannot contain the command name, and cannot be duplicate.", nameof(alias));
 
 			this._aliasList.Add(alias);
 			return this;
 		}
 
 		/// <summary>
 		/// Sets the description for this command.
 		/// </summary>
 		/// <param name="description">Description to use for this command.</param>
 		/// <returns>This builder.</returns>
 		public CommandBuilder WithDescription(string description)
 		{
 			this.Description = description;
 			return this;
 		}
 
 		/// <summary>
 		/// Sets whether this command is to be hidden.
 		/// </summary>
 		/// <param name="hidden">Whether the command is to be hidden.</param>
 		/// <returns>This builder.</returns>
 		public CommandBuilder WithHiddenStatus(bool hidden)
 		{
 			this.IsHidden = hidden;
 			return this;
 		}
 
 		/// <summary>
 		/// Adds pre-execution checks to this command.
 		/// </summary>
 		/// <param name="checks">Pre-execution checks to add to this command.</param>
 		/// <returns>This builder.</returns>
 		public CommandBuilder WithExecutionChecks(params CheckBaseAttribute[] checks)
 		{
 			this._executionCheckList.AddRange(checks.Except(this._executionCheckList));
 			return this;
 		}
 
 		/// <summary>
 		/// Adds a pre-execution check to this command.
 		/// </summary>
 		/// <param name="check">Pre-execution check to add to this command.</param>
 		/// <returns>This builder.</returns>
 		public CommandBuilder WithExecutionCheck(CheckBaseAttribute check)
 		{
 			if (!this._executionCheckList.Contains(check))
 				this._executionCheckList.Add(check);
 			return this;
 		}
 
 		/// <summary>
 		/// Adds overloads to this command. An executable command needs to have at least one overload.
 		/// </summary>
 		/// <param name="overloads">Overloads to add to this command.</param>
 		/// <returns>This builder.</returns>
 		public CommandBuilder WithOverloads(params CommandOverloadBuilder[] overloads)
 		{
 			foreach (var overload in overloads)
 				this.WithOverload(overload);
 
 			return this;
 		}
 
 		/// <summary>
 		/// Adds an overload to this command. An executable command needs to have at least one overload.
 		/// </summary>
 		/// <param name="overload">Overload to add to this command.</param>
 		/// <returns>This builder.</returns>
 		public CommandBuilder WithOverload(CommandOverloadBuilder overload)
 		{
 			if (this._overloadArgumentSets.Contains(overload.ArgumentSet))
-				throw new DuplicateOverloadException(this.Name, overload.Arguments.Select(x => x.Type).ToList(), overload.ArgumentSet);
+				throw new DuplicateOverloadException(this.Name, overload.Arguments.Select(x => x.Type), overload.ArgumentSet);
 
 			this._overloadArgumentSets.Add(overload.ArgumentSet);
 			this._overloadList.Add(overload);
 
 			return this;
 		}
 
 		/// <summary>
 		/// Adds a custom attribute to this command. This can be used to indicate various custom information about a command.
 		/// </summary>
 		/// <param name="attribute">Attribute to add.</param>
 		/// <returns>This builder.</returns>
 		public CommandBuilder WithCustomAttribute(Attribute attribute)
 		{
 			this._customAttributeList.Add(attribute);
 			return this;
 		}
 
 		/// <summary>
 		/// Adds multiple custom attributes to this command. This can be used to indicate various custom information about a command.
 		/// </summary>
 		/// <param name="attributes">Attributes to add.</param>
 		/// <returns>This builder.</returns>
 		public CommandBuilder WithCustomAttributes(params Attribute[] attributes)
 		{
 			foreach (var attr in attributes)
 				this.WithCustomAttribute(attr);
 
 			return this;
 		}
 
 		/// <summary>
 		/// Builds the command.
 		/// </summary>
 		/// <param name="parent">The parent command group.</param>
 		internal virtual Command Build(CommandGroup parent)
 		{
 			var cmd = new Command
 			{
 				Name = this.Name,
 				Description = this.Description,
 				Aliases = this.Aliases,
 				ExecutionChecks = this.ExecutionChecks,
 				IsHidden = this.IsHidden,
 				Parent = parent,
-				Overloads = new ReadOnlyCollection<CommandOverload>(this.Overloads.Select(xo => xo.Build()).ToList()),
+				Overloads = this.Overloads.Select(xo => xo.Build()).ToArray(),
 				Module = this.Module,
 				CustomAttributes = this.CustomAttributes
 			};
 
 			return cmd;
 		}
 	}
 }
diff --git a/DisCatSharp.CommandsNext/Entities/Builders/CommandGroupBuilder.cs b/DisCatSharp.CommandsNext/Entities/Builders/CommandGroupBuilder.cs
index a60871069..07f703800 100644
--- a/DisCatSharp.CommandsNext/Entities/Builders/CommandGroupBuilder.cs
+++ b/DisCatSharp.CommandsNext/Entities/Builders/CommandGroupBuilder.cs
@@ -1,102 +1,98 @@
 // 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.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 
 using DisCatSharp.CommandsNext.Entities;
 
 namespace DisCatSharp.CommandsNext.Builders
 {
 	/// <summary>
 	/// Represents an interface to build a command group.
 	/// </summary>
 	public sealed class CommandGroupBuilder : CommandBuilder
 	{
 		/// <summary>
 		/// Gets the list of child commands registered for this group.
 		/// </summary>
 		public IReadOnlyList<CommandBuilder> Children { get; }
 
 		/// <summary>
 		/// Gets the children list.
 		/// </summary>
 		private readonly List<CommandBuilder> _childrenList;
 
 		/// <summary>
 		/// Creates a new module-less command group builder.
 		/// </summary>
 		public CommandGroupBuilder()
 			: this(null)
 		{ }
 
 		/// <summary>
 		/// Creates a new command group builder.
 		/// </summary>
 		/// <param name="module">Module on which this group is to be defined.</param>
 		public CommandGroupBuilder(ICommandModule module)
 			: base(module)
 		{
 			this._childrenList = new List<CommandBuilder>();
-			this.Children = new ReadOnlyCollection<CommandBuilder>(this._childrenList);
+			this.Children = this._childrenList.AsReadOnly();
 		}
 
 		/// <summary>
 		/// Adds a command to the collection of child commands for this group.
 		/// </summary>
 		/// <param name="child">Command to add to the collection of child commands for this group.</param>
 		/// <returns>This builder.</returns>
 		public CommandGroupBuilder WithChild(CommandBuilder child)
 		{
 			this._childrenList.Add(child);
 			return this;
 		}
 
 		/// <summary>
 		/// Builds the command group.
 		/// </summary>
 		/// <param name="parent">The parent command group.</param>
 		internal override Command Build(CommandGroup parent)
 		{
 			var cmd = new CommandGroup
 			{
 				Name = this.Name,
 				Description = this.Description,
 				Aliases = this.Aliases,
 				ExecutionChecks = this.ExecutionChecks,
 				IsHidden = this.IsHidden,
 				Parent = parent,
-				Overloads = new ReadOnlyCollection<CommandOverload>(this.Overloads.Select(xo => xo.Build()).ToList()),
+				Overloads = this.Overloads.Select(xo => xo.Build()).ToArray(),
 				Module = this.Module,
 				CustomAttributes = this.CustomAttributes
 			};
 
-			var cs = new List<Command>();
-			foreach (var xc in this.Children)
-				cs.Add(xc.Build(cmd));
-
-			cmd.Children = new ReadOnlyCollection<Command>(cs);
+			cmd.Children = this.Children.Select(xc => xc.Build(cmd)).ToArray();
 			return cmd;
 		}
 	}
 }
diff --git a/DisCatSharp.CommandsNext/Entities/Builders/CommandOverloadBuilder.cs b/DisCatSharp.CommandsNext/Entities/Builders/CommandOverloadBuilder.cs
index 6568682b7..5e3558c62 100644
--- a/DisCatSharp.CommandsNext/Entities/Builders/CommandOverloadBuilder.cs
+++ b/DisCatSharp.CommandsNext/Entities/Builders/CommandOverloadBuilder.cs
@@ -1,194 +1,194 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Text;
 
 using DisCatSharp.CommandsNext.Attributes;
 using DisCatSharp.CommandsNext.Exceptions;
 
 namespace DisCatSharp.CommandsNext.Builders
 {
 	/// <summary>
 	/// Represents an interface to build a command overload.
 	/// </summary>
 	public sealed class CommandOverloadBuilder
 	{
 		/// <summary>
 		/// Gets a value that uniquely identifies an overload.
 		/// </summary>
 		internal string ArgumentSet { get; }
 
 		/// <summary>
 		/// Gets the collection of arguments this overload takes.
 		/// </summary>
 		public IReadOnlyList<CommandArgument> Arguments { get; }
 
 		/// <summary>
 		/// Gets this overload's priority when picking a suitable one for execution.
 		/// </summary>
 		public int Priority { get; set; }
 
 		/// <summary>
 		/// Gets the overload's callable delegate.
 		/// </summary>
 		public Delegate Callable { get; set; }
 
 		/// <summary>
 		/// Gets the invocation target.
 		/// </summary>
 		private readonly object _invocationTarget;
 
 		/// <summary>
 		/// Creates a new command overload builder from specified method.
 		/// </summary>
 		/// <param name="method">Method to use for this overload.</param>
 		public CommandOverloadBuilder(MethodInfo method)
 			: this(method, null)
 		{ }
 
 		/// <summary>
 		/// Creates a new command overload builder from specified delegate.
 		/// </summary>
 		/// <param name="method">Delegate to use for this overload.</param>
 		public CommandOverloadBuilder(Delegate method)
 			: this(method.GetMethodInfo(), method.Target)
 		{ }
 
 		/// <summary>
 		/// Prevents a default instance of the <see cref="CommandOverloadBuilder"/> class from being created.
 		/// </summary>
 		/// <param name="method">The method.</param>
 		/// <param name="target">The target.</param>
 		private CommandOverloadBuilder(MethodInfo method, object target)
 		{
 			if (!method.IsCommandCandidate(out var prms))
 				throw new ArgumentException("Specified method is not suitable for a command.", nameof(method));
 
 			this._invocationTarget = target;
 
 			// create the argument array
 			var ea = new ParameterExpression[prms.Length + 1];
 			var iep = Expression.Parameter(target?.GetType() ?? method.DeclaringType, "instance");
 			ea[0] = iep;
 			ea[1] = Expression.Parameter(typeof(CommandContext), "ctx");
 
 			var pri = method.GetCustomAttribute<PriorityAttribute>();
 			if (pri != null)
 				this.Priority = pri.Priority;
 
 			var i = 2;
 			var args = new List<CommandArgument>(prms.Length - 1);
 			var setb = new StringBuilder();
 			foreach (var arg in prms.Skip(1))
 			{
 				setb.Append(arg.ParameterType).Append(";");
 				var ca = new CommandArgument
 				{
 					Name = arg.Name,
 					Type = arg.ParameterType,
 					IsOptional = arg.IsOptional,
 					DefaultValue = arg.IsOptional ? arg.DefaultValue : null
 				};
 
 				var attrsCustom = new List<Attribute>();
 				var attrs = arg.GetCustomAttributes();
 				var isParams = false;
 				foreach (var xa in attrs)
 				{
 					switch (xa)
 					{
 						case DescriptionAttribute d:
 							ca.Description = d.Description;
 							break;
 
 						case RemainingTextAttribute r:
 							ca.IsCatchAll = true;
 							break;
 
 						case ParamArrayAttribute p:
 							ca.IsCatchAll = true;
 							ca.Type = arg.ParameterType.GetElementType();
 							ca.IsArray = true;
 							isParams = true;
 							break;
 
 						default:
 							attrsCustom.Add(xa);
 							break;
 					}
 				}
 
 				if (i > 2 && !ca.IsOptional && !ca.IsCatchAll && args[i - 3].IsOptional)
 					throw new InvalidOverloadException("Non-optional argument cannot appear after an optional one", method, arg);
 
 				if (arg.ParameterType.IsArray && !isParams)
 					throw new InvalidOverloadException("Cannot use array arguments without params modifier.", method, arg);
 
-				ca.CustomAttributes = new ReadOnlyCollection<Attribute>(attrsCustom);
+				ca.CustomAttributes = attrsCustom;
 				args.Add(ca);
 				ea[i++] = Expression.Parameter(arg.ParameterType, arg.Name);
 			}
 
 			//var ec = Expression.Call(iev, method, ea.Skip(2));
 			var ec = Expression.Call(iep, method, ea.Skip(1));
 			var el = Expression.Lambda(ec, ea);
 
 			this.ArgumentSet = setb.ToString();
-			this.Arguments = new ReadOnlyCollection<CommandArgument>(args);
+			this.Arguments = args;
 			this.Callable = el.Compile();
 		}
 
 		/// <summary>
 		/// Sets the priority for this command overload.
 		/// </summary>
 		/// <param name="priority">Priority for this command overload.</param>
 		/// <returns>This builder.</returns>
 		public CommandOverloadBuilder WithPriority(int priority)
 		{
 			this.Priority = priority;
 
 			return this;
 		}
 
 		/// <summary>
 		/// Builds the command overload.
 		/// </summary>
 		internal CommandOverload Build()
 		{
 			var ovl = new CommandOverload()
 			{
 				Arguments = this.Arguments,
 				Priority = this.Priority,
 				Callable = this.Callable,
 				InvocationTarget = this._invocationTarget
 			};
 
 			return ovl;
 		}
 	}
 }
diff --git a/DisCatSharp.CommandsNext/Entities/CommandArgument.cs b/DisCatSharp.CommandsNext/Entities/CommandArgument.cs
index cd06d369b..50452d6c3 100644
--- a/DisCatSharp.CommandsNext/Entities/CommandArgument.cs
+++ b/DisCatSharp.CommandsNext/Entities/CommandArgument.cs
@@ -1,73 +1,73 @@
 // 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 System.Collections.Generic;
 
 namespace DisCatSharp.CommandsNext
 {
 	/// <summary>
 	/// Represents a command argument.
 	/// </summary>
 	public sealed class CommandArgument
 	{
 		/// <summary>
 		/// Gets this argument's name.
 		/// </summary>
 		public string Name { get; internal set; }
 
 		/// <summary>
 		/// Gets this argument's type.
 		/// </summary>
 		public Type Type { get; internal set; }
 
 		/// <summary>
 		/// Gets or sets whether this argument is an array argument.
 		/// </summary>
 		internal bool IsArray { get; set; } = false;
 
 		/// <summary>
 		/// Gets whether this argument is optional.
 		/// </summary>
 		public bool IsOptional { get; internal set; }
 
 		/// <summary>
 		/// Gets this argument's default value.
 		/// </summary>
 		public object DefaultValue { get; internal set; }
 
 		/// <summary>
 		/// Gets whether this argument catches all remaining arguments.
 		/// </summary>
 		public bool IsCatchAll { get; internal set; }
 
 		/// <summary>
 		/// Gets this argument's description.
 		/// </summary>
 		public string Description { get; internal set; }
 
 		/// <summary>
 		/// Gets the custom attributes attached to this argument.
 		/// </summary>
-		public IReadOnlyCollection<Attribute> CustomAttributes { get; internal set; }
+		public IReadOnlyList<Attribute> CustomAttributes { get; internal set; }
 	}
 }
diff --git a/DisCatSharp.CommandsNext/Exceptions/ChecksFailedException.cs b/DisCatSharp.CommandsNext/Exceptions/ChecksFailedException.cs
index e5e2e6906..02533029f 100644
--- a/DisCatSharp.CommandsNext/Exceptions/ChecksFailedException.cs
+++ b/DisCatSharp.CommandsNext/Exceptions/ChecksFailedException.cs
@@ -1,65 +1,66 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 
 using DisCatSharp.CommandsNext.Attributes;
 
 namespace DisCatSharp.CommandsNext.Exceptions
 {
 	/// <summary>
 	/// Indicates that one or more checks for given command have failed.
 	/// </summary>
 	public class ChecksFailedException : Exception
 	{
 		/// <summary>
 		/// Gets the command that was executed.
 		/// </summary>
 		public Command Command { get; }
 
 		/// <summary>
 		/// Gets the context in which given command was executed.
 		/// </summary>
 		public CommandContext Context { get; }
 
 		/// <summary>
 		/// Gets the checks that failed.
 		/// </summary>
 		public IReadOnlyList<CheckBaseAttribute> FailedChecks { get; }
 
 		/// <summary>
 		/// Creates a new <see cref="ChecksFailedException"/>.
 		/// </summary>
 		/// <param name="command">Command that failed to execute.</param>
 		/// <param name="ctx">Context in which the command was executed.</param>
 		/// <param name="failedChecks">A collection of checks that failed.</param>
 		public ChecksFailedException(Command command, CommandContext ctx, IEnumerable<CheckBaseAttribute> failedChecks)
 			: base("One or more pre-execution checks failed.")
 		{
 			this.Command = command;
 			this.Context = ctx;
-			this.FailedChecks = new ReadOnlyCollection<CheckBaseAttribute>(new List<CheckBaseAttribute>(failedChecks));
+			this.FailedChecks = failedChecks.ToArray();
 		}
 	}
 }
diff --git a/DisCatSharp.CommandsNext/Exceptions/DuplicateOverloadException.cs b/DisCatSharp.CommandsNext/Exceptions/DuplicateOverloadException.cs
index 6b992e157..668e7a490 100644
--- a/DisCatSharp.CommandsNext/Exceptions/DuplicateOverloadException.cs
+++ b/DisCatSharp.CommandsNext/Exceptions/DuplicateOverloadException.cs
@@ -1,69 +1,69 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 
 namespace DisCatSharp.CommandsNext.Exceptions
 {
 	/// <summary>
 	/// Indicates that given argument set already exists as an overload for specified command.
 	/// </summary>
 	public class DuplicateOverloadException : Exception
 	{
 		/// <summary>
 		/// Gets the name of the command that already has the overload.
 		/// </summary>
 		public string CommandName { get; }
 
 		/// <summary>
 		/// Gets the ordered collection of argument types for the specified overload.
 		/// </summary>
-		public IReadOnlyList<Type> ArgumentTypes { get; }
+		public IEnumerable<Type> ArgumentTypes { get; }
 
 		/// <summary>
 		/// Gets the argument set key.
 		/// </summary>
 		private readonly string _argumentSetKey;
 
 		/// <summary>
 		/// Creates a new exception indicating given argument set already exists as an overload for specified command.
 		/// </summary>
 		/// <param name="name">Name of the command with duplicated argument sets.</param>
 		/// <param name="argumentTypes">Collection of ordered argument types for the command.</param>
 		/// <param name="argumentSetKey">Overload identifier.</param>
-		internal DuplicateOverloadException(string name, IList<Type> argumentTypes, string argumentSetKey)
+		internal DuplicateOverloadException(string name, IEnumerable<Type> argumentTypes, string argumentSetKey)
 			: base("An overload with specified argument types exists.")
 		{
 			this.CommandName = name;
-			this.ArgumentTypes = new ReadOnlyCollection<Type>(argumentTypes);
+			this.ArgumentTypes = argumentTypes;
 			this._argumentSetKey = argumentSetKey;
 		}
 
 		/// <summary>
 		/// Returns a string representation of this <see cref="DuplicateOverloadException"/>.
 		/// </summary>
 		/// <returns>A string representation.</returns>
 		public override string ToString() => $"{this.GetType()}: {this.Message}\nCommand name: {this.CommandName}\nArgument types: {this._argumentSetKey}"; // much like System.ArgumentException works
 	}
 }
diff --git a/DisCatSharp.Common/Utilities/Extensions.cs b/DisCatSharp.Common/Utilities/Extensions.cs
index 1f1f5b691..6046ed3f8 100644
--- a/DisCatSharp.Common/Utilities/Extensions.cs
+++ b/DisCatSharp.Common/Utilities/Extensions.cs
@@ -1,532 +1,553 @@
 // 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 System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Runtime.CompilerServices;
 
 namespace DisCatSharp.Common
 {
 	/// <summary>
 	/// Assortment of various extension and utility methods, designed to make working with various types a little easier.
 	/// </summary>
 	public static class Extensions
 	{
 		/// <summary>
 		/// <para>Deconstructs a <see cref="System.Collections.Generic.Dictionary{TKey, TValue}"/> key-value pair item (<see cref="System.Collections.Generic.KeyValuePair{TKey, TValue}"/>) into 2 separate variables.</para>
 		/// <para>This allows for enumerating over dictionaries in foreach blocks by using a (k, v) tuple as the enumerator variable, instead of having to use a <see cref="System.Collections.Generic.KeyValuePair{TKey, TValue}"/> directly.</para>
 		/// </summary>
 		/// <typeparam name="TKey">Type of dictionary item key.</typeparam>
 		/// <typeparam name="TValue">Type of dictionary item value.</typeparam>
 		/// <param name="kvp">Key-value pair to deconstruct.</param>
 		/// <param name="key">Deconstructed key.</param>
 		/// <param name="value">Deconstructed value.</param>
 		public static void Deconstruct<TKey, TValue>(this KeyValuePair<TKey, TValue> kvp, out TKey key, out TValue value)
 		{
 			key = kvp.Key;
 			value = kvp.Value;
 		}
 
 		/// <summary>
 		/// Calculates the length of string representation of given number in base 10 (including sign, if present).
 		/// </summary>
 		/// <param name="num">Number to calculate the length of.</param>
 		/// <returns>Calculated number length.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static int CalculateLength(this sbyte num)
 			=> num == 0 ? 1 : (int)Math.Floor(Math.Log10(Math.Abs(num == sbyte.MinValue ? num + 1 : num))) + (num < 0 ? 2 /* include sign */ : 1);
 
 		/// <summary>
 		/// Calculates the length of string representation of given number in base 10 (including sign, if present).
 		/// </summary>
 		/// <param name="num">Number to calculate the length of.</param>
 		/// <returns>Calculated number length.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static int CalculateLength(this byte num)
 			=> num == 0 ? 1 : (int)Math.Floor(Math.Log10(num)) + 1;
 
 		/// <summary>
 		/// Calculates the length of string representation of given number in base 10 (including sign, if present).
 		/// </summary>
 		/// <param name="num">Number to calculate the length of.</param>
 		/// <returns>Calculated number length.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static int CalculateLength(this short num)
 			=> num == 0 ? 1 : (int)Math.Floor(Math.Log10(Math.Abs(num == short.MinValue ? num + 1 : num))) + (num < 0 ? 2 /* include sign */ : 1);
 
 		/// <summary>
 		/// Calculates the length of string representation of given number in base 10 (including sign, if present).
 		/// </summary>
 		/// <param name="num">Number to calculate the length of.</param>
 		/// <returns>Calculated number length.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static int CalculateLength(this ushort num)
 			=> num == 0 ? 1 : (int)Math.Floor(Math.Log10(num)) + 1;
 
 		/// <summary>
 		/// Calculates the length of string representation of given number in base 10 (including sign, if present).
 		/// </summary>
 		/// <param name="num">Number to calculate the length of.</param>
 		/// <returns>Calculated number length.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static int CalculateLength(this int num)
 			=> num == 0 ? 1 : (int)Math.Floor(Math.Log10(Math.Abs(num == int.MinValue ? num + 1 : num))) + (num < 0 ? 2 /* include sign */ : 1);
 
 		/// <summary>
 		/// Calculates the length of string representation of given number in base 10 (including sign, if present).
 		/// </summary>
 		/// <param name="num">Number to calculate the length of.</param>
 		/// <returns>Calculated number length.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static int CalculateLength(this uint num)
 			=> num == 0 ? 1 : (int)Math.Floor(Math.Log10(num)) + 1;
 
 		/// <summary>
 		/// Calculates the length of string representation of given number in base 10 (including sign, if present).
 		/// </summary>
 		/// <param name="num">Number to calculate the length of.</param>
 		/// <returns>Calculated number length.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static int CalculateLength(this long num)
 			=> num == 0 ? 1 : (int)Math.Floor(Math.Log10(Math.Abs(num == long.MinValue ? num + 1 : num))) + (num < 0 ? 2 /* include sign */ : 1);
 
 		/// <summary>
 		/// Calculates the length of string representation of given number in base 10 (including sign, if present).
 		/// </summary>
 		/// <param name="num">Number to calculate the length of.</param>
 		/// <returns>Calculated number length.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static int CalculateLength(this ulong num)
 			=> num == 0 ? 1 : (int)Math.Floor(Math.Log10(num)) + 1;
 
 		/// <summary>
 		/// Tests whether given value is in supplied range, optionally allowing it to be an exclusive check.
 		/// </summary>
 		/// <param name="num">Number to test.</param>
 		/// <param name="min">Lower bound of the range.</param>
 		/// <param name="max">Upper bound of the range.</param>
 		/// <param name="inclusive">Whether the check is to be inclusive.</param>
 		/// <returns>Whether the value is in range.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static bool IsInRange(this sbyte num, sbyte min, sbyte max, bool inclusive = true)
 		{
 			if (min > max)
 			{
 				min ^= max;
 				max ^= min;
 				min ^= max;
 			}
 
 			return inclusive ? num >= min && num <= max : num > min && num < max;
 		}
 
 		/// <summary>
 		/// Tests whether given value is in supplied range, optionally allowing it to be an exclusive check.
 		/// </summary>
 		/// <param name="num">Number to test.</param>
 		/// <param name="min">Lower bound of the range.</param>
 		/// <param name="max">Upper bound of the range.</param>
 		/// <param name="inclusive">Whether the check is to be inclusive.</param>
 		/// <returns>Whether the value is in range.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static bool IsInRange(this byte num, byte min, byte max, bool inclusive = true)
 		{
 			if (min > max)
 			{
 				min ^= max;
 				max ^= min;
 				min ^= max;
 			}
 
 			return inclusive ? num >= min && num <= max : num > min && num < max;
 		}
 
 		/// <summary>
 		/// Tests whether given value is in supplied range, optionally allowing it to be an exclusive check.
 		/// </summary>
 		/// <param name="num">Number to test.</param>
 		/// <param name="min">Lower bound of the range.</param>
 		/// <param name="max">Upper bound of the range.</param>
 		/// <param name="inclusive">Whether the check is to be inclusive.</param>
 		/// <returns>Whether the value is in range.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static bool IsInRange(this short num, short min, short max, bool inclusive = true)
 		{
 			if (min > max)
 			{
 				min ^= max;
 				max ^= min;
 				min ^= max;
 			}
 
 			return inclusive ? num >= min && num <= max : num > min && num < max;
 		}
 
 		/// <summary>
 		/// Tests whether given value is in supplied range, optionally allowing it to be an exclusive check.
 		/// </summary>
 		/// <param name="num">Number to test.</param>
 		/// <param name="min">Lower bound of the range.</param>
 		/// <param name="max">Upper bound of the range.</param>
 		/// <param name="inclusive">Whether the check is to be inclusive.</param>
 		/// <returns>Whether the value is in range.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static bool IsInRange(this ushort num, ushort min, ushort max, bool inclusive = true)
 		{
 			if (min > max)
 			{
 				min ^= max;
 				max ^= min;
 				min ^= max;
 			}
 
 			return inclusive ? num >= min && num <= max : num > min && num < max;
 		}
 
 		/// <summary>
 		/// Tests whether given value is in supplied range, optionally allowing it to be an exclusive check.
 		/// </summary>
 		/// <param name="num">Number to test.</param>
 		/// <param name="min">Lower bound of the range.</param>
 		/// <param name="max">Upper bound of the range.</param>
 		/// <param name="inclusive">Whether the check is to be inclusive.</param>
 		/// <returns>Whether the value is in range.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static bool IsInRange(this int num, int min, int max, bool inclusive = true)
 		{
 			if (min > max)
 			{
 				min ^= max;
 				max ^= min;
 				min ^= max;
 			}
 
 			return inclusive ? num >= min && num <= max : num > min && num < max;
 		}
 
 		/// <summary>
 		/// Tests whether given value is in supplied range, optionally allowing it to be an exclusive check.
 		/// </summary>
 		/// <param name="num">Number to test.</param>
 		/// <param name="min">Lower bound of the range.</param>
 		/// <param name="max">Upper bound of the range.</param>
 		/// <param name="inclusive">Whether the check is to be inclusive.</param>
 		/// <returns>Whether the value is in range.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static bool IsInRange(this uint num, uint min, uint max, bool inclusive = true)
 		{
 			if (min > max)
 			{
 				min ^= max;
 				max ^= min;
 				min ^= max;
 			}
 
 			return inclusive ? num >= min && num <= max : num > min && num < max;
 		}
 
 		/// <summary>
 		/// Tests whether given value is in supplied range, optionally allowing it to be an exclusive check.
 		/// </summary>
 		/// <param name="num">Number to test.</param>
 		/// <param name="min">Lower bound of the range.</param>
 		/// <param name="max">Upper bound of the range.</param>
 		/// <param name="inclusive">Whether the check is to be inclusive.</param>
 		/// <returns>Whether the value is in range.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static bool IsInRange(this long num, long min, long max, bool inclusive = true)
 		{
 			if (min > max)
 			{
 				min ^= max;
 				max ^= min;
 				min ^= max;
 			}
 
 			return inclusive ? num >= min && num <= max : num > min && num < max;
 		}
 
 		/// <summary>
 		/// Tests whether given value is in supplied range, optionally allowing it to be an exclusive check.
 		/// </summary>
 		/// <param name="num">Number to test.</param>
 		/// <param name="min">Lower bound of the range.</param>
 		/// <param name="max">Upper bound of the range.</param>
 		/// <param name="inclusive">Whether the check is to be inclusive.</param>
 		/// <returns>Whether the value is in range.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static bool IsInRange(this ulong num, ulong min, ulong max, bool inclusive = true)
 		{
 			if (min > max)
 			{
 				min ^= max;
 				max ^= min;
 				min ^= max;
 			}
 
 			return inclusive ? num >= min && num <= max : num > min && num < max;
 		}
 
 		/// <summary>
 		/// Tests whether given value is in supplied range, optionally allowing it to be an exclusive check.
 		/// </summary>
 		/// <param name="num">Number to test.</param>
 		/// <param name="min">Lower bound of the range.</param>
 		/// <param name="max">Upper bound of the range.</param>
 		/// <param name="inclusive">Whether the check is to be inclusive.</param>
 		/// <returns>Whether the value is in range.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static bool IsInRange(this float num, float min, float max, bool inclusive = true)
 		{
 			if (min > max)
 				return false;
 
 			return inclusive ? num >= min && num <= max : num > min && num < max;
 		}
 
 		/// <summary>
 		/// Tests whether given value is in supplied range, optionally allowing it to be an exclusive check.
 		/// </summary>
 		/// <param name="num">Number to test.</param>
 		/// <param name="min">Lower bound of the range.</param>
 		/// <param name="max">Upper bound of the range.</param>
 		/// <param name="inclusive">Whether the check is to be inclusive.</param>
 		/// <returns>Whether the value is in range.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static bool IsInRange(this double num, double min, double max, bool inclusive = true)
 		{
 			if (min > max)
 				return false;
 
 			return inclusive ? num >= min && num <= max : num > min && num < max;
 		}
 
 		/// <summary>
 		/// Returns whether supplied character is in any of the following ranges: a-z, A-Z, 0-9.
 		/// </summary>
 		/// <param name="c">Character to test.</param>
 		/// <returns>Whether the character is in basic alphanumeric character range.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static bool IsBasicAlphanumeric(this char c)
 			=> (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9');
 
 		/// <summary>
 		/// Returns whether supplied character is in the 0-9 range.
 		/// </summary>
 		/// <param name="c">Character to test.</param>
 		/// <returns>Whether the character is in basic numeric digit character range.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static bool IsBasicDigit(this char c)
 			=> c >= '0' && c <= '9';
 
 		/// <summary>
 		/// Returns whether supplied character is in the a-z or A-Z range.
 		/// </summary>
 		/// <param name="c">Character to test.</param>
 		/// <returns>Whether the character is in basic letter character range.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static bool IsBasicLetter(this char c)
 			=> (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
 
 		/// <summary>
 		/// Tests whether given string ends with given character.
 		/// </summary>
 		/// <param name="s">String to test.</param>
 		/// <param name="c">Character to test for.</param>
 		/// <returns>Whether the supplied string ends with supplied character.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static bool EndsWithCharacter(this string s, char c)
 			=> s.Length >= 1 && s[^1] == c;
 
 		/// <summary>
 		/// Tests whether given string starts with given character.
 		/// </summary>
 		/// <param name="s">String to test.</param>
 		/// <param name="c">Character to test for.</param>
 		/// <returns>Whether the supplied string starts with supplied character.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static bool StartsWithCharacter(this string s, char c)
 			=> s.Length >= 1 && s[0] == c;
 
 		// https://stackoverflow.com/questions/9545619/a-fast-hash-function-for-string-in-c-sharp
 		// Calls are inlined to call the underlying method directly
 		/// <summary>
 		/// Computes a 64-bit Knuth hash from supplied characters.
 		/// </summary>
 		/// <param name="chars">Characters to compute the hash value from.</param>
 		/// <returns>Computer 64-bit Knuth hash.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static ulong CalculateKnuthHash(this ReadOnlySpan<char> chars)
 			=> Knuth(chars);
 
 		/// <summary>
 		/// Computes a 64-bit Knuth hash from supplied characters.
 		/// </summary>
 		/// <param name="chars">Characters to compute the hash value from.</param>
 		/// <returns>Computer 64-bit Knuth hash.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static ulong CalculateKnuthHash(this Span<char> chars)
 			=> Knuth(chars);
 
 		/// <summary>
 		/// Computes a 64-bit Knuth hash from supplied characters.
 		/// </summary>
 		/// <param name="chars">Characters to compute the hash value from.</param>
 		/// <returns>Computer 64-bit Knuth hash.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static ulong CalculateKnuthHash(this ReadOnlyMemory<char> chars)
 			=> Knuth(chars.Span);
 
 		/// <summary>
 		/// Computes a 64-bit Knuth hash from supplied characters.
 		/// </summary>
 		/// <param name="chars">Characters to compute the hash value from.</param>
 		/// <returns>Computer 64-bit Knuth hash.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static ulong CalculateKnuthHash(this Memory<char> chars)
 			=> Knuth(chars.Span);
 
 		/// <summary>
 		/// Computes a 64-bit Knuth hash from supplied characters.
 		/// </summary>
 		/// <param name="chars">Characters to compute the hash value from.</param>
 		/// <returns>Computer 64-bit Knuth hash.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static ulong CalculateKnuthHash(this ArraySegment<char> chars)
 			=> Knuth(chars.AsSpan());
 
 		/// <summary>
 		/// Computes a 64-bit Knuth hash from supplied characters.
 		/// </summary>
 		/// <param name="chars">Characters to compute the hash value from.</param>
 		/// <returns>Computer 64-bit Knuth hash.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static ulong CalculateKnuthHash(this char[] chars)
 			=> Knuth(chars.AsSpan());
 
 		/// <summary>
 		/// Computes a 64-bit Knuth hash from supplied characters.
 		/// </summary>
 		/// <param name="chars">Characters to compute the hash value from.</param>
 		/// <param name="start">Offset in the array to start calculating from.</param>
 		/// <param name="count">Number of characters to compute the hash from.</param>
 		/// <returns>Computer 64-bit Knuth hash.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static ulong CalculateKnuthHash(this char[] chars, int start, int count)
 			=> Knuth(chars.AsSpan(start, count));
 
 		/// <summary>
 		/// Computes a 64-bit Knuth hash from supplied characters.
 		/// </summary>
 		/// <param name="chars">Characters to compute the hash value from.</param>
 		/// <returns>Computer 64-bit Knuth hash.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static ulong CalculateKnuthHash(this string chars)
 			=> Knuth(chars.AsSpan());
 
 		/// <summary>
 		/// Computes a 64-bit Knuth hash from supplied characters.
 		/// </summary>
 		/// <param name="chars">Characters to compute the hash value from.</param>
 		/// <param name="start">Offset in the array to start calculating from.</param>
 		/// <param name="count">Number of characters to compute the hash from.</param>
 		/// <returns>Computer 64-bit Knuth hash.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static ulong CalculateKnuthHash(this string chars, int start, int count)
 			=> Knuth(chars.AsSpan(start, count));
 
 		/// <summary>
 		/// Gets the two first elements of the <see cref="IEnumerable{T}"/>, if they exist.
 		/// </summary>
 		/// <param name="enumerable">The enumerable.</param>
 		/// <param name="values">The output values. Undefined if <code>false</code> is returned.</param>
 		/// <returns>Whether the <see cref="IEnumerable{T}"/> contained enough elements.</returns>
 		internal static bool TryFirstTwo<T>(this IEnumerable<T> enumerable, out (T first, T second) values)
 		{
 			values = default;
 
 			using var enumerator = enumerable.GetEnumerator();
 
 			if (!enumerator.MoveNext())
 				return false;
 
 			var first = enumerator.Current;
 
 			if (!enumerator.MoveNext())
 				return false;
 
 
 			values = (first, enumerator.Current);
 			return true;
 		}
 
 		/// <summary>
 		/// Knuths the.
 		/// </summary>
 		/// <param name="chars">The chars.</param>
 		/// <returns>An ulong.</returns>
 		private static ulong Knuth(ReadOnlySpan<char> chars)
 		{
 			var hash = 3074457345618258791ul;
 			foreach (var ch in chars)
 				hash = (hash + ch) * 3074457345618258799ul;
 
 			return hash;
 		}
 
 		/// <summary>
 		/// Removes the first item matching the predicate from the list.
 		/// </summary>
 		/// <typeparam name="T"></typeparam>
 		/// <param name="list"></param>
 		/// <param name="predicate"></param>
 		/// <returns>Whether an item was removed.</returns>
 		internal static bool RemoveFirst<T>(this IList<T> list, Predicate<T> predicate)
 		{
 			for (var i = 0; i < list.Count; i++)
 			{
 				if (predicate(list[i]))
 				{
 					list.RemoveAt(i);
 					return true;
 				}
 			}
 
 			return false;
 		}
 
 		/// <summary>
 		/// Populates an array with the given value.
 		/// </summary>
 		/// <typeparam name="T"></typeparam>
 		/// <param name="arr"></param>
 		/// <param name="value"></param>
 		internal static void Populate<T>(this T[] arr, T value)
 		{
 			for (var i = 0; i < arr.Length; i++)
 			{
 				arr[i] = value;
 			}
 		}
+
+		/// <summary>
+		/// Applies a function to all elements of a list.
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="list"></param>
+		/// <param name="mutator"></param>
+		/// <returns>The list for convenience.</returns>
+		internal static List<T> Mutate<T>(this List<T> list, Action<T> mutator)
+			where T : class
+		{
+			foreach (var elem in list)
+			{
+				mutator(elem);
+			}
+
+			return list;
+		}
+
+		internal static ReadOnlyCollection<T> AsReadOnly<T>(this IList<T> list) => new(list);
 	}
 }
diff --git a/DisCatSharp.Interactivity/EventHandling/EventWaiter.cs b/DisCatSharp.Interactivity/EventHandling/EventWaiter.cs
index 8a9ba3d7c..868c9d9c8 100644
--- a/DisCatSharp.Interactivity/EventHandling/EventWaiter.cs
+++ b/DisCatSharp.Interactivity/EventHandling/EventWaiter.cs
@@ -1,174 +1,174 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 
 using ConcurrentCollections;
 
 using DisCatSharp.Common.Utilities;
 
 using Microsoft.Extensions.Logging;
 
 namespace DisCatSharp.Interactivity.EventHandling
 {
 	/// <summary>
 	/// EventWaiter is a class that serves as a layer between the InteractivityExtension
 	/// and the DiscordClient to listen to an event and check for matches to a predicate.
 	/// </summary>
 	/// <typeparam name="T"></typeparam>
 	internal class EventWaiter<T> : IDisposable where T : AsyncEventArgs
 	{
 		DiscordClient _client;
 		AsyncEvent<DiscordClient, T> _event;
 		AsyncEventHandler<DiscordClient, T> _handler;
 		ConcurrentHashSet<MatchRequest<T>> _matchRequests;
 		ConcurrentHashSet<CollectRequest<T>> _collectRequests;
 		bool _disposed;
 
 		/// <summary>
 		/// Creates a new EventWaiter object.
 		/// </summary>
 		/// <param name="client">Your DiscordClient</param>
 		public EventWaiter(DiscordClient client)
 		{
 			this._client = client;
 			var tinfo = this._client.GetType().GetTypeInfo();
 			var handler = tinfo.DeclaredFields.First(x => x.FieldType == typeof(AsyncEvent<DiscordClient, T>));
 			this._matchRequests = new ConcurrentHashSet<MatchRequest<T>>();
 			this._collectRequests = new ConcurrentHashSet<CollectRequest<T>>();
 			this._event = (AsyncEvent<DiscordClient, T>)handler.GetValue(this._client);
 			this._handler = new AsyncEventHandler<DiscordClient, T>(this.HandleEvent);
 			this._event.Register(this._handler);
 		}
 
 		/// <summary>
 		/// Waits for a match to a specific request, else returns null.
 		/// </summary>
 		/// <param name="request">Request to match</param>
 		/// <returns></returns>
 		public async Task<T> WaitForMatchAsync(MatchRequest<T> request)
 		{
 			T result = null;
 			this._matchRequests.Add(request);
 			try
 			{
 				result = await request.Tcs.Task.ConfigureAwait(false);
 			}
 			catch (Exception ex)
 			{
 				this._client.Logger.LogError(InteractivityEvents.InteractivityWaitError, ex, "An exception occurred while waiting for {0}", typeof(T).Name);
 			}
 			finally
 			{
 				request.Dispose();
 				this._matchRequests.TryRemove(request);
 			}
 			return result;
 		}
 
 		/// <summary>
 		/// Collects the matches async.
 		/// </summary>
 		/// <param name="request">The request.</param>
-		public async Task<ReadOnlyCollection<T>> CollectMatchesAsync(CollectRequest<T> request)
+		public async Task<List<T>> CollectMatchesAsync(CollectRequest<T> request)
 		{
-			ReadOnlyCollection<T> result = null;
+			List<T> result;
 			this._collectRequests.Add(request);
 			try
 			{
 				await request.Tcs.Task.ConfigureAwait(false);
 			}
 			catch (Exception ex)
 			{
 				this._client.Logger.LogError(InteractivityEvents.InteractivityWaitError, ex, "An exception occurred while collecting from {0}", typeof(T).Name);
 			}
 			finally
 			{
-				result = new ReadOnlyCollection<T>(new HashSet<T>(request.Collected).ToList());
+				result = request.Collected.ToList();
 				request.Dispose();
 				this._collectRequests.TryRemove(request);
 			}
 			return result;
 		}
 
 		/// <summary>
 		/// Handles the event.
 		/// </summary>
 		/// <param name="client">The client.</param>
 		/// <param name="eventArgs">The event's arguments.</param>
 		private Task HandleEvent(DiscordClient client, T eventArgs)
 		{
 			if (!this._disposed)
 			{
 				foreach (var req in this._matchRequests)
 				{
 					if (req.Predicate(eventArgs))
 					{
 						req.Tcs.TrySetResult(eventArgs);
 					}
 				}
 
 				foreach (var req in this._collectRequests)
 				{
 					if (req.Predicate(eventArgs))
 					{
 						req.Collected.Add(eventArgs);
 					}
 				}
 			}
 
 			return Task.CompletedTask;
 		}
 
 		~EventWaiter()
 		{
 			this.Dispose();
 		}
 
 		/// <summary>
 		/// Disposes this EventWaiter
 		/// </summary>
 		public void Dispose()
 		{
 			this._disposed = true;
 			if (this._event != null)
 				this._event.Unregister(this._handler);
 
 			this._event = null;
 			this._handler = null;
 			this._client = null;
 
 			if (this._matchRequests != null)
 				this._matchRequests.Clear();
 			if (this._collectRequests != null)
 				this._collectRequests.Clear();
 
 			this._matchRequests = null;
 			this._collectRequests = null;
 		}
 	}
 }
diff --git a/DisCatSharp.Interactivity/EventHandling/Poller.cs b/DisCatSharp.Interactivity/EventHandling/Poller.cs
index 932fad295..450244b49 100644
--- a/DisCatSharp.Interactivity/EventHandling/Poller.cs
+++ b/DisCatSharp.Interactivity/EventHandling/Poller.cs
@@ -1,177 +1,177 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
 
 using ConcurrentCollections;
 
 using DisCatSharp.EventArgs;
 
 using Microsoft.Extensions.Logging;
 
 namespace DisCatSharp.Interactivity.EventHandling
 {
 	/// <summary>
 	/// The poller.
 	/// </summary>
 	internal class Poller
 	{
 		DiscordClient _client;
 		ConcurrentHashSet<PollRequest> _requests;
 
 		/// <summary>
 		/// Creates a new EventWaiter object.
 		/// </summary>
 		/// <param name="client">Your DiscordClient</param>
 		public Poller(DiscordClient client)
 		{
 			this._client = client;
 			this._requests = new ConcurrentHashSet<PollRequest>();
 
 			this._client.MessageReactionAdded += this.HandleReactionAdd;
 			this._client.MessageReactionRemoved += this.HandleReactionRemove;
 			this._client.MessageReactionsCleared += this.HandleReactionClear;
 		}
 
 		/// <summary>
 		/// Dos the poll async.
 		/// </summary>
 		/// <param name="request">The request.</param>
 		/// <returns>A Task.</returns>
-		public async Task<ReadOnlyCollection<PollEmoji>> DoPollAsync(PollRequest request)
+		public async Task<List<PollEmoji>> DoPollAsync(PollRequest request)
 		{
-			ReadOnlyCollection<PollEmoji> result = null;
+			List<PollEmoji> result;
 			this._requests.Add(request);
 			try
 			{
 				await request.Tcs.Task.ConfigureAwait(false);
 			}
 			catch (Exception ex)
 			{
 				this._client.Logger.LogError(InteractivityEvents.InteractivityPollError, ex, "Exception occurred while polling");
 			}
 			finally
 			{
-				result = new ReadOnlyCollection<PollEmoji>(new HashSet<PollEmoji>(request.Collected).ToList());
+				result = request.Collected.ToList();
 				request.Dispose();
 				this._requests.TryRemove(request);
 			}
 			return result;
 		}
 
 		/// <summary>
 		/// Handles the reaction add.
 		/// </summary>
 		/// <param name="client">The client.</param>
 		/// <param name="eventArgs">The event's arguments.</param>
 		/// <returns>A Task.</returns>
 		private Task HandleReactionAdd(DiscordClient client, MessageReactionAddEventArgs eventArgs)
 		{
 			if (this._requests.Count == 0)
 				return Task.CompletedTask;
 
 			_ = Task.Run(async () =>
 			{
 				foreach (var req in this._requests)
 				{
 					// match message
 					if (req.Message.Id == eventArgs.Message.Id && req.Message.ChannelId == eventArgs.Channel.Id)
 					{
 						if (req.Emojis.Contains(eventArgs.Emoji) && !req.Collected.Any(x => x.Voted.Contains(eventArgs.User)))
 						{
 							if (eventArgs.User.Id != this._client.CurrentUser.Id)
 								req.AddReaction(eventArgs.Emoji, eventArgs.User);
 						}
 						else
 						{
 							var member = await eventArgs.Channel.Guild.GetMemberAsync(client.CurrentUser.Id).ConfigureAwait(false);
 							if (eventArgs.Channel.PermissionsFor(member).HasPermission(Permissions.ManageMessages))
 								await eventArgs.Message.DeleteReactionAsync(eventArgs.Emoji, eventArgs.User).ConfigureAwait(false);
 						}
 					}
 				}
 			});
 			return Task.CompletedTask;
 		}
 
 		/// <summary>
 		/// Handles the reaction remove.
 		/// </summary>
 		/// <param name="client">The client.</param>
 		/// <param name="eventArgs">The event's arguments.</param>
 		/// <returns>A Task.</returns>
 		private Task HandleReactionRemove(DiscordClient client, MessageReactionRemoveEventArgs eventArgs)
 		{
 			foreach (var req in this._requests)
 			{
 				// match message
 				if (req.Message.Id == eventArgs.Message.Id && req.Message.ChannelId == eventArgs.Channel.Id)
 				{
 					if (eventArgs.User.Id != this._client.CurrentUser.Id)
 						req.RemoveReaction(eventArgs.Emoji, eventArgs.User);
 				}
 			}
 			return Task.CompletedTask;
 		}
 
 		/// <summary>
 		/// Handles the reaction clear.
 		/// </summary>
 		/// <param name="client">The client.</param>
 		/// <param name="eventArgs">The event's arguments.</param>
 		/// <returns>A Task.</returns>
 		private Task HandleReactionClear(DiscordClient client, MessageReactionsClearEventArgs eventArgs)
 		{
 			foreach (var req in this._requests)
 			{
 				// match message
 				if (req.Message.Id == eventArgs.Message.Id && req.Message.ChannelId == eventArgs.Channel.Id)
 				{
 					req.ClearCollected();
 				}
 			}
 			return Task.CompletedTask;
 		}
 
 		~Poller()
 		{
 			this.Dispose();
 		}
 
 		/// <summary>
 		/// Disposes this EventWaiter
 		/// </summary>
 		public void Dispose()
 		{
 			this._client.MessageReactionAdded -= this.HandleReactionAdd;
 			this._client.MessageReactionRemoved -= this.HandleReactionRemove;
 			this._client.MessageReactionsCleared -= this.HandleReactionClear;
 			this._client = null;
 			this._requests.Clear();
 			this._requests = null;
 		}
 	}
 }
diff --git a/DisCatSharp.Interactivity/EventHandling/ReactionCollector.cs b/DisCatSharp.Interactivity/EventHandling/ReactionCollector.cs
index 1cbe9cbf5..209c08d38 100644
--- a/DisCatSharp.Interactivity/EventHandling/ReactionCollector.cs
+++ b/DisCatSharp.Interactivity/EventHandling/ReactionCollector.cs
@@ -1,287 +1,287 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 
 using ConcurrentCollections;
 
 using DisCatSharp.Common.Utilities;
 using DisCatSharp.Entities;
 using DisCatSharp.EventArgs;
 
 using Microsoft.Extensions.Logging;
 
 namespace DisCatSharp.Interactivity.EventHandling
 {
 	/// <summary>
 	/// EventWaiter is a class that serves as a layer between the InteractivityExtension
 	/// and the DiscordClient to listen to an event and check for matches to a predicate.
 	/// </summary>
 	internal class ReactionCollector : IDisposable
 	{
 		DiscordClient _client;
 
 		AsyncEvent<DiscordClient, MessageReactionAddEventArgs> _reactionAddEvent;
 		AsyncEventHandler<DiscordClient, MessageReactionAddEventArgs> _reactionAddHandler;
 
 		AsyncEvent<DiscordClient, MessageReactionRemoveEventArgs> _reactionRemoveEvent;
 		AsyncEventHandler<DiscordClient, MessageReactionRemoveEventArgs> _reactionRemoveHandler;
 
 		AsyncEvent<DiscordClient, MessageReactionsClearEventArgs> _reactionClearEvent;
 		AsyncEventHandler<DiscordClient, MessageReactionsClearEventArgs> _reactionClearHandler;
 
 		ConcurrentHashSet<ReactionCollectRequest> _requests;
 
 		/// <summary>
 		/// Creates a new EventWaiter object.
 		/// </summary>
 		/// <param name="client">Your DiscordClient</param>
 		public ReactionCollector(DiscordClient client)
 		{
 			this._client = client;
 			var tinfo = this._client.GetType().GetTypeInfo();
 
 			this._requests = new ConcurrentHashSet<ReactionCollectRequest>();
 
 			// Grabbing all three events from client
 			var handler = tinfo.DeclaredFields.First(x => x.FieldType == typeof(AsyncEvent<DiscordClient, MessageReactionAddEventArgs>));
 
 			this._reactionAddEvent = (AsyncEvent<DiscordClient, MessageReactionAddEventArgs>)handler.GetValue(this._client);
 			this._reactionAddHandler = new AsyncEventHandler<DiscordClient, MessageReactionAddEventArgs>(this.HandleReactionAdd);
 			this._reactionAddEvent.Register(this._reactionAddHandler);
 
 			handler = tinfo.DeclaredFields.First(x => x.FieldType == typeof(AsyncEvent<DiscordClient, MessageReactionRemoveEventArgs>));
 
 			this._reactionRemoveEvent = (AsyncEvent<DiscordClient, MessageReactionRemoveEventArgs>)handler.GetValue(this._client);
 			this._reactionRemoveHandler = new AsyncEventHandler<DiscordClient, MessageReactionRemoveEventArgs>(this.HandleReactionRemove);
 			this._reactionRemoveEvent.Register(this._reactionRemoveHandler);
 
 			handler = tinfo.DeclaredFields.First(x => x.FieldType == typeof(AsyncEvent<DiscordClient, MessageReactionsClearEventArgs>));
 
 			this._reactionClearEvent = (AsyncEvent<DiscordClient, MessageReactionsClearEventArgs>)handler.GetValue(this._client);
 			this._reactionClearHandler = new AsyncEventHandler<DiscordClient, MessageReactionsClearEventArgs>(this.HandleReactionClear);
 			this._reactionClearEvent.Register(this._reactionClearHandler);
 		}
 
 		/// <summary>
 		/// Collects the async.
 		/// </summary>
 		/// <param name="request">The request.</param>
 		/// <returns>A Task.</returns>
-		public async Task<ReadOnlyCollection<Reaction>> CollectAsync(ReactionCollectRequest request)
+		public async Task<List<Reaction>> CollectAsync(ReactionCollectRequest request)
 		{
 			this._requests.Add(request);
-			var result = (ReadOnlyCollection<Reaction>)null;
+			List<Reaction> result;
 
 			try
 			{
 				await request.Tcs.Task.ConfigureAwait(false);
 			}
 			catch (Exception ex)
 			{
 				this._client.Logger.LogError(InteractivityEvents.InteractivityCollectorError, ex, "Exception occurred while collecting reactions");
 			}
 			finally
 			{
-				result = new ReadOnlyCollection<Reaction>(new HashSet<Reaction>(request.Collected).ToList());
+				result = request.Collected.ToList();
 				request.Dispose();
 				this._requests.TryRemove(request);
 			}
 			return result;
 		}
 
 		/// <summary>
 		/// Handles the reaction add.
 		/// </summary>
 		/// <param name="client">The client.</param>
 		/// <param name="eventArgs">The event's arguments.</param>
 		/// <returns>A Task.</returns>
 		private Task HandleReactionAdd(DiscordClient client, MessageReactionAddEventArgs eventArgs)
 		{
 			// foreach request add
 			foreach (var req in this._requests)
 			{
 				if (req.Message.Id == eventArgs.Message.Id)
 				{
 					if (req.Collected.Any(x => x.Emoji == eventArgs.Emoji && x.Users.Any(y => y.Id == eventArgs.User.Id)))
 					{
 						var reaction = req.Collected.First(x => x.Emoji == eventArgs.Emoji && x.Users.Any(y => y.Id == eventArgs.User.Id));
 						req.Collected.TryRemove(reaction);
 						reaction.Users.Add(eventArgs.User);
 						req.Collected.Add(reaction);
 					}
 					else
 					{
 						req.Collected.Add(new Reaction()
 						{
 							Emoji = eventArgs.Emoji,
 							Users = new ConcurrentHashSet<DiscordUser>() { eventArgs.User }
 						});
 					}
 				}
 			}
 			return Task.CompletedTask;
 		}
 
 		/// <summary>
 		/// Handles the reaction remove.
 		/// </summary>
 		/// <param name="client">The client.</param>
 		/// <param name="eventArgs">The event's arguments.</param>
 		/// <returns>A Task.</returns>
 		private Task HandleReactionRemove(DiscordClient client, MessageReactionRemoveEventArgs eventArgs)
 		{
 			// foreach request remove
 			foreach (var req in this._requests)
 			{
 				if (req.Message.Id == eventArgs.Message.Id)
 				{
 					if (req.Collected.Any(x => x.Emoji == eventArgs.Emoji && x.Users.Any(y => y.Id == eventArgs.User.Id)))
 					{
 						var reaction = req.Collected.First(x => x.Emoji == eventArgs.Emoji && x.Users.Any(y => y.Id == eventArgs.User.Id));
 						req.Collected.TryRemove(reaction);
 						reaction.Users.TryRemove(eventArgs.User);
 						if (reaction.Users.Count > 0)
 							req.Collected.Add(reaction);
 					}
 				}
 			}
 			return Task.CompletedTask;
 		}
 
 		/// <summary>
 		/// Handles the reaction clear.
 		/// </summary>
 		/// <param name="client">The client.</param>
 		/// <param name="eventArgs">The event's arguments.</param>
 		/// <returns>A Task.</returns>
 		private Task HandleReactionClear(DiscordClient client, MessageReactionsClearEventArgs eventArgs)
 		{
 			// foreach request add
 			foreach (var req in this._requests)
 			{
 				if (req.Message.Id == eventArgs.Message.Id)
 				{
 					req.Collected.Clear();
 				}
 			}
 			return Task.CompletedTask;
 		}
 
 		~ReactionCollector()
 		{
 			this.Dispose();
 		}
 
 		/// <summary>
 		/// Disposes this EventWaiter
 		/// </summary>
 		public void Dispose()
 		{
 			this._client = null;
 
 			this._reactionAddEvent.Unregister(this._reactionAddHandler);
 			this._reactionRemoveEvent.Unregister(this._reactionRemoveHandler);
 			this._reactionClearEvent.Unregister(this._reactionClearHandler);
 
 			this._reactionAddEvent = null;
 			this._reactionAddHandler = null;
 			this._reactionRemoveEvent = null;
 			this._reactionRemoveHandler = null;
 			this._reactionClearEvent = null;
 			this._reactionClearHandler = null;
 
 			this._requests.Clear();
 			this._requests = null;
 		}
 	}
 
 	/// <summary>
 	/// The reaction collect request.
 	/// </summary>
 	public class ReactionCollectRequest : IDisposable
 	{
 		internal TaskCompletionSource<Reaction> Tcs;
 		internal CancellationTokenSource Ct;
 		internal TimeSpan Timeout;
 		internal DiscordMessage Message;
 		internal ConcurrentHashSet<Reaction> Collected;
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="ReactionCollectRequest"/> class.
 		/// </summary>
 		/// <param name="msg">The msg.</param>
 		/// <param name="timeout">The timeout.</param>
 		public ReactionCollectRequest(DiscordMessage msg, TimeSpan timeout)
 		{
 			this.Message = msg;
 			this.Collected = new ConcurrentHashSet<Reaction>();
 			this.Timeout = timeout;
 			this.Tcs = new TaskCompletionSource<Reaction>();
 			this.Ct = new CancellationTokenSource(this.Timeout);
 			this.Ct.Token.Register(() => this.Tcs.TrySetResult(null));
 		}
 
 		~ReactionCollectRequest()
 		{
 			this.Dispose();
 		}
 
 		/// <summary>
 		/// Disposes the.
 		/// </summary>
 		public void Dispose()
 		{
 			GC.SuppressFinalize(this);
 			this.Ct.Dispose();
 			this.Tcs = null;
 			this.Message = null;
 			this.Collected?.Clear();
 			this.Collected = null;
 		}
 	}
 
 	/// <summary>
 	/// The reaction.
 	/// </summary>
 	public class Reaction
 	{
 		/// <summary>
 		/// Gets the emoji.
 		/// </summary>
 		public DiscordEmoji Emoji { get; internal set; }
 		/// <summary>
 		/// Gets the users.
 		/// </summary>
 		public ConcurrentHashSet<DiscordUser> Users { get; internal set; }
 		/// <summary>
 		/// Gets the total.
 		/// </summary>
 		public int Total => this.Users.Count;
 	}
 }
diff --git a/DisCatSharp.Interactivity/Extensions/MessageExtensions.cs b/DisCatSharp.Interactivity/Extensions/MessageExtensions.cs
index 10370f14f..3832c73cf 100644
--- a/DisCatSharp.Interactivity/Extensions/MessageExtensions.cs
+++ b/DisCatSharp.Interactivity/Extensions/MessageExtensions.cs
@@ -1,244 +1,244 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Threading;
 using System.Threading.Tasks;
 
 using DisCatSharp.Entities;
 using DisCatSharp.EventArgs;
 using DisCatSharp.Interactivity.Enums;
 using DisCatSharp.Interactivity.EventHandling;
 
 namespace DisCatSharp.Interactivity.Extensions
 {
 	/// <summary>
 	/// Interactivity extension methods for <see cref="DisCatSharp.Entities.DiscordMessage"/>.
 	/// </summary>
 	public static class MessageExtensions
 	{
 		/// <summary>
 		/// Waits for the next message that has the same author and channel as this message.
 		/// </summary>
 		/// <param name="message">Original message.</param>
 		/// <param name="timeoutOverride">Overrides the timeout set in <see cref="InteractivityConfiguration.Timeout"/></param>
 		public static Task<InteractivityResult<DiscordMessage>> GetNextMessageAsync(this DiscordMessage message, TimeSpan? timeoutOverride = null)
 			=> message.Channel.GetNextMessageAsync(message.Author, timeoutOverride);
 
 		/// <summary>
 		/// Waits for the next message with the same author and channel as this message, which also satisfies a predicate.
 		/// </summary>
 		/// <param name="message">Original message.</param>
 		/// <param name="predicate">A predicate that should return <see langword="true"/> if a message matches.</param>
 		/// <param name="timeoutOverride">Overrides the timeout set in <see cref="InteractivityConfiguration.Timeout"/></param>
 		public static Task<InteractivityResult<DiscordMessage>> GetNextMessageAsync(this DiscordMessage message, Func<DiscordMessage, bool> predicate, TimeSpan? timeoutOverride = null)
 			=> message.Channel.GetNextMessageAsync(msg => msg.Author.Id == message.Author.Id && message.ChannelId == msg.ChannelId && predicate(msg), timeoutOverride);
 		/// <summary>
 		/// Waits for any button to be pressed on the specified message.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(this DiscordMessage message)
 			=> GetInteractivity(message).WaitForButtonAsync(message);
 
 		/// <summary>
 		/// Waits for any button to be pressed on the specified message.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="timeoutOverride">Overrides the timeout set in <see cref="InteractivityConfiguration.Timeout"/></param>
 		public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(this DiscordMessage message, TimeSpan? timeoutOverride = null)
 			=> GetInteractivity(message).WaitForButtonAsync(message, timeoutOverride);
 		/// <summary>
 		/// Waits for any button to be pressed on the specified message.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="token">A custom cancellation token that can be cancelled at any point.</param>
 		public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(this DiscordMessage message, CancellationToken token)
 			=> GetInteractivity(message).WaitForButtonAsync(message, token);
 		/// <summary>
 		/// Waits for a button with the specified Id to be pressed on the specified message.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="id">The Id of the button to wait for.</param>
 		/// <param name="timeoutOverride">Overrides the timeout set in <see cref="InteractivityConfiguration.Timeout"/></param>
 		public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(this DiscordMessage message, string id, TimeSpan? timeoutOverride = null)
 			=> GetInteractivity(message).WaitForButtonAsync(message, id, timeoutOverride);
 
 		/// <summary>
 		/// Waits for a button with the specified Id to be pressed on the specified message.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="id">The Id of the button to wait for.</param>
 		/// <param name="token">A custom cancellation token that can be cancelled at any point.</param>
 		public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(this DiscordMessage message, string id, CancellationToken token)
 			=> GetInteractivity(message).WaitForButtonAsync(message, id, token);
 
 		/// <summary>
 		/// Waits for any button to be pressed on the specified message by the specified user.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="user">The user to wait for button input from.</param>
 		/// <param name="timeoutOverride">Overrides the timeout set in <see cref="InteractivityConfiguration.Timeout"/></param>
 		public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(this DiscordMessage message, DiscordUser user, TimeSpan? timeoutOverride = null)
 			=> GetInteractivity(message).WaitForButtonAsync(message, user, timeoutOverride);
 
 		/// <summary>
 		/// Waits for any button to be pressed on the specified message by the specified user.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="user">The user to wait for button input from.</param>
 		/// <param name="token">A custom cancellation token that can be cancelled at any point.</param>
 		public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(this DiscordMessage message, DiscordUser user, CancellationToken token)
 			=> GetInteractivity(message).WaitForButtonAsync(message, user, token);
 
 		/// <summary>
 		/// Waits for any button to be interacted with.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="predicate">The predicate to filter interactions by.</param>
 		/// <param name="timeoutOverride">Override the timeout specified in <see cref="InteractivityConfiguration"/></param>
 		public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(this DiscordMessage message, Func<ComponentInteractionCreateEventArgs, bool> predicate, TimeSpan? timeoutOverride = null)
 			=> GetInteractivity(message).WaitForButtonAsync(message, predicate, timeoutOverride);
 
 		/// <summary>
 		/// Waits for any button to be interacted with.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="predicate">The predicate to filter interactions by.</param>
 		/// <param name="token">A token to cancel interactivity with at any time. Pass <see cref="System.Threading.CancellationToken.None"/> to wait indefinitely.</param>
 		public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(this DiscordMessage message, Func<ComponentInteractionCreateEventArgs, bool> predicate, CancellationToken token)
 			=> GetInteractivity(message).WaitForButtonAsync(message, predicate, token);
 
 		/// <summary>
 		/// Waits for any dropdown to be interacted with.
 		/// </summary>
 		/// <param name="message">The message to wait for.</param>
 		/// <param name="predicate">A filter predicate.</param>
 		/// <param name="timeoutOverride">Override the timeout period specified in <see cref="InteractivityConfiguration"/>.</param>
 		/// <exception cref="System.ArgumentException">Thrown when the message doesn't contain any dropdowns</exception>
 		public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForSelectAsync(this DiscordMessage message, Func<ComponentInteractionCreateEventArgs, bool> predicate, TimeSpan? timeoutOverride = null)
 			=> GetInteractivity(message).WaitForSelectAsync(message, predicate, timeoutOverride);
 
 
 		/// <summary>
 		/// Waits for any dropdown to be interacted with.
 		/// </summary>
 		/// <param name="message">The message to wait for.</param>
 		/// <param name="predicate">A filter predicate.</param>
 		/// <param name="token">A token that can be used to cancel interactivity. Pass <see cref="System.Threading.CancellationToken.None"/> to wait indefinitely.</param>
 		/// <exception cref="System.ArgumentException">Thrown when the message doesn't contain any dropdowns</exception>
 		public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForSelectAsync(this DiscordMessage message, Func<ComponentInteractionCreateEventArgs, bool> predicate, CancellationToken token)
 			=> GetInteractivity(message).WaitForSelectAsync(message, predicate, token);
 
 		/// <summary>
 		/// Waits for a dropdown to be interacted with.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="id">The Id of the dropdown to wait for.</param>
 		/// <param name="timeoutOverride">Overrides the timeout set in <see cref="InteractivityConfiguration.Timeout"/></param>
 		public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForSelectAsync(this DiscordMessage message, string id, TimeSpan? timeoutOverride = null)
 			=> GetInteractivity(message).WaitForSelectAsync(message, id, timeoutOverride);
 
 		/// <summary>
 		/// Waits for a dropdown to be interacted with.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="id">The Id of the dropdown to wait for.</param>
 		/// <param name="token">A custom cancellation token that can be cancelled at any point.</param>
 		public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForSelectAsync(this DiscordMessage message, string id, CancellationToken token)
 			=> GetInteractivity(message).WaitForSelectAsync(message, id, token);
 
 		/// <summary>
 		/// Waits for a dropdown to be interacted with by the specified user.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="user">The user to wait for.</param>
 		/// <param name="id">The Id of the dropdown to wait for.</param>
 		/// <param name="timeoutOverride"></param>
 		public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForSelectAsync(this DiscordMessage message, DiscordUser user, string id, TimeSpan? timeoutOverride = null)
 			=> GetInteractivity(message).WaitForSelectAsync(message, user, id, timeoutOverride);
 
 		/// <summary>
 		/// Waits for a dropdown to be interacted with by the specified user.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="user">The user to wait for.</param>
 		/// <param name="id">The Id of the dropdown to wait for.</param>
 		/// <param name="token">A custom cancellation token that can be cancelled at any point.</param>
 		public static Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForSelectAsync(this DiscordMessage message, DiscordUser user, string id, CancellationToken token)
    => GetInteractivity(message).WaitForSelectAsync(message, user, id, token);
 
 		/// <summary>
 		/// Waits for a reaction on this message from a specific user.
 		/// </summary>
 		/// <param name="message">Target message.</param>
 		/// <param name="user">The target user.</param>
 		/// <param name="timeoutOverride">Overrides the timeout set in <see cref="InteractivityConfiguration.Timeout"/></param>
 		/// <exception cref="System.InvalidOperationException">Thrown if interactivity is not enabled for the client associated with the message.</exception>
 		public static Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReactionAsync(this DiscordMessage message, DiscordUser user, TimeSpan? timeoutOverride = null)
 			=> GetInteractivity(message).WaitForReactionAsync(message, user, timeoutOverride);
 
 		/// <summary>
 		/// Waits for a specific reaction on this message from the specified user.
 		/// </summary>
 		/// <param name="message">Target message.</param>
 		/// <param name="user">The target user.</param>
 		/// <param name="emoji">The target emoji.</param>
 		/// <param name="timeoutOverride">Overrides the timeout set in <see cref="InteractivityConfiguration.Timeout"/></param>
 		/// <exception cref="System.InvalidOperationException">Thrown if interactivity is not enabled for the client associated with the message.</exception>
 		public static Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReactionAsync(this DiscordMessage message, DiscordUser user, DiscordEmoji emoji, TimeSpan? timeoutOverride = null)
 			=> GetInteractivity(message).WaitForReactionAsync(e => e.Emoji == emoji, message, user, timeoutOverride);
 
 		/// <summary>
 		/// Collects all reactions on this message within the timeout duration.
 		/// </summary>
 		/// <param name="message">The message to collect reactions from.</param>
 		/// <param name="timeoutOverride">Overrides the timeout set in <see cref="InteractivityConfiguration.Timeout"/></param>
 		/// <exception cref="System.InvalidOperationException">Thrown if interactivity is not enabled for the client associated with the message.</exception>
-		public static Task<ReadOnlyCollection<Reaction>> CollectReactionsAsync(this DiscordMessage message, TimeSpan? timeoutOverride = null)
+		public static Task<IReadOnlyList<Reaction>> CollectReactionsAsync(this DiscordMessage message, TimeSpan? timeoutOverride = null)
 			=> GetInteractivity(message).CollectReactionsAsync(message, timeoutOverride);
 
 
 		/// <summary>
 		/// Begins a poll using this message.
 		/// </summary>
 		/// <param name="message">Target message.</param>
 		/// <param name="emojis">Options for this poll.</param>
 		/// <param name="behaviorOverride">Overrides the action set in <see cref="InteractivityConfiguration.PaginationBehaviour"/></param>
 		/// <param name="timeoutOverride">Overrides the timeout set in <see cref="InteractivityConfiguration.Timeout"/></param>
 		/// <exception cref="System.InvalidOperationException">Thrown if interactivity is not enabled for the client associated with the message.</exception>
-		public static Task<ReadOnlyCollection<PollEmoji>> DoPollAsync(this DiscordMessage message, IEnumerable<DiscordEmoji> emojis, PollBehaviour? behaviorOverride = null, TimeSpan? timeoutOverride = null)
+		public static Task<IReadOnlyList<PollEmoji>> DoPollAsync(this DiscordMessage message, IEnumerable<DiscordEmoji> emojis, PollBehaviour? behaviorOverride = null, TimeSpan? timeoutOverride = null)
 			=> GetInteractivity(message).DoPollAsync(message, emojis, behaviorOverride, timeoutOverride);
 
 		/// <summary>
 		/// Retrieves an interactivity instance from a message instance.
 		/// </summary>
 		internal static InteractivityExtension GetInteractivity(DiscordMessage message)
 		{
 			var client = (DiscordClient)message.Discord;
 			var interactivity = client.GetInteractivity();
 
 			return interactivity ?? throw new InvalidOperationException($"Interactivity is not enabled for this {(client.IsShard ? "shard" : "client")}.");
 		}
 	}
 }
diff --git a/DisCatSharp.Interactivity/InteractivityExtension.cs b/DisCatSharp.Interactivity/InteractivityExtension.cs
index 41151efd0..815f30aa8 100644
--- a/DisCatSharp.Interactivity/InteractivityExtension.cs
+++ b/DisCatSharp.Interactivity/InteractivityExtension.cs
@@ -1,959 +1,959 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
 using DisCatSharp.Common.Utilities;
 using DisCatSharp.Entities;
 using DisCatSharp.Enums;
 using DisCatSharp.EventArgs;
 using DisCatSharp.Interactivity.Enums;
 using DisCatSharp.Interactivity.EventHandling;
 
 namespace DisCatSharp.Interactivity
 {
 	/// <summary>
 	/// Extension class for DisCatSharp.Interactivity
 	/// </summary>
 	public class InteractivityExtension : BaseExtension
 	{
 
 		/// <summary>
 		/// Gets the config.
 		/// </summary>
 		internal InteractivityConfiguration Config { get; }
 
 		private EventWaiter<MessageCreateEventArgs> _messageCreatedWaiter;
 
 		private EventWaiter<MessageReactionAddEventArgs> _messageReactionAddWaiter;
 
 		private EventWaiter<TypingStartEventArgs> _typingStartWaiter;
 
 		private EventWaiter<ComponentInteractionCreateEventArgs> _modalInteractionWaiter;
 
 		private EventWaiter<ComponentInteractionCreateEventArgs> _componentInteractionWaiter;
 
 		private ComponentEventWaiter _componentEventWaiter;
 
 		private ModalEventWaiter _modalEventWaiter;
 
 		private ReactionCollector _reactionCollector;
 
 		private Poller _poller;
 
 		private Paginator _paginator;
 		private  ComponentPaginator _compPaginator;
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="InteractivityExtension"/> class.
 		/// </summary>
 		/// <param name="cfg">The configuration.</param>
 		internal InteractivityExtension(InteractivityConfiguration cfg)
 		{
 			this.Config = new InteractivityConfiguration(cfg);
 		}
 
 		/// <summary>
 		/// Setups the Interactivity Extension.
 		/// </summary>
 		/// <param name="client">Discord client.</param>
 		protected internal override void Setup(DiscordClient client)
 		{
 			this.Client = client;
 			this._messageCreatedWaiter = new EventWaiter<MessageCreateEventArgs>(this.Client);
 			this._messageReactionAddWaiter = new EventWaiter<MessageReactionAddEventArgs>(this.Client);
 			this._componentInteractionWaiter = new EventWaiter<ComponentInteractionCreateEventArgs>(this.Client);
 			this._modalInteractionWaiter = new EventWaiter<ComponentInteractionCreateEventArgs>(this.Client);
 			this._typingStartWaiter = new EventWaiter<TypingStartEventArgs>(this.Client);
 			this._poller = new Poller(this.Client);
 			this._reactionCollector = new ReactionCollector(this.Client);
 			this._paginator = new Paginator(this.Client);
 			this._compPaginator = new ComponentPaginator(this.Client, this.Config);
 			this._componentEventWaiter = new ComponentEventWaiter(this.Client, this.Config);
 			this._modalEventWaiter = new ModalEventWaiter(this.Client, this.Config);
 
 		}
 
 		/// <summary>
 		/// Makes a poll and returns poll results.
 		/// </summary>
 		/// <param name="m">Message to create poll on.</param>
 		/// <param name="emojis">Emojis to use for this poll.</param>
 		/// <param name="behaviour">What to do when the poll ends.</param>
 		/// <param name="timeout">Override timeout period.</param>
 		/// <returns></returns>
-		public async Task<ReadOnlyCollection<PollEmoji>> DoPollAsync(DiscordMessage m, IEnumerable<DiscordEmoji> emojis, PollBehaviour? behaviour = default, TimeSpan? timeout = null)
+		public async Task<IReadOnlyList<PollEmoji>> DoPollAsync(DiscordMessage m, IEnumerable<DiscordEmoji> emojis, PollBehaviour? behaviour = default, TimeSpan? timeout = null)
 		{
 			if (!Utilities.HasReactionIntents(this.Client.Configuration.Intents))
 				throw new InvalidOperationException("No reaction intents are enabled.");
 
 			if (!emojis.Any())
 				throw new ArgumentException("You need to provide at least one emoji for a poll!");
 
 			foreach (var em in emojis)
 				await m.CreateReactionAsync(em).ConfigureAwait(false);
 
 			var res = await this._poller.DoPollAsync(new PollRequest(m, timeout ?? this.Config.Timeout, emojis)).ConfigureAwait(false);
 
 			var pollBehaviour = behaviour ?? this.Config.PollBehaviour;
 			var thisMember = await m.Channel.Guild.GetMemberAsync(this.Client.CurrentUser.Id).ConfigureAwait(false);
 
 			if (pollBehaviour == PollBehaviour.DeleteEmojis && m.Channel.PermissionsFor(thisMember).HasPermission(Permissions.ManageMessages))
 				await m.DeleteAllReactionsAsync().ConfigureAwait(false);
 
-			return new ReadOnlyCollection<PollEmoji>(res.ToList());
+			return res;
 		}
 
 		/// <summary>
 		/// Waits for any button in the specified collection to be pressed.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="buttons">A collection of buttons to listen for.</param>
 		/// <param name="timeoutOverride">Override the timeout period in <see cref="InteractivityConfiguration"/>.</param>
 		/// <returns>A <see cref="InteractivityResult{T}"/> with the result of button that was pressed, if any.</returns>
 		/// <exception cref="System.InvalidOperationException">Thrown when attempting to wait for a message that is not authored by the current user.</exception>
 		/// <exception cref="System.ArgumentException">Thrown when the message does not contain a button with the specified Id, or any buttons at all.</exception>
 		public Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(DiscordMessage message, IEnumerable<DiscordButtonComponent> buttons, TimeSpan? timeoutOverride = null)
 			=> this.WaitForButtonAsync(message, buttons, this.GetCancellationToken(timeoutOverride));
 
 		/// <summary>
 		/// Waits for any button in the specified collection to be pressed.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="buttons">A collection of buttons to listen for.</param>
 		/// <param name="token">A custom cancellation token that can be cancelled at any point.</param>
 		/// <returns>A <see cref="InteractivityResult{T}"/> with the result of button that was pressed, if any.</returns>
 		/// <exception cref="System.InvalidOperationException">Thrown when attempting to wait for a message that is not authored by the current user.</exception>
 		/// <exception cref="System.ArgumentException">Thrown when the message does not contain a button with the specified Id, or any buttons at all.</exception>
 		public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(DiscordMessage message, IEnumerable<DiscordButtonComponent> buttons, CancellationToken token)
 		{
 			if (message.Author != this.Client.CurrentUser)
 				throw new InvalidOperationException("Interaction events are only sent to the application that created them.");
 
 			if (!buttons.Any())
 				throw new ArgumentException("You must specify at least one button to listen for.");
 
 			if (!message.Components.Any())
 				throw new ArgumentException("Provided message does not contain any components.");
 
 			if (!message.Components.SelectMany(c => c.Components).Any(c => c.Type is ComponentType.Button))
 				throw new ArgumentException("Provided Message does not contain any button components.");
 
 			var res = await this._componentEventWaiter
 				.WaitForMatchAsync(new ComponentMatchRequest(message,
 					c =>
 						c.Interaction.Data.ComponentType == ComponentType.Button &&
 						buttons.Any(b => b.CustomId == c.Id), token)).ConfigureAwait(false);
 
 			return new InteractivityResult<ComponentInteractionCreateEventArgs>(res is null, res);
 		}
 
 		/// <summary>
 		/// Waits for a user modal submit.
 		/// </summary>
 		/// <param name="customId">The custom id of the modal to wait for.</param>
 		/// <param name="timeoutOverride">Override the timeout period specified in <see cref="InteractivityConfiguration"/>.</param>
 		/// <returns>A <see cref="InteractivityResult{T}"/> with the result of the modal.</returns>
 		public Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForModalAsync(string customId, TimeSpan? timeoutOverride = null)
 			=> this.WaitForModalAsync(customId, this.GetCancellationToken(timeoutOverride));
 
 		/// <summary>
 		/// Waits for a user modal submit.
 		/// </summary>
 		/// <param name="customId">The custom id of the modal to wait for.</param>
 		/// <param name="token">A custom cancellation token that can be cancelled at any point.</param>
 		/// <returns>A <see cref="InteractivityResult{T}"/> with the result of the modal.</returns>
 		public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForModalAsync(string customId, CancellationToken token)
 		{
 			var result =
 				await this
 				._modalEventWaiter
 				.WaitForModalMatchAsync(new ModalMatchRequest(customId, c => c.Interaction.Type == InteractionType.ModalSubmit, token))
 				.ConfigureAwait(false);
 
 			return new InteractivityResult<ComponentInteractionCreateEventArgs>(result is null, result);
 		}
 
 		/// <summary>
 		/// Waits for any button on the specified message to be pressed.
 		/// </summary>
 		/// <param name="message">The message to wait for the button on.</param>
 		/// <param name="timeoutOverride">Override the timeout period specified in <see cref="InteractivityConfiguration"/>.</param>
 		/// <returns>A <see cref="InteractivityResult{T}"/> with the result of button that was pressed, if any.</returns>
 		/// <exception cref="System.InvalidOperationException">Thrown when attempting to wait for a message that is not authored by the current user.</exception>
 		/// <exception cref="System.ArgumentException">Thrown when the message does not contain a button with the specified Id, or any buttons at all.</exception>
 		public Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(DiscordMessage message, TimeSpan? timeoutOverride = null)
 			=> this.WaitForButtonAsync(message, this.GetCancellationToken(timeoutOverride));
 
 		/// <summary>
 		/// Waits for any button on the specified message to be pressed.
 		/// </summary>
 		/// <param name="message">The message to wait for the button on.</param>
 		/// <param name="token">A custom cancellation token that can be cancelled at any point.</param>
 		/// <returns>A <see cref="InteractivityResult{T}"/> with the result of button that was pressed, if any.</returns>
 		/// <exception cref="System.InvalidOperationException">Thrown when attempting to wait for a message that is not authored by the current user.</exception>
 		/// <exception cref="System.ArgumentException">Thrown when the message does not contain a button with the specified Id, or any buttons at all.</exception>
 		public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(DiscordMessage message, CancellationToken token)
 		{
 			if (message.Author != this.Client.CurrentUser)
 				throw new InvalidOperationException("Interaction events are only sent to the application that created them.");
 
 			if (!message.Components.Any())
 				throw new ArgumentException("Provided message does not contain any components.");
 
 			if (!message.Components.SelectMany(c => c.Components).Any(c => c.Type is ComponentType.Button))
 				throw new ArgumentException("Message does not contain any button components.");
 
 			var ids = message.Components.SelectMany(m => m.Components).Select(c => c.CustomId);
 
 			var result =
 				await this
 				._componentEventWaiter
 				.WaitForMatchAsync(new ComponentMatchRequest(message, c => c.Interaction.Data.ComponentType == ComponentType.Button && ids.Contains(c.Id), token))
 				.ConfigureAwait(false);
 
 			return new InteractivityResult<ComponentInteractionCreateEventArgs>(result is null, result);
 		}
 
 		/// <summary>
 		/// Waits for any button on the specified message to be pressed by the specified user.
 		/// </summary>
 		/// <param name="message">The message to wait for the button on.</param>
 		/// <param name="user">The user to wait for the button press from.</param>
 		/// <param name="timeoutOverride">Override the timeout period specified in <see cref="InteractivityConfiguration"/>.</param>
 		/// <returns>A <see cref="InteractivityResult{T}"/> with the result of button that was pressed, if any.</returns>
 		/// <exception cref="System.InvalidOperationException">Thrown when attempting to wait for a message that is not authored by the current user.</exception>
 		/// <exception cref="System.ArgumentException">Thrown when the message does not contain a button with the specified Id, or any buttons at all.</exception>
 		public Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(DiscordMessage message, DiscordUser user, TimeSpan? timeoutOverride = null)
 			=> this.WaitForButtonAsync(message, user, this.GetCancellationToken(timeoutOverride));
 
 		/// <summary>
 		/// Waits for any button on the specified message to be pressed by the specified user.
 		/// </summary>
 		/// <param name="message">The message to wait for the button on.</param>
 		/// <param name="user">The user to wait for the button press from.</param>
 		/// <param name="token">A custom cancellation token that can be cancelled at any point.</param>
 		/// <returns>A <see cref="InteractivityResult{T}"/> with the result of button that was pressed, if any.</returns>
 		/// <exception cref="System.InvalidOperationException">Thrown when attempting to wait for a message that is not authored by the current user.</exception>
 		/// <exception cref="System.ArgumentException">Thrown when the message does not contain a button with the specified Id, or any buttons at all.</exception>
 		public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(DiscordMessage message, DiscordUser user, CancellationToken token)
 		{
 			if (message.Author != this.Client.CurrentUser)
 				throw new InvalidOperationException("Interaction events are only sent to the application that created them.");
 
 			if (!message.Components.Any())
 				throw new ArgumentException("Provided message does not contain any components.");
 
 			if (!message.Components.SelectMany(c => c.Components).Any(c => c.Type is ComponentType.Button))
 				throw new ArgumentException("Message does not contain any button components.");
 
 			var result = await this
 				._componentEventWaiter
 				.WaitForMatchAsync(new ComponentMatchRequest(message, (c) => c.Interaction.Data.ComponentType is ComponentType.Button && c.User == user, token))
 				.ConfigureAwait(false);
 
 			return new InteractivityResult<ComponentInteractionCreateEventArgs>(result is null, result);
 
 		}
 
 		/// <summary>
 		/// Waits for a button with the specified Id to be pressed.
 		/// </summary>
 		/// <param name="message">The message to wait for the button on.</param>
 		/// <param name="id">The Id of the button to wait for.</param>
 		/// <param name="timeoutOverride">Override the timeout period specified in <see cref="InteractivityConfiguration"/>.</param>
 		/// <returns>A <see cref="InteractivityResult{T}"/> with the result of the operation.</returns>
 		/// <exception cref="System.InvalidOperationException">Thrown when attempting to wait for a message that is not authored by the current user.</exception>
 		/// <exception cref="System.ArgumentException">Thrown when the message does not contain a button with the specified Id, or any buttons at all.</exception>
 		public Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(DiscordMessage message, string id, TimeSpan? timeoutOverride = null)
 			=> this.WaitForButtonAsync(message, id, this.GetCancellationToken(timeoutOverride));
 
 		/// <summary>
 		/// Waits for a button with the specified Id to be pressed.
 		/// </summary>
 		/// <param name="message">The message to wait for the button on.</param>
 		/// <param name="id">The Id of the button to wait for.</param>
 		/// <param name="token">Override the timeout period specified in <see cref="InteractivityConfiguration"/>.</param>
 		/// <returns>A <see cref="InteractivityResult{T}"/> with the result of the operation.</returns>
 		/// <exception cref="System.InvalidOperationException">Thrown when attempting to wait for a message that is not authored by the current user.</exception>
 		/// <exception cref="System.ArgumentException">Thrown when the message does not contain a button with the specified Id, or any buttons at all.</exception>
 		public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(DiscordMessage message, string id, CancellationToken token)
 		{
 			if (message.Author != this.Client.CurrentUser)
 				throw new InvalidOperationException("Interaction events are only sent to the application that created them.");
 
 			if (!message.Components.Any())
 				throw new ArgumentException("Provided message does not contain any components.");
 
 			if (!message.Components.SelectMany(c => c.Components).Any(c => c.Type is ComponentType.Button))
 				throw new ArgumentException("Message does not contain any button components.");
 
 			if (!message.Components.SelectMany(c => c.Components).OfType<DiscordButtonComponent>().Any(c => c.CustomId == id))
 				throw new ArgumentException($"Message does not contain button with Id of '{id}'.");
 			var result = await this
 				._componentEventWaiter
 				.WaitForMatchAsync(new ComponentMatchRequest(message, (c) => c.Interaction.Data.ComponentType is ComponentType.Button && c.Id == id, token))
 				.ConfigureAwait(false);
 
 			return new InteractivityResult<ComponentInteractionCreateEventArgs>(result is null, result);
 		}
 
 		/// <summary>
 		/// Waits for any button to be interacted with.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="predicate">The predicate to filter interactions by.</param>
 		/// <param name="timeoutOverride">Override the timeout specified in <see cref="InteractivityConfiguration"/></param>
 		public Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(DiscordMessage message, Func<ComponentInteractionCreateEventArgs, bool> predicate, TimeSpan? timeoutOverride = null)
 			=> this.WaitForButtonAsync(message, predicate, this.GetCancellationToken(timeoutOverride));
 
 		/// <summary>
 		/// Waits for any button to be interacted with.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="predicate">The predicate to filter interactions by.</param>
 		/// <param name="token">A token to cancel interactivity with at any time. Pass <see cref="System.Threading.CancellationToken.None"/> to wait indefinitely.</param>
 		public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForButtonAsync(DiscordMessage message, Func<ComponentInteractionCreateEventArgs, bool> predicate, CancellationToken token)
 		{
 			if (message.Author != this.Client.CurrentUser)
 				throw new InvalidOperationException("Interaction events are only sent to the application that created them.");
 
 			if (!message.Components.Any())
 				throw new ArgumentException("Provided message does not contain any components.");
 
 			if (!message.Components.SelectMany(c => c.Components).Any(c => c.Type is ComponentType.Button))
 				throw new ArgumentException("Message does not contain any button components.");
 
 			var result = await this
 				._componentEventWaiter
 				.WaitForMatchAsync(new ComponentMatchRequest(message, c => c.Interaction.Data.ComponentType is ComponentType.Button && predicate(c), token))
 				.ConfigureAwait(false);
 
 			return new InteractivityResult<ComponentInteractionCreateEventArgs>(result is null, result);
 		}
 
 
 		/// <summary>
 		/// Waits for any dropdown to be interacted with.
 		/// </summary>
 		/// <param name="message">The message to wait for.</param>
 		/// <param name="predicate">A filter predicate.</param>
 		/// <param name="timeoutOverride">Override the timeout period specified in <see cref="InteractivityConfiguration"/>.</param>
 		/// <exception cref="System.ArgumentException">Thrown when the Provided message does not contain any dropdowns</exception>
 		public Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForSelectAsync(DiscordMessage message, Func<ComponentInteractionCreateEventArgs, bool> predicate, TimeSpan? timeoutOverride = null)
 			=> this.WaitForSelectAsync(message, predicate, this.GetCancellationToken(timeoutOverride));
 
 		/// <summary>
 		/// Waits for any dropdown to be interacted with.
 		/// </summary>
 		/// <param name="message">The message to wait for.</param>
 		/// <param name="predicate">A filter predicate.</param>
 		/// <param name="token">A token that can be used to cancel interactivity. Pass <see cref="System.Threading.CancellationToken.None"/> to wait indefinitely.</param>
 		/// <exception cref="System.ArgumentException">Thrown when the Provided message does not contain any dropdowns</exception>
 		public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForSelectAsync(DiscordMessage message, Func<ComponentInteractionCreateEventArgs, bool> predicate, CancellationToken token)
 		{
 			if (message.Author != this.Client.CurrentUser)
 				throw new InvalidOperationException("Interaction events are only sent to the application that created them.");
 
 			if (!message.Components.Any())
 				throw new ArgumentException("Provided message does not contain any components.");
 
 			if (!message.Components.SelectMany(c => c.Components).Any(c => c.Type is ComponentType.Select))
 				throw new ArgumentException("Message does not contain any select components.");
 
 			var result = await this
 				._componentEventWaiter
 				.WaitForMatchAsync(new ComponentMatchRequest(message, c => c.Interaction.Data.ComponentType is ComponentType.Select && predicate(c), token))
 				.ConfigureAwait(false);
 
 			return new InteractivityResult<ComponentInteractionCreateEventArgs>(result is null, result);
 		}
 
 		/// <summary>
 		/// Waits for a dropdown to be interacted with.
 		/// </summary>
 		/// <remarks>This is here for backwards-compatibility and will internally create a cancellation token.</remarks>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="id">The Id of the dropdown to wait on.</param>
 		/// <param name="timeoutOverride">Override the timeout period specified in <see cref="InteractivityConfiguration"/>.</param>
 		/// <exception cref="System.ArgumentException">Thrown when the message does not have any dropdowns or any dropdown with the specified Id.</exception>
 		public Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForSelectAsync(DiscordMessage message, string id, TimeSpan? timeoutOverride = null)
 			=> this.WaitForSelectAsync(message, id, this.GetCancellationToken(timeoutOverride));
 
 		/// <summary>
 		/// Waits for a dropdown to be interacted with.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="id">The Id of the dropdown to wait on.</param>
 		/// <param name="token">A custom cancellation token that can be cancelled at any point.</param>
 		/// <exception cref="System.ArgumentException">Thrown when the message does not have any dropdowns or any dropdown with the specified Id.</exception>
 		public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForSelectAsync(DiscordMessage message, string id, CancellationToken token)
 		{
 			if (message.Author != this.Client.CurrentUser)
 				throw new InvalidOperationException("Interaction events are only sent to the application that created them.");
 
 			if (!message.Components.Any())
 				throw new ArgumentException("Provided message does not contain any components.");
 
 			if (!message.Components.SelectMany(c => c.Components).Any(c => c.Type is ComponentType.Select))
 				throw new ArgumentException("Message does not contain any select components.");
 
 			if (message.Components.SelectMany(c => c.Components).OfType<DiscordSelectComponent>().All(c => c.CustomId != id))
 				throw new ArgumentException($"Message does not contain select component with Id of '{id}'.");
 
 			var result = await this
 				._componentEventWaiter
 				.WaitForMatchAsync(new ComponentMatchRequest(message, (c) => c.Interaction.Data.ComponentType is ComponentType.Select && c.Id == id, token))
 				.ConfigureAwait(false);
 
 			return new InteractivityResult<ComponentInteractionCreateEventArgs>(result is null, result);
 		}
 
 		/// <summary>
 		/// Waits for a dropdown to be interacted with by a specific user.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="user">The user to wait on.</param>
 		/// <param name="id">The Id of the dropdown to wait on.</param>
 		/// <param name="timeoutOverride">Override the timeout period specified in <see cref="InteractivityConfiguration"/>.</param>
 		/// <exception cref="System.ArgumentException">Thrown when the message does not have any dropdowns or any dropdown with the specified Id.</exception>
 		public Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForSelectAsync(DiscordMessage message, DiscordUser user, string id, TimeSpan? timeoutOverride = null)
 			=> this.WaitForSelectAsync(message, user, id, this.GetCancellationToken(timeoutOverride));
 
 		/// <summary>
 		/// Waits for a dropdown to be interacted with by a specific user.
 		/// </summary>
 		/// <param name="message">The message to wait on.</param>
 		/// <param name="user">The user to wait on.</param>
 		/// <param name="id">The Id of the dropdown to wait on.</param>
 		/// <param name="token">A custom cancellation token that can be cancelled at any point.</param>
 		/// <exception cref="System.ArgumentException">Thrown when the message does not have any dropdowns or any dropdown with the specified Id.</exception>
 		public async Task<InteractivityResult<ComponentInteractionCreateEventArgs>> WaitForSelectAsync(DiscordMessage message, DiscordUser user, string id, CancellationToken token)
 		{
 			if (message.Author != this.Client.CurrentUser)
 				throw new InvalidOperationException("Interaction events are only sent to the application that created them.");
 
 			if (!message.Components.Any())
 				throw new ArgumentException("Provided message does not contain any components.");
 
 			if (!message.Components.SelectMany(c => c.Components).Any(c => c.Type is ComponentType.Select))
 				throw new ArgumentException("Message does not contain any select components.");
 
 			if (message.Components.SelectMany(c => c.Components).OfType<DiscordSelectComponent>().All(c => c.CustomId != id))
 				throw new ArgumentException($"Message does not contain select with Id of '{id}'.");
 
 			var result = await this
 				._componentEventWaiter
 				.WaitForMatchAsync(new ComponentMatchRequest(message, (c) => c.Id == id && c.User == user, token)).ConfigureAwait(false);
 
 			return new InteractivityResult<ComponentInteractionCreateEventArgs>(result is null, result);
 		}
 
 
 		/// <summary>
 		/// Waits for a specific message.
 		/// </summary>
 		/// <param name="predicate">Predicate to match.</param>
 		/// <param name="timeoutOverride">Override timeout period.</param>
 		public async Task<InteractivityResult<DiscordMessage>> WaitForMessageAsync(Func<DiscordMessage, bool> predicate,
 			TimeSpan? timeoutOverride = null)
 		{
 			if (!Utilities.HasMessageIntents(this.Client.Configuration.Intents))
 				throw new InvalidOperationException("No message intents are enabled.");
 
 			var timeout = timeoutOverride ?? this.Config.Timeout;
 			var returns = await this._messageCreatedWaiter.WaitForMatchAsync(new MatchRequest<MessageCreateEventArgs>(x => predicate(x.Message), timeout)).ConfigureAwait(false);
 
 			return new InteractivityResult<DiscordMessage>(returns == null, returns?.Message);
 		}
 
 		/// <summary>
 		/// Wait for a specific reaction.
 		/// </summary>
 		/// <param name="predicate">Predicate to match.</param>
 		/// <param name="timeoutOverride">Override timeout period.</param>
 		public async Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReactionAsync(Func<MessageReactionAddEventArgs, bool> predicate,
 			TimeSpan? timeoutOverride = null)
 		{
 			if (!Utilities.HasReactionIntents(this.Client.Configuration.Intents))
 				throw new InvalidOperationException("No reaction intents are enabled.");
 
 			var timeout = timeoutOverride ?? this.Config.Timeout;
 			var returns = await this._messageReactionAddWaiter.WaitForMatchAsync(new MatchRequest<MessageReactionAddEventArgs>(predicate, timeout)).ConfigureAwait(false);
 
 			return new InteractivityResult<MessageReactionAddEventArgs>(returns == null, returns);
 		}
 
 		/// <summary>
 		/// Wait for a specific reaction.
 		/// For this Event you need the <see cref="DiscordIntents.GuildMessageReactions"/> intent specified in <seealso cref="DiscordConfiguration.Intents"/>
 		/// </summary>
 		/// <param name="message">Message reaction was added to.</param>
 		/// <param name="user">User that made the reaction.</param>
 		/// <param name="timeoutOverride">Override timeout period.</param>
 		public async Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReactionAsync(DiscordMessage message, DiscordUser user,
 			TimeSpan? timeoutOverride = null)
 			=> await this.WaitForReactionAsync(x => x.User.Id == user.Id && x.Message.Id == message.Id, timeoutOverride).ConfigureAwait(false);
 
 		/// <summary>
 		/// Waits for a specific reaction.
 		/// For this Event you need the <see cref="DiscordIntents.GuildMessageReactions"/> intent specified in <seealso cref="DiscordConfiguration.Intents"/>
 		/// </summary>
 		/// <param name="predicate">Predicate to match.</param>
 		/// <param name="message">Message reaction was added to.</param>
 		/// <param name="user">User that made the reaction.</param>
 		/// <param name="timeoutOverride">Override timeout period.</param>
 		public async Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReactionAsync(Func<MessageReactionAddEventArgs, bool> predicate,
 			DiscordMessage message, DiscordUser user, TimeSpan? timeoutOverride = null)
 			=> await this.WaitForReactionAsync(x => predicate(x) && x.User.Id == user.Id && x.Message.Id == message.Id, timeoutOverride).ConfigureAwait(false);
 
 		/// <summary>
 		/// Waits for a specific reaction.
 		/// For this Event you need the <see cref="DiscordIntents.GuildMessageReactions"/> intent specified in <seealso cref="DiscordConfiguration.Intents"/>
 		/// </summary>
 		/// <param name="predicate">predicate to match.</param>
 		/// <param name="user">User that made the reaction.</param>
 		/// <param name="timeoutOverride">Override timeout period.</param>
 		public async Task<InteractivityResult<MessageReactionAddEventArgs>> WaitForReactionAsync(Func<MessageReactionAddEventArgs, bool> predicate,
 			DiscordUser user, TimeSpan? timeoutOverride = null)
 			=> await this.WaitForReactionAsync(x => predicate(x) && x.User.Id == user.Id, timeoutOverride).ConfigureAwait(false);
 
 		/// <summary>
 		/// Waits for a user to start typing.
 		/// </summary>
 		/// <param name="user">User that starts typing.</param>
 		/// <param name="channel">Channel the user is typing in.</param>
 		/// <param name="timeoutOverride">Override timeout period.</param>
 		public async Task<InteractivityResult<TypingStartEventArgs>> WaitForUserTypingAsync(DiscordUser user,
 			DiscordChannel channel, TimeSpan? timeoutOverride = null)
 		{
 			if (!Utilities.HasTypingIntents(this.Client.Configuration.Intents))
 				throw new InvalidOperationException("No typing intents are enabled.");
 
 			var timeout = timeoutOverride ?? this.Config.Timeout;
 			var returns = await this._typingStartWaiter.WaitForMatchAsync(
 				new MatchRequest<TypingStartEventArgs>(x => x.User.Id == user.Id && x.Channel.Id == channel.Id, timeout))
 				.ConfigureAwait(false);
 
 			return new InteractivityResult<TypingStartEventArgs>(returns == null, returns);
 		}
 
 		/// <summary>
 		/// Waits for a user to start typing.
 		/// </summary>
 		/// <param name="user">User that starts typing.</param>
 		/// <param name="timeoutOverride">Override timeout period.</param>
 		public async Task<InteractivityResult<TypingStartEventArgs>> WaitForUserTypingAsync(DiscordUser user, TimeSpan? timeoutOverride = null)
 		{
 			if (!Utilities.HasTypingIntents(this.Client.Configuration.Intents))
 				throw new InvalidOperationException("No typing intents are enabled.");
 
 			var timeout = timeoutOverride ?? this.Config.Timeout;
 			var returns = await this._typingStartWaiter.WaitForMatchAsync(
 				new MatchRequest<TypingStartEventArgs>(x => x.User.Id == user.Id, timeout))
 				.ConfigureAwait(false);
 
 			return new InteractivityResult<TypingStartEventArgs>(returns == null, returns);
 		}
 
 		/// <summary>
 		/// Waits for any user to start typing.
 		/// </summary>
 		/// <param name="channel">Channel to type in.</param>
 		/// <param name="timeoutOverride">Override timeout period.</param>
 		public async Task<InteractivityResult<TypingStartEventArgs>> WaitForTypingAsync(DiscordChannel channel, TimeSpan? timeoutOverride = null)
 		{
 			if (!Utilities.HasTypingIntents(this.Client.Configuration.Intents))
 				throw new InvalidOperationException("No typing intents are enabled.");
 
 			var timeout = timeoutOverride ?? this.Config.Timeout;
 			var returns = await this._typingStartWaiter.WaitForMatchAsync(
 				new MatchRequest<TypingStartEventArgs>(x => x.Channel.Id == channel.Id, timeout))
 				.ConfigureAwait(false);
 
 			return new InteractivityResult<TypingStartEventArgs>(returns == null, returns);
 		}
 
 		/// <summary>
 		/// Collects reactions on a specific message.
 		/// </summary>
 		/// <param name="m">Message to collect reactions on.</param>
 		/// <param name="timeoutOverride">Override timeout period.</param>
-		public async Task<ReadOnlyCollection<Reaction>> CollectReactionsAsync(DiscordMessage m, TimeSpan? timeoutOverride = null)
+		public async Task<IReadOnlyList<Reaction>> CollectReactionsAsync(DiscordMessage m, TimeSpan? timeoutOverride = null)
 		{
 			if (!Utilities.HasReactionIntents(this.Client.Configuration.Intents))
 				throw new InvalidOperationException("No reaction intents are enabled.");
 
 			var timeout = timeoutOverride ?? this.Config.Timeout;
 			var collection = await this._reactionCollector.CollectAsync(new ReactionCollectRequest(m, timeout)).ConfigureAwait(false);
 
 			return collection;
 		}
 
 		/// <summary>
 		/// Waits for specific event args to be received. Make sure the appropriate <see cref="DiscordIntents"/> are registered, if needed.
 		/// </summary>
 		/// <typeparam name="T"></typeparam>
 		/// <param name="predicate">The predicate.</param>
 		/// <param name="timeoutOverride">Override timeout period.</param>
 		public async Task<InteractivityResult<T>> WaitForEventArgsAsync<T>(Func<T, bool> predicate, TimeSpan? timeoutOverride = null) where T : AsyncEventArgs
 		{
 			var timeout = timeoutOverride ?? this.Config.Timeout;
 
 			using var waiter = new EventWaiter<T>(this.Client);
 			var res = await waiter.WaitForMatchAsync(new MatchRequest<T>(predicate, timeout)).ConfigureAwait(false);
 			return new InteractivityResult<T>(res == null, res);
 		}
 
 		/// <summary>
 		/// Collects the event arguments.
 		/// </summary>
 		/// <param name="predicate">The predicate.</param>
 		/// <param name="timeoutOverride">Override timeout period.</param>
-		public async Task<ReadOnlyCollection<T>> CollectEventArgsAsync<T>(Func<T, bool> predicate, TimeSpan? timeoutOverride = null) where T : AsyncEventArgs
+		public async Task<IReadOnlyList<T>> CollectEventArgsAsync<T>(Func<T, bool> predicate, TimeSpan? timeoutOverride = null) where T : AsyncEventArgs
 		{
 			var timeout = timeoutOverride ?? this.Config.Timeout;
 
 			using var waiter = new EventWaiter<T>(this.Client);
 			var res = await waiter.CollectMatchesAsync(new CollectRequest<T>(predicate, timeout)).ConfigureAwait(false);
 			return res;
 		}
 
 		/// <summary>
 		/// Sends a paginated message with buttons.
 		/// </summary>
 		/// <param name="channel">The channel to send it on.</param>
 		/// <param name="user">User to give control.</param>
 		/// <param name="pages">The pages.</param>
 		/// <param name="buttons">Pagination buttons (pass null to use buttons defined in <see cref="InteractivityConfiguration"/>).</param>
 		/// <param name="behaviour">Pagination behaviour.</param>
 		/// <param name="deletion">Deletion behaviour.</param>
 		/// <param name="token">A custom cancellation token that can be cancelled at any point.</param>
 		public async Task SendPaginatedMessageAsync(
 			DiscordChannel channel, DiscordUser user, IEnumerable<Page> pages, PaginationButtons buttons,
 			PaginationBehaviour? behaviour = default, ButtonPaginationBehavior? deletion = default, CancellationToken token = default)
 		{
 			var bhv = behaviour ?? this.Config.PaginationBehaviour;
 			var del = deletion ?? this.Config.ButtonBehavior;
 			var bts = buttons ?? this.Config.PaginationButtons;
 
 			bts = new PaginationButtons(bts);
 			if (bhv is PaginationBehaviour.Ignore)
 			{
 				bts.SkipLeft.Disable();
 				bts.Left.Disable();
 			}
 
 			var builder = new DiscordMessageBuilder()
 				.WithContent(pages.First().Content)
 				.WithEmbed(pages.First().Embed)
 				.AddComponents(bts.ButtonArray);
 
 			var message = await builder.SendAsync(channel).ConfigureAwait(false);
 
 			var req = new ButtonPaginationRequest(message, user, bhv, del, bts, pages, token == default ? this.GetCancellationToken() : token);
 
 			await this._compPaginator.DoPaginationAsync(req).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Sends a paginated message with buttons.
 		/// </summary>
 		/// <param name="channel">The channel to send it on.</param>
 		/// <param name="user">User to give control.</param>
 		/// <param name="pages">The pages.</param>
 		/// <param name="buttons">Pagination buttons (pass null to use buttons defined in <see cref="InteractivityConfiguration"/>).</param>
 		/// <param name="behaviour">Pagination behaviour.</param>
 		/// <param name="deletion">Deletion behaviour.</param>
 		/// <param name="timeoutOverride">Override timeout period.</param>
 		public Task SendPaginatedMessageAsync(
 			DiscordChannel channel, DiscordUser user, IEnumerable<Page> pages, PaginationButtons buttons, TimeSpan? timeoutOverride,
 			PaginationBehaviour? behaviour = default, ButtonPaginationBehavior? deletion = default)
 			=> this.SendPaginatedMessageAsync(channel, user, pages, buttons, behaviour, deletion, this.GetCancellationToken(timeoutOverride));
 
 		/// <summary>
 		/// Sends the paginated message.
 		/// </summary>
 		/// <param name="channel">The channel.</param>
 		/// <param name="user">The user.</param>
 		/// <param name="pages">The pages.</param>
 		/// <param name="behaviour">The behaviour.</param>
 		/// <param name="deletion">The deletion.</param>
 		/// <param name="token">The token.</param>
 		/// <returns>A Task.</returns>
 		public Task SendPaginatedMessageAsync(DiscordChannel channel, DiscordUser user, IEnumerable<Page> pages, PaginationBehaviour? behaviour = default, ButtonPaginationBehavior? deletion = default, CancellationToken token = default)
 			=> this.SendPaginatedMessageAsync(channel, user, pages, default, behaviour, deletion, token);
 
 		/// <summary>
 		/// Sends the paginated message.
 		/// </summary>
 		/// <param name="channel">The channel.</param>
 		/// <param name="user">The user.</param>
 		/// <param name="pages">The pages.</param>
 		/// <param name="timeoutOverride">Override timeout period.</param>
 		/// <param name="behaviour">The behaviour.</param>
 		/// <param name="deletion">The deletion.</param>
 		/// <returns>A Task.</returns>
 		public Task SendPaginatedMessageAsync(DiscordChannel channel, DiscordUser user, IEnumerable<Page> pages, TimeSpan? timeoutOverride, PaginationBehaviour? behaviour = default, ButtonPaginationBehavior? deletion = default)
 			=> this.SendPaginatedMessageAsync(channel, user, pages, timeoutOverride, behaviour, deletion);
 
 		/// <summary>
 		/// Sends a paginated message.
 		/// For this Event you need the <see cref="DiscordIntents.GuildMessageReactions"/> intent specified in <seealso cref="DiscordConfiguration.Intents"/>
 		/// </summary>
 		/// <param name="channel">Channel to send paginated message in.</param>
 		/// <param name="user">User to give control.</param>
 		/// <param name="pages">Pages.</param>
 		/// <param name="emojis">Pagination emojis.</param>
 		/// <param name="behaviour">Pagination behaviour (when hitting max and min indices).</param>
 		/// <param name="deletion">Deletion behaviour.</param>
 		/// <param name="timeoutOverride">Override timeout period.</param>
 		public async Task SendPaginatedMessageAsync(DiscordChannel channel, DiscordUser user, IEnumerable<Page> pages, PaginationEmojis emojis,
 			PaginationBehaviour? behaviour = default, PaginationDeletion? deletion = default, TimeSpan? timeoutOverride = null)
 		{
 			var builder = new DiscordMessageBuilder()
 				.WithContent(pages.First().Content)
 				.WithEmbed(pages.First().Embed);
 			var m = await builder.SendAsync(channel).ConfigureAwait(false);
 
 			var timeout = timeoutOverride ?? this.Config.Timeout;
 
 			var bhv = behaviour ?? this.Config.PaginationBehaviour;
 			var del = deletion ?? this.Config.PaginationDeletion;
 			var ems = emojis ?? this.Config.PaginationEmojis;
 
 			var pRequest = new PaginationRequest(m, user, bhv, del, ems, timeout, pages);
 
 			await this._paginator.DoPaginationAsync(pRequest).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Sends a paginated message in response to an interaction.
 		/// <para>
 		/// <b>Pass the interaction directly. Interactivity will ACK it.</b>
 		/// </para>
 		/// </summary>
 		/// <param name="interaction">The interaction to create a response to.</param>
 		/// <param name="ephemeral">Whether the response should be ephemeral.</param>
 		/// <param name="user">The user to listen for button presses from.</param>
 		/// <param name="pages">The pages to paginate.</param>
 		/// <param name="buttons">Optional: custom buttons.</param>
 		/// <param name="behaviour">Pagination behaviour.</param>
 		/// <param name="deletion">Deletion behaviour.</param>
 		/// <param name="token">A custom cancellation token that can be cancelled at any point.</param>
 		public async Task SendPaginatedResponseAsync(DiscordInteraction interaction, bool ephemeral, DiscordUser user, IEnumerable<Page> pages, PaginationButtons buttons = null, PaginationBehaviour? behaviour = default, ButtonPaginationBehavior? deletion = default, CancellationToken token = default)
 		{
 			var bhv = behaviour ?? this.Config.PaginationBehaviour;
 			var del = deletion ?? this.Config.ButtonBehavior;
 			var bts = buttons ?? this.Config.PaginationButtons;
 
 			bts = new PaginationButtons(bts);
 			if (bhv is PaginationBehaviour.Ignore)
 			{
 				bts.SkipLeft.Disable();
 				bts.Left.Disable();
 			}
 
 			var builder = new DiscordInteractionResponseBuilder()
 				.WithContent(pages.First().Content)
 				.AddEmbed(pages.First().Embed)
 				.AsEphemeral(ephemeral)
 				.AddComponents(bts.ButtonArray);
 
 			await interaction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, builder).ConfigureAwait(false);
 			var message = await interaction.GetOriginalResponseAsync().ConfigureAwait(false);
 
 			var req = new InteractionPaginationRequest(interaction, message, user, bhv, del, bts, pages, token);
 
 			await this._compPaginator.DoPaginationAsync(req).ConfigureAwait(false);
 		}
 
 
 		/// <summary>
 		/// Waits for a custom pagination request to finish.
 		/// This does NOT handle removing emojis after finishing for you.
 		/// </summary>
 		/// <param name="request"></param>
 		/// <returns></returns>
 		public async Task WaitForCustomPaginationAsync(IPaginationRequest request) => await this._paginator.DoPaginationAsync(request).ConfigureAwait(false);
 
 		/// <summary>
 		/// Waits for custom button-based pagination request to finish.
 		/// <br/>
 		/// This does <i><b>not</b></i> invoke <see cref="DisCatSharp.Interactivity.EventHandling.IPaginationRequest.DoCleanupAsync"/>.
 		/// </summary>
 		/// <param name="request">The request to wait for.</param>
 		public async Task WaitForCustomComponentPaginationAsync(IPaginationRequest request) => await this._compPaginator.DoPaginationAsync(request).ConfigureAwait(false);
 
 		/// <summary>
 		/// Generates pages from a string, and puts them in message content.
 		/// </summary>
 		/// <param name="input">Input string.</param>
 		/// <param name="splitType">How to split input string.</param>
 		/// <returns></returns>
 		public IEnumerable<Page> GeneratePagesInContent(string input, SplitType splitType = SplitType.Character)
 		{
 			if (string.IsNullOrEmpty(input))
 				throw new ArgumentException("You must provide a string that is not null or empty!");
 
 			var result = new List<Page>();
 			List<string> split;
 
 			switch (splitType)
 			{
 				default:
 				case SplitType.Character:
-					split = this.SplitString(input, 500).ToList();
+					split = this.SplitString(input, 500);
 					break;
 				case SplitType.Line:
 					var subsplit = input.Split('\n');
 
 					split = new List<string>();
 					var s = "";
 
 					for (var i = 0; i < subsplit.Length; i++)
 					{
 						s += subsplit[i];
 						if (i >= 15 && i % 15 == 0)
 						{
 							split.Add(s);
 							s = "";
 						}
 					}
 					if (split.All(x => x != s))
 						split.Add(s);
 					break;
 			}
 
 			var page = 1;
 			foreach (var s in split)
 			{
 				result.Add(new Page($"Page {page}:\n{s}"));
 				page++;
 			}
 
 			return result;
 		}
 
 		/// <summary>
 		/// Generates pages from a string, and puts them in message embeds.
 		/// </summary>
 		/// <param name="input">Input string.</param>
 		/// <param name="splitType">How to split input string.</param>
 		/// <param name="embedBase">Base embed for output embeds.</param>
 		/// <returns></returns>
 		public IEnumerable<Page> GeneratePagesInEmbed(string input, SplitType splitType = SplitType.Character, DiscordEmbedBuilder embedBase = null)
 		{
 			if (string.IsNullOrEmpty(input))
 				throw new ArgumentException("You must provide a string that is not null or empty!");
 
 			var embed = embedBase ?? new DiscordEmbedBuilder();
 
 			var result = new List<Page>();
 			List<string> split;
 
 			switch (splitType)
 			{
 				default:
 				case SplitType.Character:
-					split = this.SplitString(input, 500).ToList();
+					split = this.SplitString(input, 500);
 					break;
 				case SplitType.Line:
 					var subsplit = input.Split('\n');
 
 					split = new List<string>();
 					var s = "";
 
 					for (var i = 0; i < subsplit.Length; i++)
 					{
 						s += $"{subsplit[i]}\n";
 						if (i % 15 == 0 && i != 0)
 						{
 							split.Add(s);
 							s = "";
 						}
 					}
 					if (!split.Any(x => x == s))
 						split.Add(s);
 					break;
 			}
 
 			var page = 1;
 			foreach (var s in split)
 			{
 				result.Add(new Page("", new DiscordEmbedBuilder(embed).WithDescription(s).WithFooter($"Page {page}/{split.Count}")));
 				page++;
 			}
 
 			return result;
 		}
 
 		/// <summary>
 		/// Splits the string.
 		/// </summary>
 		/// <param name="str">The string.</param>
 		/// <param name="chunkSize">The chunk size.</param>
 		private List<string> SplitString(string str, int chunkSize)
 		{
 			var res = new List<string>();
 			var len = str.Length;
 			var i = 0;
 
 			while (i < len)
 			{
 				var size = Math.Min(len - i, chunkSize);
 				res.Add(str.Substring(i, size));
 				i += size;
 			}
 
 			return res;
 		}
 
 		/// <summary>
 		/// Gets the cancellation token.
 		/// </summary>
 		/// <param name="timeout">The timeout.</param>
 		private CancellationToken GetCancellationToken(TimeSpan? timeout = null) => new CancellationTokenSource(timeout ?? this.Config.Timeout).Token;
 
 		/// <summary>
 		/// Handles an invalid interaction.
 		/// </summary>
 		/// <param name="interaction">The interaction.</param>
 		private async Task HandleInvalidInteraction(DiscordInteraction interaction)
 		{
 			var at = this.Config.ResponseBehavior switch
 			{
 				InteractionResponseBehavior.Ack => interaction.CreateResponseAsync(InteractionResponseType.DeferredMessageUpdate),
 				InteractionResponseBehavior.Respond => interaction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, new DiscordInteractionResponseBuilder { Content = this.Config.ResponseMessage, IsEphemeral = true}),
 				InteractionResponseBehavior.Ignore => Task.CompletedTask,
 				_ => throw new ArgumentException("Unknown enum value.")
 			};
 
 			await at;
 		}
 	}
 }
diff --git a/DisCatSharp.Lavalink/LavalinkRestClient.cs b/DisCatSharp.Lavalink/LavalinkRestClient.cs
index 3af98915d..d2dbd2469 100644
--- a/DisCatSharp.Lavalink/LavalinkRestClient.cs
+++ b/DisCatSharp.Lavalink/LavalinkRestClient.cs
@@ -1,427 +1,422 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Reflection;
 using System.Threading.Tasks;
 
 using DisCatSharp.Lavalink.Entities;
 using DisCatSharp.Net;
 
 using Microsoft.Extensions.Logging;
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace DisCatSharp.Lavalink
 {
 	/// <summary>
 	/// Represents a class for Lavalink REST calls.
 	/// </summary>
 	public sealed class LavalinkRestClient
 	{
 		/// <summary>
 		/// Gets the REST connection endpoint for this client.
 		/// </summary>
 		public ConnectionEndpoint RestEndpoint { get; private set; }
 
 		private HttpClient _http;
 
 		private readonly ILogger _logger;
 
 		private readonly Lazy<string> _dcsVersionString = new(() =>
 		{
 			var a = typeof(DiscordClient).GetTypeInfo().Assembly;
 
 			var iv = a.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
 			if (iv != null)
 				return iv.InformationalVersion;
 
 			var v = a.GetName().Version;
 			var vs = v.ToString(3);
 
 			if (v.Revision > 0)
 				vs = $"{vs}, CI build {v.Revision}";
 
 			return vs;
 		});
 
 		/// <summary>
 		/// Creates a new Lavalink REST client.
 		/// </summary>
 		/// <param name="restEndpoint">The REST server endpoint to connect to.</param>
 		/// <param name="password">The password for the remote server.</param>
 		public LavalinkRestClient(ConnectionEndpoint restEndpoint, string password)
 		{
 			this.RestEndpoint = restEndpoint;
 			this.ConfigureHttpHandling(password);
 		}
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="LavalinkRestClient"/> class.
 		/// </summary>
 		/// <param name="config">The config.</param>
 		/// <param name="client">The client.</param>
 		internal LavalinkRestClient(LavalinkConfiguration config, BaseDiscordClient client)
 		{
 			this.RestEndpoint = config.RestEndpoint;
 			this._logger = client.Logger;
 			this.ConfigureHttpHandling(config.Password, client);
 		}
 
 		/// <summary>
 		/// Gets the version of the Lavalink server.
 		/// </summary>
 		/// <returns></returns>
 		public Task<string> GetVersionAsync()
 		{
 			var versionUri = new Uri($"{this.RestEndpoint.ToHttpString()}{Endpoints.VERSION}");
 			return this.InternalGetVersionAsync(versionUri);
 		}
 
 		#region Track_Loading
 
 		/// <summary>
 		/// Searches for specified terms.
 		/// </summary>
 		/// <param name="searchQuery">What to search for.</param>
 		/// <param name="type">What platform will search for.</param>
 		/// <returns>A collection of tracks matching the criteria.</returns>
 		public Task<LavalinkLoadResult> GetTracksAsync(string searchQuery, LavalinkSearchType type = LavalinkSearchType.Youtube)
 		{
 			var prefix = type switch
 			{
 				LavalinkSearchType.Youtube => "ytsearch:",
 				LavalinkSearchType.SoundCloud => "scsearch:",
 				LavalinkSearchType.Plain => "",
 				_ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
 			};
 			var str = WebUtility.UrlEncode(prefix + searchQuery);
 			var tracksUri = new Uri($"{this.RestEndpoint.ToHttpString()}{Endpoints.LOAD_TRACKS}?identifier={str}");
 			return this.InternalResolveTracksAsync(tracksUri);
 		}
 
 		/// <summary>
 		/// Loads tracks from specified URL.
 		/// </summary>
 		/// <param name="uri">URL to load tracks from.</param>
 		/// <returns>A collection of tracks from the URL.</returns>
 		public Task<LavalinkLoadResult> GetTracksAsync(Uri uri)
 		{
 			var str = WebUtility.UrlEncode(uri.ToString());
 			var tracksUri = new Uri($"{this.RestEndpoint.ToHttpString()}{Endpoints.LOAD_TRACKS}?identifier={str}");
 			return this.InternalResolveTracksAsync(tracksUri);
 		}
 
 		/// <summary>
 		/// Loads tracks from a local file.
 		/// </summary>
 		/// <param name="file">File to load tracks from.</param>
 		/// <returns>A collection of tracks from the file.</returns>
 		public Task<LavalinkLoadResult> GetTracksAsync(FileInfo file)
 		{
 			var str = WebUtility.UrlEncode(file.FullName);
 			var tracksUri = new Uri($"{this.RestEndpoint.ToHttpString()}{Endpoints.LOAD_TRACKS}?identifier={str}");
 			return this.InternalResolveTracksAsync(tracksUri);
 		}
 
 		/// <summary>
 		/// Decodes a base64 track string into a Lavalink track object.
 		/// </summary>
 		/// <param name="trackString">The base64 track string.</param>
 		/// <returns></returns>
 		public Task<LavalinkTrack> DecodeTrackAsync(string trackString)
 		{
 			var str = WebUtility.UrlEncode(trackString);
 			var decodeTrackUri = new Uri($"{this.RestEndpoint.ToHttpString()}{Endpoints.DECODE_TRACK}?track={str}");
 			return this.InternalDecodeTrackAsync(decodeTrackUri);
 		}
 
 		/// <summary>
 		/// Decodes an array of base64 track strings into Lavalink track objects.
 		/// </summary>
 		/// <param name="trackStrings">The array of base64 track strings.</param>
 		/// <returns></returns>
 		public Task<IEnumerable<LavalinkTrack>> DecodeTracksAsync(string[] trackStrings)
 		{
 			var decodeTracksUri = new Uri($"{this.RestEndpoint.ToHttpString()}{Endpoints.DECODE_TRACKS}");
 			return this.InternalDecodeTracksAsync(decodeTracksUri, trackStrings);
 		}
 
 		/// <summary>
 		/// Decodes a list of base64 track strings into Lavalink track objects.
 		/// </summary>
 		/// <param name="trackStrings">The list of base64 track strings.</param>
 		/// <returns></returns>
 		public Task<IEnumerable<LavalinkTrack>> DecodeTracksAsync(List<string> trackStrings)
 		{
 			var decodeTracksUri = new Uri($"{this.RestEndpoint.ToHttpString()}{Endpoints.DECODE_TRACKS}");
 			return this.InternalDecodeTracksAsync(decodeTracksUri, trackStrings.ToArray());
 		}
 
 		#endregion
 
 		#region Route_Planner
 
 		/// <summary>
 		/// Retrieves statistics from the route planner.
 		/// </summary>
 		/// <returns>The status (<see cref="DisCatSharp.Lavalink.Entities.LavalinkRouteStatus"/>) details.</returns>
 		public Task<LavalinkRouteStatus> GetRoutePlannerStatusAsync()
 		{
 			var routeStatusUri = new Uri($"{this.RestEndpoint.ToHttpString()}{Endpoints.ROUTE_PLANNER}{Endpoints.STATUS}");
 			return this.InternalGetRoutePlannerStatusAsync(routeStatusUri);
 		}
 
 		/// <summary>
 		/// Unmarks a failed route planner IP Address.
 		/// </summary>
 		/// <param name="address">The IP address name to unmark.</param>
 		/// <returns></returns>
 		public Task FreeAddressAsync(string address)
 		{
 			var routeFreeAddressUri = new Uri($"{this.RestEndpoint.ToHttpString()}{Endpoints.ROUTE_PLANNER}{Endpoints.FREE_ADDRESS}");
 			return this.InternalFreeAddressAsync(routeFreeAddressUri, address);
 		}
 
 		/// <summary>
 		/// Unmarks all failed route planner IP Addresses.
 		/// </summary>
 		/// <returns></returns>
 		public Task FreeAllAddressesAsync()
 		{
 			var routeFreeAllAddressesUri = new Uri($"{this.RestEndpoint.ToHttpString()}{Endpoints.ROUTE_PLANNER}{Endpoints.FREE_ALL}");
 			return this.InternalFreeAllAddressesAsync(routeFreeAllAddressesUri);
 		}
 
 		#endregion
 
 		/// <summary>
 		/// get version async.
 		/// </summary>
 		/// <param name="uri">The uri.</param>
 		/// <returns>A Task.</returns>
 		internal async Task<string> InternalGetVersionAsync(Uri uri)
 		{
 			using var req = await this._http.GetAsync(uri).ConfigureAwait(false);
 			using var res = await req.Content.ReadAsStreamAsync().ConfigureAwait(false);
 			using var sr = new StreamReader(res, Utilities.UTF8);
 			var json = await sr.ReadToEndAsync().ConfigureAwait(false);
 			return json;
 		}
 
 		#region Internal_Track_Loading
 
 		/// <summary>
 		/// resolve tracks async.
 		/// </summary>
 		/// <param name="uri">The uri.</param>
 		/// <returns>A Task.</returns>
 		internal async Task<LavalinkLoadResult> InternalResolveTracksAsync(Uri uri)
 		{
 			// this function returns a Lavalink 3-like dataset regardless of input data version
 
 			var json = "[]";
 			using (var req = await this._http.GetAsync(uri).ConfigureAwait(false))
 			using (var res = await req.Content.ReadAsStreamAsync().ConfigureAwait(false))
 			using (var sr = new StreamReader(res, Utilities.UTF8))
 				json = await sr.ReadToEndAsync().ConfigureAwait(false);
 
 			var jdata = JToken.Parse(json);
 			if (jdata is JArray jarr)
 			{
 				// Lavalink 2.x
 
 				var tracks = new List<LavalinkTrack>(jarr.Count);
 				foreach (var jt in jarr)
 				{
 					var track = jt["info"].ToObject<LavalinkTrack>();
 					track.TrackString = jt["track"].ToString();
 
 					tracks.Add(track);
 				}
 
 				return new LavalinkLoadResult
 				{
 					PlaylistInfo = default,
 					LoadResultType = tracks.Count == 0 ? LavalinkLoadResultType.LoadFailed : LavalinkLoadResultType.TrackLoaded,
 					Tracks = tracks
 				};
 			}
 			else if (jdata is JObject jo)
 			{
 				// Lavalink 3.x
 
 				jarr = jo["tracks"] as JArray;
 				var loadInfo = jo.ToObject<LavalinkLoadResult>();
-				var tracks = new List<LavalinkTrack>(jarr.Count);
-				foreach (var jt in jarr)
+				loadInfo.Tracks = jarr.Select(jt =>
 				{
 					var track = jt["info"].ToObject<LavalinkTrack>();
 					track.TrackString = jt["track"].ToString();
-
-					tracks.Add(track);
-				}
-
-				loadInfo.Tracks = new ReadOnlyCollection<LavalinkTrack>(tracks);
+					return track;
+				}).ToArray();
 
 				return loadInfo;
 			}
 			else
 				return null;
 		}
 
 		/// <summary>
 		/// decode track async.
 		/// </summary>
 		/// <param name="uri">The uri.</param>
 		/// <returns>A Task.</returns>
 		internal async Task<LavalinkTrack> InternalDecodeTrackAsync(Uri uri)
 		{
 			using var req = await this._http.GetAsync(uri).ConfigureAwait(false);
 			using var res = await req.Content.ReadAsStreamAsync().ConfigureAwait(false);
 			using var sr = new StreamReader(res, Utilities.UTF8);
 			var json = await sr.ReadToEndAsync().ConfigureAwait(false);
 			if (!req.IsSuccessStatusCode)
 			{
 				var jsonError = JObject.Parse(json);
 				this._logger?.LogError(LavalinkEvents.LavalinkDecodeError, "Unable to decode track strings: {0}", jsonError["message"]);
 
 				return null;
 			}
 			var track = JsonConvert.DeserializeObject<LavalinkTrack>(json);
 			return track;
 		}
 
 		/// <summary>
 		/// decode tracks async.
 		/// </summary>
 		/// <param name="uri">The uri.</param>
 		/// <param name="ids">The ids.</param>
 		/// <returns>A Task.</returns>
 		internal async Task<IEnumerable<LavalinkTrack>> InternalDecodeTracksAsync(Uri uri, string[] ids)
 		{
 			var jsonOut = JsonConvert.SerializeObject(ids);
 			var content = new StringContent(jsonOut, Utilities.UTF8, "application/json");
 			using var req = await this._http.PostAsync(uri, content).ConfigureAwait(false);
 			using var res = await req.Content.ReadAsStreamAsync().ConfigureAwait(false);
 			using var sr = new StreamReader(res, Utilities.UTF8);
 			var jsonIn = await sr.ReadToEndAsync().ConfigureAwait(false);
 			if (!req.IsSuccessStatusCode)
 			{
 				var jsonError = JObject.Parse(jsonIn);
 				this._logger?.LogError(LavalinkEvents.LavalinkDecodeError, "Unable to decode track strings", jsonError["message"]);
 				return null;
 			}
 
 			var jarr = JToken.Parse(jsonIn) as JArray;
 			var decodedTracks = new LavalinkTrack[jarr.Count];
 
 			for (var i = 0; i < decodedTracks.Length; i++)
 			{
 				decodedTracks[i] = JsonConvert.DeserializeObject<LavalinkTrack>(jarr[i]["info"].ToString());
 				decodedTracks[i].TrackString = jarr[i]["track"].ToString();
 			}
 
-			var decodedTrackList = new ReadOnlyCollection<LavalinkTrack>(decodedTracks);
-
-			return decodedTrackList;
+			return decodedTracks;
 		}
 
 		#endregion
 
 		#region Internal_Route_Planner
 
 		/// <summary>
 		/// get route planner status async.
 		/// </summary>
 		/// <param name="uri">The uri.</param>
 		/// <returns>A Task.</returns>
 		internal async Task<LavalinkRouteStatus> InternalGetRoutePlannerStatusAsync(Uri uri)
 		{
 			using var req = await this._http.GetAsync(uri).ConfigureAwait(false);
 			using var res = await req.Content.ReadAsStreamAsync().ConfigureAwait(false);
 			using var sr = new StreamReader(res, Utilities.UTF8);
 			var json = await sr.ReadToEndAsync().ConfigureAwait(false);
 			var status = JsonConvert.DeserializeObject<LavalinkRouteStatus>(json);
 			return status;
 		}
 
 		/// <summary>
 		/// free address async.
 		/// </summary>
 		/// <param name="uri">The uri.</param>
 		/// <param name="address">The address.</param>
 		/// <returns>A Task.</returns>
 		internal async Task InternalFreeAddressAsync(Uri uri, string address)
 		{
 			var payload = new StringContent(address, Utilities.UTF8, "application/json");
 			using var req = await this._http.PostAsync(uri, payload).ConfigureAwait(false);
 			if (req.StatusCode == HttpStatusCode.InternalServerError)
 				this._logger?.LogWarning(LavalinkEvents.LavalinkRestError, "Request to {0} returned an internal server error - your server route planner configuration is likely incorrect", uri);
 
 		}
 
 		/// <summary>
 		/// free all addresses async.
 		/// </summary>
 		/// <param name="uri">The uri.</param>
 		/// <returns>A Task.</returns>
 		internal async Task InternalFreeAllAddressesAsync(Uri uri)
 		{
 			var httpReq = new HttpRequestMessage(HttpMethod.Post, uri);
 			using var req = await this._http.SendAsync(httpReq).ConfigureAwait(false);
 			if (req.StatusCode == HttpStatusCode.InternalServerError)
 				this._logger?.LogWarning(LavalinkEvents.LavalinkRestError, "Request to {0} returned an internal server error - your server route planner configuration is likely incorrect", uri);
 		}
 
 		#endregion
 
 		/// <summary>
 		/// Configures the http handling.
 		/// </summary>
 		/// <param name="password">The password.</param>
 		/// <param name="client">The client.</param>
 		private void ConfigureHttpHandling(string password, BaseDiscordClient client = null)
 		{
 			var httphandler = new HttpClientHandler
 			{
 				UseCookies = false,
 				AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip,
 				UseProxy = client != null && client.Configuration.Proxy != null
 			};
 			if (httphandler.UseProxy) // because mono doesn't implement this properly
 				httphandler.Proxy = client.Configuration.Proxy;
 
 			this._http = new HttpClient(httphandler);
 
 			this._http.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", $"DisCatSharp.LavaLink/{this._dcsVersionString}");
 			this._http.DefaultRequestHeaders.TryAddWithoutValidation("Client-Name", $"DisCatSharp");
 			this._http.DefaultRequestHeaders.TryAddWithoutValidation("Authorization", password);
 		}
 	}
 }
diff --git a/DisCatSharp.VoiceNext/AudioFormat.cs b/DisCatSharp.VoiceNext/AudioFormat.cs
index 9bba2134a..3ad88c0aa 100644
--- a/DisCatSharp.VoiceNext/AudioFormat.cs
+++ b/DisCatSharp.VoiceNext/AudioFormat.cs
@@ -1,164 +1,164 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Runtime.CompilerServices;
 
 namespace DisCatSharp.VoiceNext
 {
 	/// <summary>
 	/// Defines the format of PCM data consumed or produced by Opus.
 	/// </summary>
 	public struct AudioFormat
 	{
 		/// <summary>
 		/// Gets the collection of sampling rates (in Hz) the Opus encoder can use.
 		/// </summary>
-		public static IReadOnlyCollection<int> AllowedSampleRates { get; } = new ReadOnlyCollection<int>(new[] { 8000, 12000, 16000, 24000, 48000 });
+		public static IReadOnlyCollection<int> AllowedSampleRates { get; } = new[] { 8000, 12000, 16000, 24000, 48000 };
 
 		/// <summary>
 		/// Gets the collection of channel counts the Opus encoder can use.
 		/// </summary>
-		public static IReadOnlyCollection<int> AllowedChannelCounts { get; } = new ReadOnlyCollection<int>(new[] { 1, 2 });
+		public static IReadOnlyCollection<int> AllowedChannelCounts { get; } = new[] { 1, 2 };
 
 		/// <summary>
 		/// Gets the collection of sample durations (in ms) the Opus encoder can use.
 		/// </summary>
-		public static IReadOnlyCollection<int> AllowedSampleDurations { get; } = new ReadOnlyCollection<int>(new[] { 5, 10, 20, 40, 60 });
+		public static IReadOnlyCollection<int> AllowedSampleDurations { get; } = new[] { 5, 10, 20, 40, 60 };
 
 		/// <summary>
 		/// Gets the default audio format. This is a format configured for 48kHz sampling rate, 2 channels, with music quality preset.
 		/// </summary>
 		public static AudioFormat Default { get; } = new(48000, 2, VoiceApplication.Music);
 
 		/// <summary>
 		/// Gets the audio sampling rate in Hz.
 		/// </summary>
 		public int SampleRate { get; }
 
 		/// <summary>
 		/// Gets the audio channel count.
 		/// </summary>
 		public int ChannelCount { get; }
 
 		/// <summary>
 		/// Gets the voice application, which dictates the quality preset.
 		/// </summary>
 		public VoiceApplication VoiceApplication { get; }
 
 		/// <summary>
 		/// Creates a new audio format for use with Opus encoder.
 		/// </summary>
 		/// <param name="sampleRate">Audio sampling rate in Hz.</param>
 		/// <param name="channelCount">Number of audio channels in the data.</param>
 		/// <param name="voiceApplication">Encoder preset to use.</param>
 		public AudioFormat(int sampleRate = 48000, int channelCount = 2, VoiceApplication voiceApplication = VoiceApplication.Music)
 		{
 			if (!AllowedSampleRates.Contains(sampleRate))
 				throw new ArgumentOutOfRangeException(nameof(sampleRate), "Invalid sample rate specified.");
 
 			if (!AllowedChannelCounts.Contains(channelCount))
 				throw new ArgumentOutOfRangeException(nameof(channelCount), "Invalid channel count specified.");
 
 			if (voiceApplication != VoiceApplication.Music && voiceApplication != VoiceApplication.Voice && voiceApplication != VoiceApplication.LowLatency)
 				throw new ArgumentOutOfRangeException(nameof(voiceApplication), "Invalid voice application specified.");
 
 			this.SampleRate = sampleRate;
 			this.ChannelCount = channelCount;
 			this.VoiceApplication = voiceApplication;
 		}
 
 		/// <summary>
 		/// Calculates a sample size in bytes.
 		/// </summary>
 		/// <param name="sampleDuration">Millisecond duration of a sample.</param>
 		/// <returns>Calculated sample size in bytes.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public int CalculateSampleSize(int sampleDuration)
 		{
 			if (!AllowedSampleDurations.Contains(sampleDuration))
 				throw new ArgumentOutOfRangeException(nameof(sampleDuration), "Invalid sample duration specified.");
 
 			// Sample size in bytes is a product of the following:
 			// - duration in milliseconds
 			// - number of channels
 			// - sample rate in kHz
 			// - size of data (in this case, sizeof(int16_t))
 			// which comes down to below:
 			return sampleDuration * this.ChannelCount * (this.SampleRate / 1000) * 2;
 		}
 
 		/// <summary>
 		/// Gets the maximum buffer size for decoding. This method should be called when decoding Opus data to PCM, to ensure sufficient buffer size.
 		/// </summary>
 		/// <returns>Buffer size required to decode data.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public int GetMaximumBufferSize()
 			=> this.CalculateMaximumFrameSize();
 
 		/// <summary>
 		/// Calculates the sample duration.
 		/// </summary>
 		/// <param name="sampleSize">The sample size.</param>
 		/// <returns>An int.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		internal int CalculateSampleDuration(int sampleSize)
 			=> sampleSize / (this.SampleRate / 1000) / this.ChannelCount / 2 /* sizeof(int16_t) */;
 
 		/// <summary>
 		/// Calculates the frame size.
 		/// </summary>
 		/// <param name="sampleDuration">The sample duration.</param>
 		/// <returns>An int.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		internal int CalculateFrameSize(int sampleDuration)
 			=> sampleDuration * (this.SampleRate / 1000);
 
 		/// <summary>
 		/// Calculates the maximum frame size.
 		/// </summary>
 		/// <returns>An int.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		internal int CalculateMaximumFrameSize()
 			=> 120 * (this.SampleRate / 1000);
 
 		/// <summary>
 		/// Samples the count to sample size.
 		/// </summary>
 		/// <param name="sampleCount">The sample count.</param>
 		/// <returns>An int.</returns>
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		internal int SampleCountToSampleSize(int sampleCount)
 			=> sampleCount * this.ChannelCount * 2 /* sizeof(int16_t) */;
 
 		/// <summary>
 		/// Are the valid.
 		/// </summary>
 		/// <returns>A bool.</returns>
 		internal bool IsValid()
 			=> AllowedSampleRates.Contains(this.SampleRate) && AllowedChannelCounts.Contains(this.ChannelCount) &&
 				(this.VoiceApplication == VoiceApplication.Music || this.VoiceApplication == VoiceApplication.Voice || this.VoiceApplication == VoiceApplication.LowLatency);
 	}
 }
diff --git a/DisCatSharp/Clients/BaseDiscordClient.cs b/DisCatSharp/Clients/BaseDiscordClient.cs
index e8985a320..ba4fec3e0 100644
--- a/DisCatSharp/Clients/BaseDiscordClient.cs
+++ b/DisCatSharp/Clients/BaseDiscordClient.cs
@@ -1,321 +1,322 @@
 // 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.
 
 #pragma warning disable CS0618
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Net.Http;
 using System.Reflection;
 using System.Threading.Tasks;
 
+using DisCatSharp.Common;
 using DisCatSharp.Entities;
 using DisCatSharp.Net;
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
 namespace DisCatSharp
 {
 	/// <summary>
 	/// Represents a common base for various Discord Client implementations.
 	/// </summary>
 	public abstract class BaseDiscordClient : IDisposable
 	{
 		/// <summary>
 		/// Gets the api client.
 		/// </summary>
 		internal protected DiscordApiClient ApiClient { get; }
 
 		/// <summary>
 		/// Gets the configuration.
 		/// </summary>
 		internal protected DiscordConfiguration Configuration { get; }
 
 		/// <summary>
 		/// Gets the instance of the logger for this client.
 		/// </summary>
 		public ILogger<BaseDiscordClient> Logger { get; internal set; }
 
 		/// <summary>
 		/// Gets the string representing the version of bot lib.
 		/// </summary>
 		public string VersionString { get; }
 
 		/// <summary>
 		/// Gets the bot library name.
 		/// </summary>
 		public string BotLibrary { get; }
 
 		[Obsolete("Use GetLibraryDeveloperTeamAsync")]
 		public DisCatSharpTeam LibraryDeveloperTeamAsync
 			=> this.GetLibraryDevelopmentTeamAsync().Result;
 
 		/// <summary>
 		/// Gets the current user.
 		/// </summary>
 		public DiscordUser CurrentUser { get; internal set; }
 
 		/// <summary>
 		/// Gets the current application.
 		/// </summary>
 		public DiscordApplication CurrentApplication { get; internal set; }
 
 		/// <summary>
 		/// Exposes a <see cref="System.Net.Http.HttpClient">Http Client</see> for custom operations.
 		/// </summary>
 		public HttpClient RestClient { get; internal set; }
 
 		/// <summary>
 		/// Gets the cached guilds for this client.
 		/// </summary>
 		public abstract IReadOnlyDictionary<ulong, DiscordGuild> Guilds { get; }
 
 		/// <summary>
 		/// Gets the cached users for this client.
 		/// </summary>
 		public ConcurrentDictionary<ulong, DiscordUser> UserCache { get; internal set; }
 
 		/// <summary>
 		/// <para>Gets the service provider.</para>
 		/// <para>This allows passing data around without resorting to static members.</para>
 		/// <para>Defaults to null.</para>
 		/// </summary>
 		internal IServiceProvider ServiceProvider { get; set; }
 
 		/// <summary>
 		/// Gets the list of available voice regions. Note that this property will not contain VIP voice regions.
 		/// </summary>
 		public IReadOnlyDictionary<string, DiscordVoiceRegion> VoiceRegions
 			=> this.VoiceRegionsLazy.Value;
 
 		/// <summary>
 		/// Gets the list of available voice regions. This property is meant as a way to modify <see cref="VoiceRegions"/>.
 		/// </summary>
 		protected internal ConcurrentDictionary<string, DiscordVoiceRegion> InternalVoiceRegions { get; set; }
 		internal Lazy<IReadOnlyDictionary<string, DiscordVoiceRegion>> VoiceRegionsLazy;
 
 		/// <summary>
 		/// Initializes this Discord API client.
 		/// </summary>
 		/// <param name="config">Configuration for this client.</param>
 		protected BaseDiscordClient(DiscordConfiguration config)
 		{
 			this.Configuration = new DiscordConfiguration(config);
 			this.ServiceProvider = config.ServiceProvider;
 
 			if (this.ServiceProvider != null)
 			{
 				this.Configuration.LoggerFactory ??= config.ServiceProvider.GetService<ILoggerFactory>();
 				this.Logger = config.ServiceProvider.GetService<ILogger<BaseDiscordClient>>();
 			}
 
 			if (this.Configuration.LoggerFactory == null)
 			{
 				this.Configuration.LoggerFactory = new DefaultLoggerFactory();
 				this.Configuration.LoggerFactory.AddProvider(new DefaultLoggerProvider(this));
 			}
 			this.Logger ??= this.Configuration.LoggerFactory.CreateLogger<BaseDiscordClient>();
 
 			this.ApiClient = new DiscordApiClient(this);
 			this.UserCache = new ConcurrentDictionary<ulong, DiscordUser>();
 			this.InternalVoiceRegions = new ConcurrentDictionary<string, DiscordVoiceRegion>();
 			this.VoiceRegionsLazy = new Lazy<IReadOnlyDictionary<string, DiscordVoiceRegion>>(() => new ReadOnlyDictionary<string, DiscordVoiceRegion>(this.InternalVoiceRegions));
 
 			this.RestClient = new();
 			this.RestClient.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", Utilities.GetUserAgent());
 
 			var a = typeof(DiscordClient).GetTypeInfo().Assembly;
 
 			var iv = a.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
 			if (iv != null)
 			{
 				this.VersionString = iv.InformationalVersion;
 			}
 			else
 			{
 				var v = a.GetName().Version;
 				var vs = v.ToString(3);
 
 				if (v.Revision > 0)
 					this.VersionString = $"{vs}, CI build {v.Revision}";
 			}
 
 			this.BotLibrary = "DisCatSharp";
 		}
 
 		/// <summary>
 		/// Gets the current API application.
 		/// </summary>
 		public async Task<DiscordApplication> GetCurrentApplicationAsync()
 		{
 			var tapp = await this.ApiClient.GetCurrentApplicationInfoAsync().ConfigureAwait(false);
 			var app = new DiscordApplication
 			{
 				Discord = this,
 				Id = tapp.Id,
 				Name = tapp.Name,
 				Description = tapp.Description,
 				Summary = tapp.Summary,
 				IconHash = tapp.IconHash,
-				RpcOrigins = tapp.RpcOrigins != null ? new ReadOnlyCollection<string>(tapp.RpcOrigins) : null,
+				RpcOrigins = tapp.RpcOrigins.AsReadOnly(),
 				Flags = tapp.Flags,
 				RequiresCodeGrant = tapp.BotRequiresCodeGrant,
 				IsPublic = tapp.IsPublicBot,
 				IsHook = tapp.IsHook,
 				Type = tapp.Type,
 				PrivacyPolicyUrl = tapp.PrivacyPolicyUrl,
 				TermsOfServiceUrl = tapp.TermsOfServiceUrl,
 				CustomInstallUrl = tapp.CustomInstallUrl,
 				InstallParams = tapp.InstallParams,
 				Tags = (tapp.Tags ?? Enumerable.Empty<string>()).ToArray()
 			};
 
 			if (tapp.Team == null)
 			{
-				app.Owners = new ReadOnlyCollection<DiscordUser>(new[] { new DiscordUser(tapp.Owner) });
+				app.Owners = new[] { new DiscordUser(tapp.Owner) };
 				app.Team = null;
 				app.TeamName = null;
 			}
 			else
 			{
 				app.Team = new DiscordTeam(tapp.Team);
 
 				var members = tapp.Team.Members
 					.Select(x => new DiscordTeamMember(x) { TeamId = app.Team.Id, TeamName = app.Team.Name, User = new DiscordUser(x.User) })
 					.ToArray();
 
 				var owners = members
 					.Where(x => x.MembershipStatus == DiscordTeamMembershipStatus.Accepted)
 					.Select(x => x.User)
 					.ToArray();
 
-				app.Owners = new ReadOnlyCollection<DiscordUser>(owners);
+				app.Owners = owners;
 				app.Team.Owner = owners.FirstOrDefault(x => x.Id == tapp.Team.OwnerId);
-				app.Team.Members = new ReadOnlyCollection<DiscordTeamMember>(members);
+				app.Team.Members = members;
 				app.TeamName = app.Team.Name;
 			}
 
 			app.GuildId = tapp.GuildId.ValueOrDefault();
 			app.Slug = tapp.Slug.ValueOrDefault();
 			app.PrimarySkuId = tapp.PrimarySkuId.ValueOrDefault();
 			app.VerifyKey = tapp.VerifyKey.ValueOrDefault();
 			app.CoverImageHash = tapp.CoverImageHash.ValueOrDefault();
 
 			return app;
 		}
 
 		/// <summary>
 		/// Gets a list of voice regions.
 		/// </summary>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<IReadOnlyList<DiscordVoiceRegion>> ListVoiceRegionsAsync()
 			=> this.ApiClient.ListVoiceRegionsAsync();
 
 		/// <summary>
 		/// Initializes this client. This method fetches information about current user, application, and voice regions.
 		/// </summary>
 		public virtual async Task InitializeAsync()
 		{
 			if (this.CurrentUser == null)
 			{
 				this.CurrentUser = await this.ApiClient.GetCurrentUserAsync().ConfigureAwait(false);
 				this.UserCache.AddOrUpdate(this.CurrentUser.Id, this.CurrentUser, (id, xu) => this.CurrentUser);
 			}
 
 			if (this.Configuration.TokenType == TokenType.Bot && this.CurrentApplication == null)
 				this.CurrentApplication = await this.GetCurrentApplicationAsync().ConfigureAwait(false);
 
 			if (this.Configuration.TokenType != TokenType.Bearer && this.InternalVoiceRegions.IsEmpty)
 			{
 				var vrs = await this.ListVoiceRegionsAsync().ConfigureAwait(false);
 				foreach (var xvr in vrs)
 					this.InternalVoiceRegions.TryAdd(xvr.Id, xvr);
 			}
 		}
 
 		/// <summary>
 		/// Gets the current gateway info for the provided token.
 		/// <para>If no value is provided, the configuration value will be used instead.</para>
 		/// </summary>
 		/// <returns>A gateway info object.</returns>
 		public async Task<GatewayInfo> GetGatewayInfoAsync(string token = null)
 		{
 			if (this.Configuration.TokenType != TokenType.Bot)
 				throw new InvalidOperationException("Only bot tokens can access this info.");
 
 			if (string.IsNullOrEmpty(this.Configuration.Token))
 			{
 				if (string.IsNullOrEmpty(token))
 					throw new InvalidOperationException("Could not locate a valid token.");
 
 				this.Configuration.Token = token;
 
 				var res = await this.ApiClient.GetGatewayInfoAsync().ConfigureAwait(false);
 				this.Configuration.Token = null;
 				return res;
 			}
 
 			return await this.ApiClient.GetGatewayInfoAsync().ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Gets some information about the development team behind DisCatSharp.
 		/// Can be used for crediting etc.
 		/// <para>Note: This call contacts servers managed by the DCS team, no information is collected.</para>
 		/// <returns>The team, or null with errors being logged on failure.</returns>
 		/// </summary>
 		public async Task<DisCatSharpTeam> GetLibraryDevelopmentTeamAsync()
 			=> await DisCatSharpTeam.Get(this.RestClient, this.Logger, this.ApiClient).ConfigureAwait(false);
 
 		/// <summary>
 		/// Gets a cached user.
 		/// </summary>
 		/// <param name="userId">The user id.</param>
 		internal DiscordUser GetCachedOrEmptyUserInternal(ulong userId)
 		{
 			this.TryGetCachedUserInternal(userId, out var user);
 			return user;
 		}
 
 		/// <summary>
 		/// Tries the get a cached user.
 		/// </summary>
 		/// <param name="userId">The user id.</param>
 		/// <param name="user">The user.</param>
 		internal bool TryGetCachedUserInternal(ulong userId, out DiscordUser user)
 		{
 			if (this.UserCache.TryGetValue(userId, out user))
 				return true;
 
 			user = new DiscordUser { Id = userId, Discord = this };
 			return false;
 		}
 
 		/// <summary>
 		/// Disposes this client.
 		/// </summary>
 		public abstract void Dispose();
 	}
 }
diff --git a/DisCatSharp/Clients/DiscordClient.Dispatch.cs b/DisCatSharp/Clients/DiscordClient.Dispatch.cs
index c0f1743b8..dda581407 100644
--- a/DisCatSharp/Clients/DiscordClient.Dispatch.cs
+++ b/DisCatSharp/Clients/DiscordClient.Dispatch.cs
@@ -1,3412 +1,3412 @@
 // 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 System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
 using DisCatSharp.Common;
 using DisCatSharp.Entities;
 using DisCatSharp.Enums;
 using DisCatSharp.EventArgs;
 using DisCatSharp.Exceptions;
 using DisCatSharp.Net.Abstractions;
 using DisCatSharp.Net.Serialization;
 
 using Microsoft.Extensions.Logging;
 
 using Newtonsoft.Json.Linq;
 
 namespace DisCatSharp
 {
 	/// <summary>
 	/// Represents a discord client.
 	/// </summary>
 	public sealed partial class DiscordClient
 	{
 		#region Private Fields
 
 		private string _sessionId;
 		private bool _guildDownloadCompleted;
 
 		private readonly Dictionary<string, KeyValuePair<TimeoutHandler, Timer>> _tempTimers = new();
 
 		/// <summary>
 		/// Represents a timeout handler.
 		/// </summary>
 		internal class TimeoutHandler
 		{
 			/// <summary>
 			/// Gets the member.
 			/// </summary>
 			internal readonly DiscordMember Member;
 
 			/// <summary>
 			/// Gets the guild.
 			/// </summary>
 			internal readonly DiscordGuild Guild;
 
 			/// <summary>
 			/// Gets the old timeout value.
 			/// </summary>
 			internal DateTime? TimeoutUntilOld;
 
 			/// <summary>
 			/// Gets the new timeout value.
 			/// </summary>
 			internal DateTime? TimeoutUntilNew;
 
 			/// <summary>
 			/// Constructs a new <see cref="TimeoutHandler"/>.
 			/// </summary>
 			/// <param name="mbr">The affected member.</param>
 			/// <param name="guild">The affected guild.</param>
 			/// <param name="too">The old timeout value.</param>
 			/// <param name="ton">The new timeout value.</param>
 			internal TimeoutHandler(DiscordMember mbr, DiscordGuild guild, DateTime? too, DateTime? ton)
 			{
 				this.Guild = guild;
 				this.Member = mbr;
 				this.TimeoutUntilOld = too;
 				this.TimeoutUntilNew = ton;
 			}
 		}
 
 		#endregion
 
 		#region Dispatch Handler
 
 		/// <summary>
 		/// Handles the dispatch payloads.
 		/// </summary>
 		/// <param name="payload">The payload.</param>
 
 		internal async Task HandleDispatchAsync(GatewayPayload payload)
 		{
 			if (payload.Data is not JObject dat)
 			{
 				this.Logger.LogWarning(LoggerEvents.WebSocketReceive, "Invalid payload body (this message is probably safe to ignore); opcode: {0} event: {1}; payload: {2}", payload.OpCode, payload.EventName, payload.Data);
 				return;
 			}
 
 			await this._payloadReceived.InvokeAsync(this, new PayloadReceivedEventArgs(this.ServiceProvider)
 			{
 				EventName = payload.EventName,
 				PayloadObject = dat
 			}).ConfigureAwait(false);
 
 			#region Default objects
 			DiscordChannel chn;
 			ulong gid;
 			ulong cid;
 			ulong uid;
 			DiscordStageInstance stg = default;
 			DiscordIntegration itg = default;
 			DiscordThreadChannel trd = default;
 			DiscordThreadChannelMember trdm = default;
 			DiscordScheduledEvent gse = default;
 			TransportUser usr = default;
 			TransportMember mbr = default;
 			TransportUser refUsr = default;
 			TransportMember refMbr = default;
 			JToken rawMbr = default;
 			var rawRefMsg = dat["referenced_message"];
 			#endregion
 
 			switch (payload.EventName.ToLowerInvariant())
 			{
 				#region Gateway Status
 
 				case "ready":
 					var glds = (JArray)dat["guilds"];
 					await this.OnReadyEventAsync(dat.ToObject<ReadyPayload>(), glds).ConfigureAwait(false);
 					break;
 
 				case "resumed":
 					await this.OnResumedAsync().ConfigureAwait(false);
 					break;
 
 				#endregion
 
 				#region Channel
 
 				case "channel_create":
 					chn = dat.ToObject<DiscordChannel>();
 					await this.OnChannelCreateEventAsync(chn).ConfigureAwait(false);
 					break;
 
 				case "channel_update":
 					await this.OnChannelUpdateEventAsync(dat.ToObject<DiscordChannel>()).ConfigureAwait(false);
 					break;
 
 				case "channel_delete":
 					chn = dat.ToObject<DiscordChannel>();
 					await this.OnChannelDeleteEventAsync(chn.IsPrivate ? dat.ToObject<DiscordDmChannel>() : chn).ConfigureAwait(false);
 					break;
 
 				case "channel_pins_update":
 					cid = (ulong)dat["channel_id"];
 					var ts = (string)dat["last_pin_timestamp"];
 					await this.OnChannelPinsUpdateAsync((ulong?)dat["guild_id"], cid, ts != null ? DateTimeOffset.Parse(ts, CultureInfo.InvariantCulture) : default(DateTimeOffset?)).ConfigureAwait(false);
 					break;
 
 				#endregion
 
 				#region Guild
 
 				case "guild_create":
 					await this.OnGuildCreateEventAsync(dat.ToDiscordObject<DiscordGuild>(), (JArray)dat["members"], dat["presences"].ToDiscordObject<IEnumerable<DiscordPresence>>()).ConfigureAwait(false);
 					break;
 
 				case "guild_update":
 					await this.OnGuildUpdateEventAsync(dat.ToDiscordObject<DiscordGuild>(), (JArray)dat["members"]).ConfigureAwait(false);
 					break;
 
 				case "guild_delete":
 					await this.OnGuildDeleteEventAsync(dat.ToDiscordObject<DiscordGuild>()).ConfigureAwait(false);
 					break;
 
 				case "guild_sync":
 					gid = (ulong)dat["id"];
 					await this.OnGuildSyncEventAsync(this.GuildsInternal[gid], (bool)dat["large"], (JArray)dat["members"], dat["presences"].ToDiscordObject<IEnumerable<DiscordPresence>>()).ConfigureAwait(false);
 					break;
 
 				case "guild_emojis_update":
 					gid = (ulong)dat["guild_id"];
 					var ems = dat["emojis"].ToObject<IEnumerable<DiscordEmoji>>();
 					await this.OnGuildEmojisUpdateEventAsync(this.GuildsInternal[gid], ems).ConfigureAwait(false);
 					break;
 
 				case "guild_stickers_update":
 					gid = (ulong)dat["guild_id"];
 					var strs = dat["stickers"].ToDiscordObject<IEnumerable<DiscordSticker>>();
 					await this.OnStickersUpdatedAsync(strs, gid).ConfigureAwait(false);
 					break;
 
 				case "guild_integrations_update":
 					gid = (ulong)dat["guild_id"];
 
 					// discord fires this event inconsistently if the current user leaves a guild.
 					if (!this.GuildsInternal.ContainsKey(gid))
 						return;
 
 					await this.OnGuildIntegrationsUpdateEventAsync(this.GuildsInternal[gid]).ConfigureAwait(false);
 					break;
 
 				case "guild_join_request_create":
 					break;
 
 				case "guild_join_request_update":
 					break;
 
 				case "guild_join_request_delete":
 					break;
 
 				#endregion
 
 				#region Guild Ban
 
 				case "guild_ban_add":
 					usr = dat["user"].ToObject<TransportUser>();
 					gid = (ulong)dat["guild_id"];
 					await this.OnGuildBanAddEventAsync(usr, this.GuildsInternal[gid]).ConfigureAwait(false);
 					break;
 
 				case "guild_ban_remove":
 					usr = dat["user"].ToObject<TransportUser>();
 					gid = (ulong)dat["guild_id"];
 					await this.OnGuildBanRemoveEventAsync(usr, this.GuildsInternal[gid]).ConfigureAwait(false);
 					break;
 
 				#endregion
 
 				#region Guild Event
 
 				case "guild_scheduled_event_create":
 					gse = dat.ToObject<DiscordScheduledEvent>();
 					gid = (ulong)dat["guild_id"];
 					await this.OnGuildScheduledEventCreateEventAsync(gse, this.GuildsInternal[gid]).ConfigureAwait(false);
 					break;
 
 				case "guild_scheduled_event_update":
 					gse = dat.ToObject<DiscordScheduledEvent>();
 					gid = (ulong)dat["guild_id"];
 					await this.OnGuildScheduledEventUpdateEventAsync(gse, this.GuildsInternal[gid]).ConfigureAwait(false);
 					break;
 
 				case "guild_scheduled_event_delete":
 					gse = dat.ToObject<DiscordScheduledEvent>();
 					gid = (ulong)dat["guild_id"];
 					await this.OnGuildScheduledEventDeleteEventAsync(gse, this.GuildsInternal[gid]).ConfigureAwait(false);
 					break;
 
 				case "guild_scheduled_event_user_add":
 					gid = (ulong)dat["guild_id"];
 					uid = (ulong)dat["user_id"];
 					await this.OnGuildScheduledEventUserAddedEventAsync((ulong)dat["guild_scheduled_event_id"], uid, this.GuildsInternal[gid]).ConfigureAwait(false);
 					break;
 
 				case "guild_scheduled_event_user_remove":
 					gid = (ulong)dat["guild_id"];
 					uid = (ulong)dat["user_id"];
 					await this.OnGuildScheduledEventUserRemovedEventAsync((ulong)dat["guild_scheduled_event_id"], uid, this.GuildsInternal[gid]).ConfigureAwait(false);
 					break;
 
 				#endregion
 
 				#region Guild Integration
 
 				case "integration_create":
 					gid = (ulong)dat["guild_id"];
 					itg = dat.ToObject<DiscordIntegration>();
 
 					// discord fires this event inconsistently if the current user leaves a guild.
 					if (!this.GuildsInternal.ContainsKey(gid))
 						return;
 
 					await this.OnGuildIntegrationCreateEventAsync(this.GuildsInternal[gid], itg).ConfigureAwait(false);
 					break;
 
 				case "integration_update":
 					gid = (ulong)dat["guild_id"];
 					itg = dat.ToObject<DiscordIntegration>();
 
 					// discord fires this event inconsistently if the current user leaves a guild.
 					if (!this.GuildsInternal.ContainsKey(gid))
 						return;
 
 					await this.OnGuildIntegrationUpdateEventAsync(this.GuildsInternal[gid], itg).ConfigureAwait(false);
 					break;
 
 				case "integration_delete":
 					gid = (ulong)dat["guild_id"];
 
 					// discord fires this event inconsistently if the current user leaves a guild.
 					if (!this.GuildsInternal.ContainsKey(gid))
 						return;
 
 					await this.OnGuildIntegrationDeleteEventAsync(this.GuildsInternal[gid], (ulong)dat["id"], (ulong?)dat["application_id"]).ConfigureAwait(false);
 					break;
 				#endregion
 
 				#region Guild Member
 
 				case "guild_member_add":
 					gid = (ulong)dat["guild_id"];
 					await this.OnGuildMemberAddEventAsync(dat.ToObject<TransportMember>(), this.GuildsInternal[gid]).ConfigureAwait(false);
 					break;
 
 				case "guild_member_remove":
 					gid = (ulong)dat["guild_id"];
 					usr = dat["user"].ToObject<TransportUser>();
 
 					if (!this.GuildsInternal.ContainsKey(gid))
 					{
 						// discord fires this event inconsistently if the current user leaves a guild.
 						if (usr.Id != this.CurrentUser.Id)
 							this.Logger.LogError(LoggerEvents.WebSocketReceive, "Could not find {0} in guild cache", gid);
 						return;
 					}
 
 					await this.OnGuildMemberRemoveEventAsync(usr, this.GuildsInternal[gid]).ConfigureAwait(false);
 					break;
 
 				case "guild_member_update":
 					gid = (ulong)dat["guild_id"];
 					await this.OnGuildMemberUpdateEventAsync(dat.ToDiscordObject<TransportMember>(), this.GuildsInternal[gid], dat["roles"].ToObject<IEnumerable<ulong>>(), (string)dat["nick"], (bool?)dat["pending"]).ConfigureAwait(false);
 					break;
 
 				case "guild_members_chunk":
 					await this.OnGuildMembersChunkEventAsync(dat).ConfigureAwait(false);
 					break;
 
 				#endregion
 
 				#region Guild Role
 
 				case "guild_role_create":
 					gid = (ulong)dat["guild_id"];
 					await this.OnGuildRoleCreateEventAsync(dat["role"].ToObject<DiscordRole>(), this.GuildsInternal[gid]).ConfigureAwait(false);
 					break;
 
 				case "guild_role_update":
 					gid = (ulong)dat["guild_id"];
 					await this.OnGuildRoleUpdateEventAsync(dat["role"].ToObject<DiscordRole>(), this.GuildsInternal[gid]).ConfigureAwait(false);
 					break;
 
 				case "guild_role_delete":
 					gid = (ulong)dat["guild_id"];
 					await this.OnGuildRoleDeleteEventAsync((ulong)dat["role_id"], this.GuildsInternal[gid]).ConfigureAwait(false);
 					break;
 
 				#endregion
 
 				#region Invite
 
 				case "invite_create":
 					gid = (ulong)dat["guild_id"];
 					cid = (ulong)dat["channel_id"];
 					await this.OnInviteCreateEventAsync(cid, gid, dat.ToObject<DiscordInvite>()).ConfigureAwait(false);
 					break;
 
 				case "invite_delete":
 					gid = (ulong)dat["guild_id"];
 					cid = (ulong)dat["channel_id"];
 					await this.OnInviteDeleteEventAsync(cid, gid, dat).ConfigureAwait(false);
 					break;
 
 				#endregion
 
 				#region Message
 
 				case "message_ack":
 					cid = (ulong)dat["channel_id"];
 					var mid = (ulong)dat["message_id"];
 					await this.OnMessageAckEventAsync(this.InternalGetCachedChannel(cid), mid).ConfigureAwait(false);
 					break;
 
 				case "message_create":
 					rawMbr = dat["member"];
 
 					if (rawMbr != null)
 						mbr = rawMbr.ToObject<TransportMember>();
 
 					if (rawRefMsg != null && rawRefMsg.HasValues)
 					{
 						if (rawRefMsg.SelectToken("author") != null)
 						{
 							refUsr = rawRefMsg.SelectToken("author").ToObject<TransportUser>();
 						}
 
 						if (rawRefMsg.SelectToken("member") != null)
 						{
 							refMbr = rawRefMsg.SelectToken("member").ToObject<TransportMember>();
 						}
 					}
 
 					await this.OnMessageCreateEventAsync(dat.ToDiscordObject<DiscordMessage>(), dat["author"].ToObject<TransportUser>(), mbr, refUsr, refMbr).ConfigureAwait(false);
 					break;
 
 				case "message_update":
 					rawMbr = dat["member"];
 
 					if (rawMbr != null)
 						mbr = rawMbr.ToObject<TransportMember>();
 
 					if (rawRefMsg != null && rawRefMsg.HasValues)
 					{
 						if (rawRefMsg.SelectToken("author") != null)
 						{
 							refUsr = rawRefMsg.SelectToken("author").ToObject<TransportUser>();
 						}
 
 						if (rawRefMsg.SelectToken("member") != null)
 						{
 							refMbr = rawRefMsg.SelectToken("member").ToObject<TransportMember>();
 						}
 					}
 
 					await this.OnMessageUpdateEventAsync(dat.ToDiscordObject<DiscordMessage>(), dat["author"]?.ToObject<TransportUser>(), mbr, refUsr, refMbr).ConfigureAwait(false);
 					break;
 
 				// delete event does *not* include message object
 				case "message_delete":
 					await this.OnMessageDeleteEventAsync((ulong)dat["id"], (ulong)dat["channel_id"], (ulong?)dat["guild_id"]).ConfigureAwait(false);
 					break;
 
 				case "message_delete_bulk":
 					await this.OnMessageBulkDeleteEventAsync(dat["ids"].ToObject<ulong[]>(), (ulong)dat["channel_id"], (ulong?)dat["guild_id"]).ConfigureAwait(false);
 					break;
 
 				#endregion
 
 				#region Message Reaction
 
 				case "message_reaction_add":
 					rawMbr = dat["member"];
 
 					if (rawMbr != null)
 						mbr = rawMbr.ToObject<TransportMember>();
 
 					await this.OnMessageReactionAddAsync((ulong)dat["user_id"], (ulong)dat["message_id"], (ulong)dat["channel_id"], (ulong?)dat["guild_id"], mbr, dat["emoji"].ToObject<DiscordEmoji>()).ConfigureAwait(false);
 					break;
 
 				case "message_reaction_remove":
 					await this.OnMessageReactionRemoveAsync((ulong)dat["user_id"], (ulong)dat["message_id"], (ulong)dat["channel_id"], (ulong?)dat["guild_id"], dat["emoji"].ToObject<DiscordEmoji>()).ConfigureAwait(false);
 					break;
 
 				case "message_reaction_remove_all":
 					await this.OnMessageReactionRemoveAllAsync((ulong)dat["message_id"], (ulong)dat["channel_id"], (ulong?)dat["guild_id"]).ConfigureAwait(false);
 					break;
 
 				case "message_reaction_remove_emoji":
 					await this.OnMessageReactionRemoveEmojiAsync((ulong)dat["message_id"], (ulong)dat["channel_id"], (ulong)dat["guild_id"], dat["emoji"]).ConfigureAwait(false);
 					break;
 
 				#endregion
 
 				#region Stage Instance
 
 				case "stage_instance_create":
 					stg = dat.ToObject<DiscordStageInstance>();
 					await this.OnStageInstanceCreateEventAsync(stg).ConfigureAwait(false);
 					break;
 
 				case "stage_instance_update":
 					stg = dat.ToObject<DiscordStageInstance>();
 					await this.OnStageInstanceUpdateEventAsync(stg).ConfigureAwait(false);
 					break;
 
 				case "stage_instance_delete":
 					stg = dat.ToObject<DiscordStageInstance>();
 					await this.OnStageInstanceDeleteEventAsync(stg).ConfigureAwait(false);
 					break;
 
 				#endregion
 
 				#region Thread
 
 				case "thread_create":
 					trd = dat.ToObject<DiscordThreadChannel>();
 					await this.OnThreadCreateEventAsync(trd).ConfigureAwait(false);
 					break;
 
 				case "thread_update":
 					trd = dat.ToObject<DiscordThreadChannel>();
 					await this.OnThreadUpdateEventAsync(trd).ConfigureAwait(false);
 					break;
 
 				case "thread_delete":
 					trd = dat.ToObject<DiscordThreadChannel>();
 					await this.OnThreadDeleteEventAsync(trd).ConfigureAwait(false);
 					break;
 
 				case "thread_list_sync":
 					gid = (ulong)dat["guild_id"]; //get guild
 					await this.OnThreadListSyncEventAsync(this.GuildsInternal[gid], dat["channel_ids"].ToObject<IReadOnlyList<ulong?>>(), dat["threads"].ToObject<IReadOnlyList<DiscordThreadChannel>>(), dat["members"].ToObject<IReadOnlyList<DiscordThreadChannelMember>>()).ConfigureAwait(false);
 					break;
 
 				case "thread_member_update":
 					trdm = dat.ToObject<DiscordThreadChannelMember>();
 					await this.OnThreadMemberUpdateEventAsync(trdm).ConfigureAwait(false);
 					break;
 
 				case "thread_members_update":
 					gid = (ulong)dat["guild_id"];
 
 					await this.OnThreadMembersUpdateEventAsync(this.GuildsInternal[gid], (ulong)dat["id"], (JArray)dat["added_members"], (JArray)dat["removed_member_ids"], (int)dat["member_count"]).ConfigureAwait(false);
 					break;
 
 				#endregion
 
 				#region Activities
 				case "embedded_activity_update":
 					gid = (ulong)dat["guild_id"];
 					cid = (ulong)dat["channel_id"];
 					await this.OnEmbeddedActivityUpdateAsync((JObject)dat["embedded_activity"], this.GuildsInternal[gid], cid, (JArray)dat["users"], (ulong)dat["embedded_activity"]["application_id"]).ConfigureAwait(false);
 					break;
 				#endregion
 
 				#region User/Presence Update
 
 				case "presence_update":
 					await this.OnPresenceUpdateEventAsync(dat, (JObject)dat["user"]).ConfigureAwait(false);
 					break;
 
 				case "user_settings_update":
 					await this.OnUserSettingsUpdateEventAsync(dat.ToObject<TransportUser>()).ConfigureAwait(false);
 					break;
 
 				case "user_update":
 					await this.OnUserUpdateEventAsync(dat.ToObject<TransportUser>()).ConfigureAwait(false);
 					break;
 
 				#endregion
 
 				#region Voice
 
 				case "voice_state_update":
 					await this.OnVoiceStateUpdateEventAsync(dat).ConfigureAwait(false);
 					break;
 
 				case "voice_server_update":
 					gid = (ulong)dat["guild_id"];
 					await this.OnVoiceServerUpdateEventAsync((string)dat["endpoint"], (string)dat["token"], this.GuildsInternal[gid]).ConfigureAwait(false);
 					break;
 
 				#endregion
 
 				#region Interaction/Integration/Application
 
 				case "interaction_create":
 					rawMbr = dat["member"];
 
 					if (rawMbr != null)
 					{
 						mbr = dat["member"].ToObject<TransportMember>();
 						usr = mbr.User;
 					}
 					else
 					{
 						usr = dat["user"].ToObject<TransportUser>();
 					}
 
 					cid = (ulong)dat["channel_id"];
 					await this.OnInteractionCreateAsync((ulong?)dat["guild_id"], cid, usr, mbr, dat.ToDiscordObject<DiscordInteraction>()).ConfigureAwait(false);
 					break;
 
 				case "application_command_create":
 					await this.OnApplicationCommandCreateAsync(dat.ToObject<DiscordApplicationCommand>(), (ulong?)dat["guild_id"]).ConfigureAwait(false);
 					break;
 
 				case "application_command_update":
 					await this.OnApplicationCommandUpdateAsync(dat.ToObject<DiscordApplicationCommand>(), (ulong?)dat["guild_id"]).ConfigureAwait(false);
 					break;
 
 				case "application_command_delete":
 					await this.OnApplicationCommandDeleteAsync(dat.ToObject<DiscordApplicationCommand>(), (ulong?)dat["guild_id"]).ConfigureAwait(false);
 					break;
 
 				case "guild_application_command_counts_update":
 					var counts = dat["application_command_counts"];
 					await this.OnGuildApplicationCommandCountsUpdateAsync((int)counts["1"], (int)counts["2"], (int)counts["3"], (ulong)dat["guild_id"]).ConfigureAwait(false);
 					break;
 
 				case "guild_application_command_index_update":
 					// TODO: Implement.
 					break;
 
 				case "application_command_permissions_update":
 					var aid = (ulong)dat["application_id"];
 					if (aid != this.CurrentApplication.Id)
 						return;
 
 					var pms = dat["permissions"].ToObject<IEnumerable<DiscordApplicationCommandPermission>>();
 					gid = (ulong)dat["guild_id"];
 					await this.OnApplicationCommandPermissionsUpdateAsync(pms, (ulong)dat["id"], gid, aid).ConfigureAwait(false);
 					break;
 
 				#endregion
 
 				#region Misc
 
 				case "gift_code_update": //Not supposed to be dispatched to bots
 					break;
 
 				case "typing_start":
 					cid = (ulong)dat["channel_id"];
 					rawMbr = dat["member"];
 
 					if (rawMbr != null)
 						mbr = rawMbr.ToObject<TransportMember>();
 
 					await this.OnTypingStartEventAsync((ulong)dat["user_id"], cid, this.InternalGetCachedChannel(cid), (ulong?)dat["guild_id"], Utilities.GetDateTimeOffset((long)dat["timestamp"]), mbr).ConfigureAwait(false);
 					break;
 
 				case "webhooks_update":
 					gid = (ulong)dat["guild_id"];
 					cid = (ulong)dat["channel_id"];
 					await this.OnWebhooksUpdateAsync(this.GuildsInternal[gid].GetChannel(cid), this.GuildsInternal[gid]).ConfigureAwait(false);
 					break;
 
 				default:
 					await this.OnUnknownEventAsync(payload).ConfigureAwait(false);
 					this.Logger.LogWarning(LoggerEvents.WebSocketReceive, "Unknown event: {0}\npayload: {1}", payload.EventName, payload.Data);
 					break;
 
 					#endregion
 			}
 		}
 
 		#endregion
 
 		#region Events
 
 		#region Gateway
 
 		/// <summary>
 		/// Handles the ready event.
 		/// </summary>
 		/// <param name="ready">The ready payload.</param>
 		/// <param name="rawGuilds">The raw guilds.</param>
 		internal async Task OnReadyEventAsync(ReadyPayload ready, JArray rawGuilds)
 		{
 			//ready.CurrentUser.Discord = this;
 
 			var rusr = ready.CurrentUser;
 			this.CurrentUser.Username = rusr.Username;
 			this.CurrentUser.Discriminator = rusr.Discriminator;
 			this.CurrentUser.AvatarHash = rusr.AvatarHash;
 			this.CurrentUser.MfaEnabled = rusr.MfaEnabled;
 			this.CurrentUser.Verified = rusr.Verified;
 			this.CurrentUser.IsBot = rusr.IsBot;
 			this.CurrentUser.Flags = rusr.Flags;
 
 			this.GatewayVersion = ready.GatewayVersion;
 			this._sessionId = ready.SessionId;
 			var rawGuildIndex = rawGuilds.ToDictionary(xt => (ulong)xt["id"], xt => (JObject)xt);
 
 			this.GuildsInternal.Clear();
 			foreach (var guild in ready.Guilds)
 			{
 				guild.Discord = this;
 
 				if (guild.ChannelsInternal == null)
 					guild.ChannelsInternal = new ConcurrentDictionary<ulong, DiscordChannel>();
 
 				foreach (var xc in guild.Channels.Values)
 				{
 					xc.GuildId = guild.Id;
 					xc.Discord = this;
 					foreach (var xo in xc.PermissionOverwritesInternal)
 					{
 						xo.Discord = this;
 						xo.ChannelId = xc.Id;
 					}
 				}
 
 				if (guild.RolesInternal == null)
 					guild.RolesInternal = new ConcurrentDictionary<ulong, DiscordRole>();
 
 				foreach (var xr in guild.Roles.Values)
 				{
 					xr.Discord = this;
 					xr.GuildId = guild.Id;
 				}
 
 				var rawGuild = rawGuildIndex[guild.Id];
 				var rawMembers = (JArray)rawGuild["members"];
 
 				if (guild.MembersInternal != null)
 					guild.MembersInternal.Clear();
 				else
 					guild.MembersInternal = new ConcurrentDictionary<ulong, DiscordMember>();
 
 				if (rawMembers != null)
 				{
 					foreach (var xj in rawMembers)
 					{
 						var xtm = xj.ToObject<TransportMember>();
 
 						var xu = new DiscordUser(xtm.User) { Discord = this };
 						xu = this.UserCache.AddOrUpdate(xtm.User.Id, xu, (id, old) =>
 						{
 							old.Username = xu.Username;
 							old.Discriminator = xu.Discriminator;
 							old.AvatarHash = xu.AvatarHash;
 							return old;
 						});
 
 						guild.MembersInternal[xtm.User.Id] = new DiscordMember(xtm) { Discord = this, GuildId = guild.Id };
 					}
 				}
 
 				if (guild.EmojisInternal == null)
 					guild.EmojisInternal = new ConcurrentDictionary<ulong, DiscordEmoji>();
 
 				foreach (var xe in guild.Emojis.Values)
 					xe.Discord = this;
 
 				if (guild.StickersInternal == null)
 					guild.StickersInternal = new ConcurrentDictionary<ulong, DiscordSticker>();
 
 				foreach (var xs in guild.Stickers.Values)
 					xs.Discord = this;
 
 				if (guild.VoiceStatesInternal == null)
 					guild.VoiceStatesInternal = new ConcurrentDictionary<ulong, DiscordVoiceState>();
 
 				foreach (var xvs in guild.VoiceStates.Values)
 					xvs.Discord = this;
 
 				if (guild.ThreadsInternal == null)
 					guild.ThreadsInternal = new ConcurrentDictionary<ulong, DiscordThreadChannel>();
 
 				foreach (var xt in guild.ThreadsInternal.Values)
 					xt.Discord = this;
 
 				if (guild.StageInstancesInternal == null)
 					guild.StageInstancesInternal = new ConcurrentDictionary<ulong, DiscordStageInstance>();
 
 				foreach (var xsi in guild.StageInstancesInternal.Values)
 					xsi.Discord = this;
 
 				if (guild.ScheduledEventsInternal == null)
 					guild.ScheduledEventsInternal = new ConcurrentDictionary<ulong, DiscordScheduledEvent>();
 
 				foreach (var xse in guild.ScheduledEventsInternal.Values)
 					xse.Discord = this;
 
 				this.GuildsInternal[guild.Id] = guild;
 			}
 
 			await this._ready.InvokeAsync(this, new ReadyEventArgs(this.ServiceProvider)).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the resumed event.
 		/// </summary>
 		internal Task OnResumedAsync()
 		{
 			this.Logger.LogInformation(LoggerEvents.SessionUpdate, "Session resumed");
 			return this._resumed.InvokeAsync(this, new ReadyEventArgs(this.ServiceProvider));
 		}
 
 		#endregion
 
 		#region Channel
 
 		/// <summary>
 		/// Handles the channel create event.
 		/// </summary>
 		/// <param name="channel">The channel.</param>
 		internal async Task OnChannelCreateEventAsync(DiscordChannel channel)
 		{
 			channel.Discord = this;
 			foreach (var xo in channel.PermissionOverwritesInternal)
 			{
 				xo.Discord = this;
 				xo.ChannelId = channel.Id;
 			}
 
 			this.GuildsInternal[channel.GuildId.Value].ChannelsInternal[channel.Id] = channel;
 
 			/*if (this.Configuration.AutoRefreshChannelCache)
             {
                 await this.RefreshChannelsAsync(channel.Guild.Id);
             }*/
 
 			await this._channelCreated.InvokeAsync(this, new ChannelCreateEventArgs(this.ServiceProvider) { Channel = channel, Guild = channel.Guild }).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the channel update event.
 		/// </summary>
 		/// <param name="channel">The channel.</param>
 		internal async Task OnChannelUpdateEventAsync(DiscordChannel channel)
 		{
 			if (channel == null)
 				return;
 
 			channel.Discord = this;
 
 			var gld = channel.Guild;
 
 			var channelNew = this.InternalGetCachedChannel(channel.Id);
 			DiscordChannel channelOld = null;
 
 			if (channelNew != null)
 			{
 				channelOld = new DiscordChannel
 				{
 					Bitrate = channelNew.Bitrate,
 					Discord = this,
 					GuildId = channelNew.GuildId,
 					Id = channelNew.Id,
 					LastMessageId = channelNew.LastMessageId,
 					Name = channelNew.Name,
 					PermissionOverwritesInternal = new List<DiscordOverwrite>(channelNew.PermissionOverwritesInternal),
 					Position = channelNew.Position,
 					Topic = channelNew.Topic,
 					Type = channelNew.Type,
 					UserLimit = channelNew.UserLimit,
 					ParentId = channelNew.ParentId,
 					IsNsfw = channelNew.IsNsfw,
 					PerUserRateLimit = channelNew.PerUserRateLimit,
 					RtcRegionId = channelNew.RtcRegionId,
 					QualityMode = channelNew.QualityMode,
 					DefaultAutoArchiveDuration = channelNew.DefaultAutoArchiveDuration
 				};
 
 				channelNew.Bitrate = channel.Bitrate;
 				channelNew.Name = channel.Name;
 				channelNew.Position = channel.Position;
 				channelNew.Topic = channel.Topic;
 				channelNew.UserLimit = channel.UserLimit;
 				channelNew.ParentId = channel.ParentId;
 				channelNew.IsNsfw = channel.IsNsfw;
 				channelNew.PerUserRateLimit = channel.PerUserRateLimit;
 				channelNew.Type = channel.Type;
 				channelNew.RtcRegionId = channel.RtcRegionId;
 				channelNew.QualityMode = channel.QualityMode;
 				channelNew.DefaultAutoArchiveDuration = channel.DefaultAutoArchiveDuration;
 
 				channelNew.PermissionOverwritesInternal.Clear();
 
 				foreach (var po in channel.PermissionOverwritesInternal)
 				{
 					po.Discord = this;
 					po.ChannelId = channel.Id;
 				}
 
 				channelNew.PermissionOverwritesInternal.AddRange(channel.PermissionOverwritesInternal);
 
 				if (this.Configuration.AutoRefreshChannelCache && gld != null)
 				{
 					await this.RefreshChannelsAsync(channel.Guild.Id);
 				}
 			}
 			else if (gld != null)
 			{
 				gld.ChannelsInternal[channel.Id] = channel;
 
 				if (this.Configuration.AutoRefreshChannelCache)
 				{
 					await this.RefreshChannelsAsync(channel.Guild.Id);
 				}
 			}
 
 			await this._channelUpdated.InvokeAsync(this, new ChannelUpdateEventArgs(this.ServiceProvider) { ChannelAfter = channelNew, Guild = gld, ChannelBefore = channelOld }).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the channel delete event.
 		/// </summary>
 		/// <param name="channel">The channel.</param>
 		internal async Task OnChannelDeleteEventAsync(DiscordChannel channel)
 		{
 			if (channel == null)
 				return;
 
 			channel.Discord = this;
 
 			//if (channel.IsPrivate)
 			if (channel.Type == ChannelType.Group || channel.Type == ChannelType.Private)
 			{
 				var dmChannel = channel as DiscordDmChannel;
 
 				await this._dmChannelDeleted.InvokeAsync(this, new DmChannelDeleteEventArgs(this.ServiceProvider) { Channel = dmChannel }).ConfigureAwait(false);
 			}
 			else
 			{
 				var gld = channel.Guild;
 
 				if (gld.ChannelsInternal.TryRemove(channel.Id, out var cachedChannel)) channel = cachedChannel;
 
 				if (this.Configuration.AutoRefreshChannelCache)
 				{
 					await this.RefreshChannelsAsync(channel.Guild.Id);
 				}
 
 				await this._channelDeleted.InvokeAsync(this, new ChannelDeleteEventArgs(this.ServiceProvider) { Channel = channel, Guild = gld }).ConfigureAwait(false);
 			}
 		}
 
 		/// <summary>
 		/// Refreshes the channels.
 		/// </summary>
 		/// <param name="guildId">The guild id.</param>
 		internal async Task RefreshChannelsAsync(ulong guildId)
 		{
 			var guild = this.InternalGetCachedGuild(guildId);
 			var channels = await this.ApiClient.GetGuildChannelsAsync(guildId);
 			guild.ChannelsInternal.Clear();
-			foreach (var channel in channels.ToList())
+			foreach (var channel in channels)
 			{
 				channel.Discord = this;
 				foreach (var xo in channel.PermissionOverwritesInternal)
 				{
 					xo.Discord = this;
 					xo.ChannelId = channel.Id;
 				}
 				guild.ChannelsInternal[channel.Id] = channel;
 			}
 		}
 
 		/// <summary>
 		/// Handles the channel pins update event.
 		/// </summary>
 		/// <param name="guildId">The optional guild id.</param>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="lastPinTimestamp">The optional last pin timestamp.</param>
 		internal async Task OnChannelPinsUpdateAsync(ulong? guildId, ulong channelId, DateTimeOffset? lastPinTimestamp)
 		{
 			var guild = this.InternalGetCachedGuild(guildId);
 			var channel = this.InternalGetCachedChannel(channelId) ?? this.InternalGetCachedThread(channelId);
 
 			var ea = new ChannelPinsUpdateEventArgs(this.ServiceProvider)
 			{
 				Guild = guild,
 				Channel = channel,
 				LastPinTimestamp = lastPinTimestamp
 			};
 			await this._channelPinsUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		#endregion
 
 		#region Guild
 
 		/// <summary>
 		/// Handles the guild create event.
 		/// </summary>
 		/// <param name="guild">The guild.</param>
 		/// <param name="rawMembers">The raw members.</param>
 		/// <param name="presences">The presences.</param>
 		internal async Task OnGuildCreateEventAsync(DiscordGuild guild, JArray rawMembers, IEnumerable<DiscordPresence> presences)
 		{
 			if (presences != null)
 			{
 				foreach (var xp in presences)
 				{
 					xp.Discord = this;
 					xp.GuildId = guild.Id;
 					xp.Activity = new DiscordActivity(xp.RawActivity);
 					if (xp.RawActivities != null)
 					{
 						xp.InternalActivities = xp.RawActivities
 							.Select(x => new DiscordActivity(x)).ToArray();
 					}
 					this.PresencesInternal[xp.InternalUser.Id] = xp;
 				}
 			}
 
 			var exists = this.GuildsInternal.TryGetValue(guild.Id, out var foundGuild);
 
 			guild.Discord = this;
 			guild.IsUnavailable = false;
 			var eventGuild = guild;
 			if (exists)
 				guild = foundGuild;
 
 			if (guild.ChannelsInternal == null)
 				guild.ChannelsInternal = new ConcurrentDictionary<ulong, DiscordChannel>();
 			if (guild.ThreadsInternal == null)
 				guild.ThreadsInternal = new ConcurrentDictionary<ulong, DiscordThreadChannel>();
 			if (guild.RolesInternal == null)
 				guild.RolesInternal = new ConcurrentDictionary<ulong, DiscordRole>();
 			if (guild.ThreadsInternal == null)
 				guild.ThreadsInternal = new ConcurrentDictionary<ulong, DiscordThreadChannel>();
 			if (guild.StickersInternal == null)
 				guild.StickersInternal = new ConcurrentDictionary<ulong, DiscordSticker>();
 			if (guild.EmojisInternal == null)
 				guild.EmojisInternal = new ConcurrentDictionary<ulong, DiscordEmoji>();
 			if (guild.VoiceStatesInternal == null)
 				guild.VoiceStatesInternal = new ConcurrentDictionary<ulong, DiscordVoiceState>();
 			if (guild.MembersInternal == null)
 				guild.MembersInternal = new ConcurrentDictionary<ulong, DiscordMember>();
 			if (guild.ScheduledEventsInternal == null)
 				guild.ScheduledEventsInternal = new ConcurrentDictionary<ulong, DiscordScheduledEvent>();
 
 			this.UpdateCachedGuild(eventGuild, rawMembers);
 
 			guild.JoinedAt = eventGuild.JoinedAt;
 			guild.IsLarge = eventGuild.IsLarge;
 			guild.MemberCount = Math.Max(eventGuild.MemberCount, guild.MembersInternal.Count);
 			guild.IsUnavailable = eventGuild.IsUnavailable;
 			guild.PremiumSubscriptionCount = eventGuild.PremiumSubscriptionCount;
 			guild.PremiumTier = eventGuild.PremiumTier;
 			guild.BannerHash = eventGuild.BannerHash;
 			guild.VanityUrlCode = eventGuild.VanityUrlCode;
 			guild.Description = eventGuild.Description;
 			guild.IsNsfw = eventGuild.IsNsfw;
 
 			foreach (var kvp in eventGuild.VoiceStatesInternal) guild.VoiceStatesInternal[kvp.Key] = kvp.Value;
 			foreach (var kvp in eventGuild.ChannelsInternal) guild.ChannelsInternal[kvp.Key] = kvp.Value;
 			foreach (var kvp in eventGuild.RolesInternal) guild.RolesInternal[kvp.Key] = kvp.Value;
 			foreach (var kvp in eventGuild.EmojisInternal) guild.EmojisInternal[kvp.Key] = kvp.Value;
 			foreach (var kvp in eventGuild.ThreadsInternal) guild.ThreadsInternal[kvp.Key] = kvp.Value;
 			foreach (var kvp in eventGuild.StickersInternal) guild.StickersInternal[kvp.Key] = kvp.Value;
 			foreach (var kvp in eventGuild.StageInstancesInternal) guild.StageInstancesInternal[kvp.Key] = kvp.Value;
 			foreach (var kvp in eventGuild.ScheduledEventsInternal) guild.ScheduledEventsInternal[kvp.Key] = kvp.Value;
 
 			foreach (var xc in guild.ChannelsInternal.Values)
 			{
 				xc.GuildId = guild.Id;
 				xc.Discord = this;
 				foreach (var xo in xc.PermissionOverwritesInternal)
 				{
 					xo.Discord = this;
 					xo.ChannelId = xc.Id;
 				}
 			}
 			foreach (var xt in guild.ThreadsInternal.Values)
 			{
 				xt.GuildId = guild.Id;
 				xt.Discord = this;
 			}
 			foreach (var xe in guild.EmojisInternal.Values)
 				xe.Discord = this;
 			foreach (var xs in guild.StickersInternal.Values)
 				xs.Discord = this;
 			foreach (var xvs in guild.VoiceStatesInternal.Values)
 				xvs.Discord = this;
 			foreach (var xsi in guild.StageInstancesInternal.Values)
 			{
 				xsi.Discord = this;
 				xsi.GuildId = guild.Id;
 			}
 			foreach (var xr in guild.RolesInternal.Values)
 			{
 				xr.Discord = this;
 				xr.GuildId = guild.Id;
 			}
 			foreach (var xse in guild.ScheduledEventsInternal.Values)
 			{
 				xse.Discord = this;
 				xse.GuildId = guild.Id;
 				if (xse.Creator != null)
 					xse.Creator.Discord = this;
 			}
 
 			var old = Volatile.Read(ref this._guildDownloadCompleted);
 			var dcompl = this.GuildsInternal.Values.All(xg => !xg.IsUnavailable);
 			Volatile.Write(ref this._guildDownloadCompleted, dcompl);
 
 			if (exists)
 				await this._guildAvailable.InvokeAsync(this, new GuildCreateEventArgs(this.ServiceProvider) { Guild = guild }).ConfigureAwait(false);
 			else
 				await this._guildCreated.InvokeAsync(this, new GuildCreateEventArgs(this.ServiceProvider) { Guild = guild }).ConfigureAwait(false);
 
 			if (dcompl && !old)
 				await this._guildDownloadCompletedEv.InvokeAsync(this, new GuildDownloadCompletedEventArgs(this.Guilds, this.ServiceProvider)).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the guild update event.
 		/// </summary>
 		/// <param name="guild">The guild.</param>
 		/// <param name="rawMembers">The raw members.</param>
 		internal async Task OnGuildUpdateEventAsync(DiscordGuild guild, JArray rawMembers)
 		{
 			DiscordGuild oldGuild;
 
 			if (!this.GuildsInternal.ContainsKey(guild.Id))
 			{
 				this.GuildsInternal[guild.Id] = guild;
 				oldGuild = null;
 			}
 			else
 			{
 				var gld = this.GuildsInternal[guild.Id];
 
 				oldGuild = new DiscordGuild
 				{
 					Discord = gld.Discord,
 					Name = gld.Name,
 					AfkChannelId = gld.AfkChannelId,
 					AfkTimeout = gld.AfkTimeout,
 					ApplicationId = gld.ApplicationId,
 					DefaultMessageNotifications = gld.DefaultMessageNotifications,
 					ExplicitContentFilter = gld.ExplicitContentFilter,
 					RawFeatures = gld.RawFeatures,
 					IconHash = gld.IconHash,
 					Id = gld.Id,
 					IsLarge = gld.IsLarge,
 					IsSynced = gld.IsSynced,
 					IsUnavailable = gld.IsUnavailable,
 					JoinedAt = gld.JoinedAt,
 					MemberCount = gld.MemberCount,
 					MaxMembers = gld.MaxMembers,
 					MaxPresences = gld.MaxPresences,
 					ApproximateMemberCount = gld.ApproximateMemberCount,
 					ApproximatePresenceCount = gld.ApproximatePresenceCount,
 					MaxVideoChannelUsers = gld.MaxVideoChannelUsers,
 					DiscoverySplashHash = gld.DiscoverySplashHash,
 					PreferredLocale = gld.PreferredLocale,
 					MfaLevel = gld.MfaLevel,
 					OwnerId = gld.OwnerId,
 					SplashHash = gld.SplashHash,
 					SystemChannelId = gld.SystemChannelId,
 					SystemChannelFlags = gld.SystemChannelFlags,
 					Description = gld.Description,
 					WidgetEnabled = gld.WidgetEnabled,
 					WidgetChannelId = gld.WidgetChannelId,
 					VerificationLevel = gld.VerificationLevel,
 					RulesChannelId = gld.RulesChannelId,
 					PublicUpdatesChannelId = gld.PublicUpdatesChannelId,
 					VoiceRegionId = gld.VoiceRegionId,
 					IsNsfw = gld.IsNsfw,
 					PremiumProgressBarEnabled = gld.PremiumProgressBarEnabled,
 					PremiumSubscriptionCount = gld.PremiumSubscriptionCount,
 					PremiumTier = gld.PremiumTier,
 					ChannelsInternal = new ConcurrentDictionary<ulong, DiscordChannel>(),
 					ThreadsInternal = new ConcurrentDictionary<ulong, DiscordThreadChannel>(),
 					EmojisInternal = new ConcurrentDictionary<ulong, DiscordEmoji>(),
 					StickersInternal = new ConcurrentDictionary<ulong, DiscordSticker>(),
 					MembersInternal = new ConcurrentDictionary<ulong, DiscordMember>(),
 					RolesInternal = new ConcurrentDictionary<ulong, DiscordRole>(),
 					StageInstancesInternal = new ConcurrentDictionary<ulong, DiscordStageInstance>(),
 					VoiceStatesInternal = new ConcurrentDictionary<ulong, DiscordVoiceState>(),
 					ScheduledEventsInternal = new ConcurrentDictionary<ulong, DiscordScheduledEvent>()
 				};
 
 				foreach (var kvp in gld.ChannelsInternal) oldGuild.ChannelsInternal[kvp.Key] = kvp.Value;
 				foreach (var kvp in gld.ThreadsInternal) oldGuild.ThreadsInternal[kvp.Key] = kvp.Value;
 				foreach (var kvp in gld.EmojisInternal) oldGuild.EmojisInternal[kvp.Key] = kvp.Value;
 				foreach (var kvp in gld.StickersInternal) oldGuild.StickersInternal[kvp.Key] = kvp.Value;
 				foreach (var kvp in gld.RolesInternal) oldGuild.RolesInternal[kvp.Key] = kvp.Value;
 				foreach (var kvp in gld.VoiceStatesInternal) oldGuild.VoiceStatesInternal[kvp.Key] = kvp.Value;
 				foreach (var kvp in gld.MembersInternal) oldGuild.MembersInternal[kvp.Key] = kvp.Value;
 				foreach (var kvp in gld.StageInstancesInternal) oldGuild.StageInstancesInternal[kvp.Key] = kvp.Value;
 				foreach (var kvp in gld.ScheduledEventsInternal) oldGuild.ScheduledEventsInternal[kvp.Key] = kvp.Value;
 			}
 
 			guild.Discord = this;
 			guild.IsUnavailable = false;
 			var eventGuild = guild;
 			guild = this.GuildsInternal[eventGuild.Id];
 
 			if (guild.ChannelsInternal == null)
 				guild.ChannelsInternal = new ConcurrentDictionary<ulong, DiscordChannel>();
 			if (guild.ThreadsInternal == null)
 				guild.ThreadsInternal = new ConcurrentDictionary<ulong, DiscordThreadChannel>();
 			if (guild.RolesInternal == null)
 				guild.RolesInternal = new ConcurrentDictionary<ulong, DiscordRole>();
 			if (guild.EmojisInternal == null)
 				guild.EmojisInternal = new ConcurrentDictionary<ulong, DiscordEmoji>();
 			if (guild.StickersInternal == null)
 				guild.StickersInternal = new ConcurrentDictionary<ulong, DiscordSticker>();
 			if (guild.VoiceStatesInternal == null)
 				guild.VoiceStatesInternal = new ConcurrentDictionary<ulong, DiscordVoiceState>();
 			if (guild.StageInstancesInternal == null)
 				guild.StageInstancesInternal = new ConcurrentDictionary<ulong, DiscordStageInstance>();
 			if (guild.MembersInternal == null)
 				guild.MembersInternal = new ConcurrentDictionary<ulong, DiscordMember>();
 			if (guild.ScheduledEventsInternal == null)
 				guild.ScheduledEventsInternal = new ConcurrentDictionary<ulong, DiscordScheduledEvent>();
 
 			this.UpdateCachedGuild(eventGuild, rawMembers);
 
 			foreach (var xc in guild.ChannelsInternal.Values)
 			{
 				xc.GuildId = guild.Id;
 				xc.Discord = this;
 				foreach (var xo in xc.PermissionOverwritesInternal)
 				{
 					xo.Discord = this;
 					xo.ChannelId = xc.Id;
 				}
 			}
 			foreach (var xc in guild.ThreadsInternal.Values)
 			{
 				xc.GuildId = guild.Id;
 				xc.Discord = this;
 			}
 			foreach (var xe in guild.EmojisInternal.Values)
 				xe.Discord = this;
 			foreach (var xs in guild.StickersInternal.Values)
 				xs.Discord = this;
 			foreach (var xvs in guild.VoiceStatesInternal.Values)
 				xvs.Discord = this;
 			foreach (var xr in guild.RolesInternal.Values)
 			{
 				xr.Discord = this;
 				xr.GuildId = guild.Id;
 			}
 			foreach (var xsi in guild.StageInstancesInternal.Values)
 			{
 				xsi.Discord = this;
 				xsi.GuildId = guild.Id;
 			}
 			foreach (var xse in guild.ScheduledEventsInternal.Values)
 			{
 				xse.Discord = this;
 				xse.GuildId = guild.Id;
 				if (xse.Creator != null)
 					xse.Creator.Discord = this;
 			}
 
 			await this._guildUpdated.InvokeAsync(this, new GuildUpdateEventArgs(this.ServiceProvider) { GuildBefore = oldGuild, GuildAfter = guild }).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the guild delete event.
 		/// </summary>
 		/// <param name="guild">The guild.</param>
 		internal async Task OnGuildDeleteEventAsync(DiscordGuild guild)
 		{
 			if (guild.IsUnavailable)
 			{
 				if (!this.GuildsInternal.TryGetValue(guild.Id, out var gld))
 					return;
 
 				gld.IsUnavailable = true;
 
 				await this._guildUnavailable.InvokeAsync(this, new GuildDeleteEventArgs(this.ServiceProvider) { Guild = guild, Unavailable = true }).ConfigureAwait(false);
 			}
 			else
 			{
 				if (!this.GuildsInternal.TryRemove(guild.Id, out var gld))
 					return;
 
 				await this._guildDeleted.InvokeAsync(this, new GuildDeleteEventArgs(this.ServiceProvider) { Guild = gld }).ConfigureAwait(false);
 			}
 		}
 
 		/// <summary>
 		/// Handles the guild sync event.
 		/// </summary>
 		/// <param name="guild">The guild.</param>
 		/// <param name="isLarge">Whether the guild is a large guild..</param>
 		/// <param name="rawMembers">The raw members.</param>
 		/// <param name="presences">The presences.</param>
 		internal async Task OnGuildSyncEventAsync(DiscordGuild guild, bool isLarge, JArray rawMembers, IEnumerable<DiscordPresence> presences)
 		{
 			presences = presences.Select(xp => { xp.Discord = this; xp.Activity = new DiscordActivity(xp.RawActivity); return xp; });
 			foreach (var xp in presences)
 				this.PresencesInternal[xp.InternalUser.Id] = xp;
 
 			guild.IsSynced = true;
 			guild.IsLarge = isLarge;
 
 			this.UpdateCachedGuild(guild, rawMembers);
 
 			await this._guildAvailable.InvokeAsync(this, new GuildCreateEventArgs(this.ServiceProvider) { Guild = guild }).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the guild emojis update event.
 		/// </summary>
 		/// <param name="guild">The guild.</param>
 		/// <param name="newEmojis">The new emojis.</param>
 		internal async Task OnGuildEmojisUpdateEventAsync(DiscordGuild guild, IEnumerable<DiscordEmoji> newEmojis)
 		{
 			var oldEmojis = new ConcurrentDictionary<ulong, DiscordEmoji>(guild.EmojisInternal);
 			guild.EmojisInternal.Clear();
 
 			foreach (var emoji in newEmojis)
 			{
 				emoji.Discord = this;
 				guild.EmojisInternal[emoji.Id] = emoji;
 			}
 
 			var ea = new GuildEmojisUpdateEventArgs(this.ServiceProvider)
 			{
 				Guild = guild,
 				EmojisAfter = guild.Emojis,
 				EmojisBefore = new ReadOnlyConcurrentDictionary<ulong, DiscordEmoji>(oldEmojis)
 			};
 			await this._guildEmojisUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the stickers updated.
 		/// </summary>
 		/// <param name="newStickers">The new stickers.</param>
 		/// <param name="guildId">The guild id.</param>
 		internal async Task OnStickersUpdatedAsync(IEnumerable<DiscordSticker> newStickers, ulong guildId)
 		{
 			var guild = this.InternalGetCachedGuild(guildId);
 			var oldStickers = new ConcurrentDictionary<ulong, DiscordSticker>(guild.StickersInternal);
 			guild.StickersInternal.Clear();
 
 			foreach (var nst in newStickers)
 			{
 				if (nst.User is not null)
 				{
 					nst.User.Discord = this;
 					this.UserCache.AddOrUpdate(nst.User.Id, nst.User, (old, @new) => @new);
 				}
 				nst.Discord = this;
 
 				guild.StickersInternal[nst.Id] = nst;
 			}
 
 			var sea = new GuildStickersUpdateEventArgs(this.ServiceProvider)
 			{
 				Guild = guild,
 				StickersBefore = oldStickers,
 				StickersAfter = guild.Stickers
 			};
 
 			await this._guildStickersUpdated.InvokeAsync(this, sea).ConfigureAwait(false);
 		}
 
 		#endregion
 
 		#region Guild Ban
 
 		/// <summary>
 		/// Handles the guild ban add event.
 		/// </summary>
 		/// <param name="user">The transport user.</param>
 		/// <param name="guild">The guild.</param>
 		internal async Task OnGuildBanAddEventAsync(TransportUser user, DiscordGuild guild)
 		{
 			var usr = new DiscordUser(user) { Discord = this };
 			usr = this.UserCache.AddOrUpdate(user.Id, usr, (id, old) =>
 			{
 				old.Username = usr.Username;
 				old.Discriminator = usr.Discriminator;
 				old.AvatarHash = usr.AvatarHash;
 				return old;
 			});
 
 			if (!guild.Members.TryGetValue(user.Id, out var mbr))
 				mbr = new DiscordMember(usr) { Discord = this, GuildId = guild.Id };
 			var ea = new GuildBanAddEventArgs(this.ServiceProvider)
 			{
 				Guild = guild,
 				Member = mbr
 			};
 			await this._guildBanAdded.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the guild ban remove event.
 		/// </summary>
 		/// <param name="user">The transport user.</param>
 		/// <param name="guild">The guild.</param>
 		internal async Task OnGuildBanRemoveEventAsync(TransportUser user, DiscordGuild guild)
 		{
 			var usr = new DiscordUser(user) { Discord = this };
 			usr = this.UserCache.AddOrUpdate(user.Id, usr, (id, old) =>
 			{
 				old.Username = usr.Username;
 				old.Discriminator = usr.Discriminator;
 				old.AvatarHash = usr.AvatarHash;
 				return old;
 			});
 
 			if (!guild.Members.TryGetValue(user.Id, out var mbr))
 				mbr = new DiscordMember(usr) { Discord = this, GuildId = guild.Id };
 			var ea = new GuildBanRemoveEventArgs(this.ServiceProvider)
 			{
 				Guild = guild,
 				Member = mbr
 			};
 			await this._guildBanRemoved.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		#endregion
 
 		#region Guild Scheduled Event
 
 		/// <summary>
 		/// Handles the scheduled event create event.
 		/// </summary>
 		/// <param name="scheduledEvent">The created event.</param>
 		/// <param name="guild">The guild.</param>
 		internal async Task OnGuildScheduledEventCreateEventAsync(DiscordScheduledEvent scheduledEvent, DiscordGuild guild)
 		{
 			scheduledEvent.Discord = this;
 
 			guild.ScheduledEventsInternal.AddOrUpdate(scheduledEvent.Id, scheduledEvent, (old, newScheduledEvent) => newScheduledEvent);
 
 			if (scheduledEvent.Creator != null)
 			{
 				scheduledEvent.Creator.Discord = this;
 				this.UserCache.AddOrUpdate(scheduledEvent.Creator.Id, scheduledEvent.Creator, (id, old) =>
 				{
 					old.Username = scheduledEvent.Creator.Username;
 					old.Discriminator = scheduledEvent.Creator.Discriminator;
 					old.AvatarHash = scheduledEvent.Creator.AvatarHash;
 					old.Flags = scheduledEvent.Creator.Flags;
 					return old;
 				});
 			}
 
 			await this._guildScheduledEventCreated.InvokeAsync(this, new GuildScheduledEventCreateEventArgs(this.ServiceProvider) { ScheduledEvent = scheduledEvent, Guild = scheduledEvent.Guild }).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the scheduled event update event.
 		/// </summary>
 		/// <param name="scheduledEvent">The updated event.</param>
 		/// <param name="guild">The guild.</param>
 		internal async Task OnGuildScheduledEventUpdateEventAsync(DiscordScheduledEvent scheduledEvent, DiscordGuild guild)
 		{
 			if (guild == null)
 				return;
 
 			DiscordScheduledEvent oldEvent;
 			if (!guild.ScheduledEventsInternal.ContainsKey(scheduledEvent.Id))
 			{
 				oldEvent = null;
 			}
 			else
 			{
 				var ev = guild.ScheduledEventsInternal[scheduledEvent.Id];
 				oldEvent = new DiscordScheduledEvent
 				{
 					Id = ev.Id,
 					ChannelId = ev.ChannelId,
 					EntityId = ev.EntityId,
 					EntityMetadata = ev.EntityMetadata,
 					CreatorId = ev.CreatorId,
 					Creator = ev.Creator,
 					Discord = this,
 					Description = ev.Description,
 					EntityType = ev.EntityType,
 					ScheduledStartTimeRaw = ev.ScheduledStartTimeRaw,
 					ScheduledEndTimeRaw = ev.ScheduledEndTimeRaw,
 					GuildId = ev.GuildId,
 					Status = ev.Status,
 					Name = ev.Name,
 					UserCount = ev.UserCount,
 					CoverImageHash = ev.CoverImageHash
 				};
 
 			}
 			if (scheduledEvent.Creator != null)
 			{
 				scheduledEvent.Creator.Discord = this;
 				this.UserCache.AddOrUpdate(scheduledEvent.Creator.Id, scheduledEvent.Creator, (id, old) =>
 				{
 					old.Username = scheduledEvent.Creator.Username;
 					old.Discriminator = scheduledEvent.Creator.Discriminator;
 					old.AvatarHash = scheduledEvent.Creator.AvatarHash;
 					old.Flags = scheduledEvent.Creator.Flags;
 					return old;
 				});
 			}
 
 			if (scheduledEvent.Status == ScheduledEventStatus.Completed)
 			{
 				guild.ScheduledEventsInternal.TryRemove(scheduledEvent.Id, out var deletedEvent);
 				await this._guildScheduledEventDeleted.InvokeAsync(this, new GuildScheduledEventDeleteEventArgs(this.ServiceProvider) { ScheduledEvent = scheduledEvent, Guild = guild, Reason = ScheduledEventStatus.Completed }).ConfigureAwait(false);
 			}
 			else if (scheduledEvent.Status == ScheduledEventStatus.Canceled)
 			{
 				guild.ScheduledEventsInternal.TryRemove(scheduledEvent.Id, out var deletedEvent);
 				scheduledEvent.Status = ScheduledEventStatus.Canceled;
 				await this._guildScheduledEventDeleted.InvokeAsync(this, new GuildScheduledEventDeleteEventArgs(this.ServiceProvider) { ScheduledEvent = scheduledEvent, Guild = guild, Reason = ScheduledEventStatus.Canceled }).ConfigureAwait(false);
 			}
 			else
 			{
 				this.UpdateScheduledEvent(scheduledEvent, guild);
 				await this._guildScheduledEventUpdated.InvokeAsync(this, new GuildScheduledEventUpdateEventArgs(this.ServiceProvider) { ScheduledEventBefore = oldEvent, ScheduledEventAfter = scheduledEvent, Guild = guild }).ConfigureAwait(false);
 			}
 		}
 
 		/// <summary>
 		/// Handles the scheduled event delete event.
 		/// </summary>
 		/// <param name="scheduledEvent">The deleted event.</param>
 		/// <param name="guild">The guild.</param>
 		internal async Task OnGuildScheduledEventDeleteEventAsync(DiscordScheduledEvent scheduledEvent, DiscordGuild guild)
 		{
 			scheduledEvent.Discord = this;
 
 			if (scheduledEvent.Status == ScheduledEventStatus.Scheduled)
 				scheduledEvent.Status = ScheduledEventStatus.Canceled;
 
 			if (scheduledEvent.Creator != null)
 			{
 				scheduledEvent.Creator.Discord = this;
 				this.UserCache.AddOrUpdate(scheduledEvent.Creator.Id, scheduledEvent.Creator, (id, old) =>
 				{
 					old.Username = scheduledEvent.Creator.Username;
 					old.Discriminator = scheduledEvent.Creator.Discriminator;
 					old.AvatarHash = scheduledEvent.Creator.AvatarHash;
 					old.Flags = scheduledEvent.Creator.Flags;
 					return old;
 				});
 			}
 
 			await this._guildScheduledEventDeleted.InvokeAsync(this, new GuildScheduledEventDeleteEventArgs(this.ServiceProvider) { ScheduledEvent = scheduledEvent, Guild = scheduledEvent.Guild, Reason = scheduledEvent.Status }).ConfigureAwait(false);
 			guild.ScheduledEventsInternal.TryRemove(scheduledEvent.Id, out var deletedEvent);
 		}
 
 		/// <summary>
 		/// Handles the scheduled event user add event.
 		/// <param name="guildScheduledEventId">The event.</param>
 		/// <param name="userId">The added user id.</param>
 		/// <param name="guild">The guild.</param>
 		/// </summary>
 		internal async Task OnGuildScheduledEventUserAddedEventAsync(ulong guildScheduledEventId, ulong userId, DiscordGuild guild)
 		{
 			var scheduledEvent = this.InternalGetCachedScheduledEvent(guildScheduledEventId) ?? this.UpdateScheduledEvent(new DiscordScheduledEvent
 			{
 				Id = guildScheduledEventId,
 				GuildId = guild.Id,
 				Discord = this,
 				UserCount = 0
 			}, guild);
 
 			scheduledEvent.UserCount++;
 			scheduledEvent.Discord = this;
 			guild.Discord = this;
 
 			var user = this.GetUserAsync(userId, true).Result;
 			user.Discord = this;
 			var member = guild.Members.TryGetValue(userId, out var mem) ? mem : guild.GetMemberAsync(userId).Result;
 			member.Discord = this;
 
 			await this._guildScheduledEventUserAdded.InvokeAsync(this, new GuildScheduledEventUserAddEventArgs(this.ServiceProvider) { ScheduledEvent = scheduledEvent, Guild = guild, User = user, Member = member }).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the scheduled event user remove event.
 		/// <param name="guildScheduledEventId">The event.</param>
 		/// <param name="userId">The removed user id.</param>
 		/// <param name="guild">The guild.</param>
 		/// </summary>
 		internal async Task OnGuildScheduledEventUserRemovedEventAsync(ulong guildScheduledEventId, ulong userId, DiscordGuild guild)
 		{
 			var scheduledEvent = this.InternalGetCachedScheduledEvent(guildScheduledEventId) ?? this.UpdateScheduledEvent(new DiscordScheduledEvent
 			{
 				Id = guildScheduledEventId,
 				GuildId = guild.Id,
 				Discord = this,
 				UserCount = 0
 			}, guild);
 
 			scheduledEvent.UserCount = scheduledEvent.UserCount == 0 ? 0 : scheduledEvent.UserCount - 1;
 			scheduledEvent.Discord = this;
 			guild.Discord = this;
 
 			var user = this.GetUserAsync(userId, true).Result;
 			user.Discord = this;
 			var member = guild.Members.TryGetValue(userId, out var mem) ? mem : guild.GetMemberAsync(userId).Result;
 			member.Discord = this;
 
 			await this._guildScheduledEventUserRemoved.InvokeAsync(this, new GuildScheduledEventUserRemoveEventArgs(this.ServiceProvider) { ScheduledEvent = scheduledEvent, Guild = guild, User = user, Member = member }).ConfigureAwait(false);
 		}
 
 		#endregion
 
 		#region Guild Integration
 
 		/// <summary>
 		/// Handles the guild integration create event.
 		/// </summary>
 		/// <param name="guild">The guild.</param>
 		/// <param name="integration">The integration.</param>
 		internal async Task OnGuildIntegrationCreateEventAsync(DiscordGuild guild, DiscordIntegration integration)
 		{
 			integration.Discord = this;
 
 			await this._guildIntegrationCreated.InvokeAsync(this, new GuildIntegrationCreateEventArgs(this.ServiceProvider) { Integration = integration, Guild = guild }).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the guild integration update event.
 		/// </summary>
 		/// <param name="guild">The guild.</param>
 		/// <param name="integration">The integration.</param>
 		internal async Task OnGuildIntegrationUpdateEventAsync(DiscordGuild guild, DiscordIntegration integration)
 		{
 			integration.Discord = this;
 
 			await this._guildIntegrationUpdated.InvokeAsync(this, new GuildIntegrationUpdateEventArgs(this.ServiceProvider) { Integration = integration, Guild = guild }).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the guild integrations update event.
 		/// </summary>
 		/// <param name="guild">The guild.</param>
 		internal async Task OnGuildIntegrationsUpdateEventAsync(DiscordGuild guild)
 		{
 			var ea = new GuildIntegrationsUpdateEventArgs(this.ServiceProvider)
 			{
 				Guild = guild
 			};
 			await this._guildIntegrationsUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the guild integration delete event.
 		/// </summary>
 		/// <param name="guild">The guild.</param>
 		/// <param name="integrationId">The integration id.</param>
 		/// <param name="applicationId">The optional application id.</param>
 		internal async Task OnGuildIntegrationDeleteEventAsync(DiscordGuild guild, ulong integrationId, ulong? applicationId)
 			=> await this._guildIntegrationDeleted.InvokeAsync(this, new GuildIntegrationDeleteEventArgs(this.ServiceProvider) { Guild = guild, IntegrationId = integrationId, ApplicationId = applicationId }).ConfigureAwait(false);
 
 		#endregion
 
 		#region Guild Member
 
 		/// <summary>
 		/// Handles the guild member add event.
 		/// </summary>
 		/// <param name="member">The transport member.</param>
 		/// <param name="guild">The guild.</param>
 		internal async Task OnGuildMemberAddEventAsync(TransportMember member, DiscordGuild guild)
 		{
 			var usr = new DiscordUser(member.User) { Discord = this };
 			usr = this.UserCache.AddOrUpdate(member.User.Id, usr, (id, old) =>
 			{
 				old.Username = usr.Username;
 				old.Discriminator = usr.Discriminator;
 				old.AvatarHash = usr.AvatarHash;
 				return old;
 			});
 
 			var mbr = new DiscordMember(member)
 			{
 				Discord = this,
 				GuildId = guild.Id
 			};
 
 			guild.MembersInternal[mbr.Id] = mbr;
 			guild.MemberCount++;
 
 			var ea = new GuildMemberAddEventArgs(this.ServiceProvider)
 			{
 				Guild = guild,
 				Member = mbr
 			};
 			await this._guildMemberAdded.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the guild member remove event.
 		/// </summary>
 		/// <param name="user">The transport user.</param>
 		/// <param name="guild">The guild.</param>
 		internal async Task OnGuildMemberRemoveEventAsync(TransportUser user, DiscordGuild guild)
 		{
 			var usr = new DiscordUser(user);
 
 			if (!guild.MembersInternal.TryRemove(user.Id, out var mbr))
 				mbr = new DiscordMember(usr) { Discord = this, GuildId = guild.Id };
 			guild.MemberCount--;
 
 			_ = this.UserCache.AddOrUpdate(user.Id, usr, (old, @new) => @new);
 
 			var ea = new GuildMemberRemoveEventArgs(this.ServiceProvider)
 			{
 				Guild = guild,
 				Member = mbr
 			};
 			await this._guildMemberRemoved.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the guild member update event.
 		/// </summary>
 		/// <param name="member">The transport member.</param>
 		/// <param name="guild">The guild.</param>
 		/// <param name="roles">The roles.</param>
 		/// <param name="nick">The nick.</param>
 		/// <param name="pending">Whether the member is pending.</param>
 		internal async Task OnGuildMemberUpdateEventAsync(TransportMember member, DiscordGuild guild, IEnumerable<ulong> roles, string nick, bool? pending)
 		{
 			var usr = new DiscordUser(member.User) { Discord = this };
 			usr = this.UserCache.AddOrUpdate(usr.Id, usr, (id, old) =>
 			{
 				old.Username = usr.Username;
 				old.Discriminator = usr.Discriminator;
 				old.AvatarHash = usr.AvatarHash;
 				return old;
 			});
 
 			if (!guild.Members.TryGetValue(member.User.Id, out var mbr))
 				mbr = new DiscordMember(usr) { Discord = this, GuildId = guild.Id };
 			var old = mbr;
 
 			var gAvOld = old.GuildAvatarHash;
 			var avOld = old.AvatarHash;
 			var nickOld = mbr.Nickname;
 			var pendingOld = mbr.IsPending;
-			var rolesOld = new ReadOnlyCollection<DiscordRole>(new List<DiscordRole>(mbr.Roles));
+			var rolesOld = mbr.Roles.ToArray();
 			var cduOld = mbr.CommunicationDisabledUntil;
 			mbr.MemberFlags = member.MemberFlags;
 			mbr.AvatarHashInternal = member.AvatarHash;
 			mbr.GuildAvatarHash = member.GuildAvatarHash;
 			mbr.Nickname = nick;
 			mbr.IsPending = pending;
 			mbr.CommunicationDisabledUntil = member.CommunicationDisabledUntil;
 			mbr.RoleIdsInternal.Clear();
 			mbr.RoleIdsInternal.AddRange(roles);
 			guild.MembersInternal.AddOrUpdate(member.User.Id, mbr, (id, oldMbr) => oldMbr);
 
 			var timeoutUntil = member.CommunicationDisabledUntil;
 			/*this.Logger.LogTrace($"Timeout:\nBefore - {cduOld}\nAfter - {timeoutUntil}");
 			if ((timeoutUntil.HasValue && cduOld.HasValue) || (timeoutUntil == null && cduOld.HasValue) || (timeoutUntil.HasValue && cduOld == null))
 			{
 				// We are going to add a scheduled timer to assure that we get a auditlog entry.
 
 				var id = $"tt-{mbr.Id}-{guild.Id}-{DateTime.Now.ToLongTimeString()}";
 
 				this._tempTimers.Add(
 					id,
 					new(
 						new TimeoutHandler(
 							mbr,
 							guild,
 							cduOld,
 							timeoutUntil
 						),
 						new Timer(
 							this.TimeoutTimer,
 							id,
 							2000,
 							Timeout.Infinite
 						)
 					)
 				);
 
 				this.Logger.LogTrace("Scheduling timeout event.");
 
 				return;
 			}*/
 
 			//this.Logger.LogTrace("No timeout detected. Continuing on normal operation.");
 
 			var eargs = new GuildMemberUpdateEventArgs(this.ServiceProvider)
 			{
 				Guild = guild,
 				Member = mbr,
 
 				NicknameAfter = mbr.Nickname,
-				RolesAfter = new ReadOnlyCollection<DiscordRole>(new List<DiscordRole>(mbr.Roles)),
+				RolesAfter = mbr.Roles.ToArray(),
 				PendingAfter = mbr.IsPending,
 				TimeoutAfter = mbr.CommunicationDisabledUntil,
 				AvatarHashAfter = mbr.AvatarHash,
 				GuildAvatarHashAfter = mbr.GuildAvatarHash,
 
 				NicknameBefore = nickOld,
 				RolesBefore = rolesOld,
 				PendingBefore = pendingOld,
 				TimeoutBefore = cduOld,
 				AvatarHashBefore = avOld,
 				GuildAvatarHashBefore = gAvOld
 			};
 			await this._guildMemberUpdated.InvokeAsync(this, eargs).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles timeout events.
 		/// </summary>
 		/// <param name="state">Internally used as uid for the timer data.</param>
 		private async void TimeoutTimer(object state)
 		{
 			var tid = (string)state;
 			var data = this._tempTimers.First(x=> x.Key == tid).Value.Key;
 			var timer = this._tempTimers.First(x=> x.Key == tid).Value.Value;
 
 			IReadOnlyList<DiscordAuditLogEntry> auditlog = null;
 			DiscordAuditLogMemberUpdateEntry filtered = null;
 			try
 			{
 				auditlog = await data.Guild.GetAuditLogsAsync(10, null, AuditLogActionType.MemberUpdate);
 				var preFiltered = auditlog.Select(x => x as DiscordAuditLogMemberUpdateEntry).Where(x => x.Target.Id == data.Member.Id);
 				filtered = preFiltered.First();
 			}
 			catch (UnauthorizedException) { }
 			catch (Exception)
 			{
 				this.Logger.LogTrace("Failing timeout event.");
 				await timer.DisposeAsync();
 				this._tempTimers.Remove(tid);
 				return;
 			}
 
 			var actor = filtered?.UserResponsible as DiscordMember;
 
 			this.Logger.LogTrace("Trying to execute timeout event.");
 
 			if (data.TimeoutUntilOld.HasValue && data.TimeoutUntilNew.HasValue)
 			{
 				// A timeout was updated.
 
 				if (filtered != null && auditlog == null)
 				{
 					this.Logger.LogTrace("Re-scheduling timeout event.");
 					timer.Change(2000, Timeout.Infinite);
 					return;
 				}
 
 				var ea = new GuildMemberTimeoutUpdateEventArgs(this.ServiceProvider)
 				{
 					Guild = data.Guild,
 					Target = data.Member,
 					TimeoutBefore = data.TimeoutUntilOld.Value,
 					TimeoutAfter = data.TimeoutUntilNew.Value,
 					Actor = actor,
 					AuditLogId = filtered?.Id,
 					AuditLogReason = filtered?.Reason
 				};
 				await this._guildMemberTimeoutChanged.InvokeAsync(this, ea).ConfigureAwait(false);
 			}
 			else if (!data.TimeoutUntilOld.HasValue && data.TimeoutUntilNew.HasValue)
 			{
 				// A timeout was added.
 
 				if (filtered != null && auditlog == null)
 				{
 					this.Logger.LogTrace("Re-scheduling timeout event.");
 					timer.Change(2000, Timeout.Infinite);
 					return;
 				}
 
 				var ea = new GuildMemberTimeoutAddEventArgs(this.ServiceProvider)
 				{
 					Guild = data.Guild,
 					Target = data.Member,
 					Timeout = data.TimeoutUntilNew.Value,
 					Actor = actor,
 					AuditLogId = filtered?.Id,
 					AuditLogReason = filtered?.Reason
 				};
 				await this._guildMemberTimeoutAdded.InvokeAsync(this, ea).ConfigureAwait(false);
 			}
 			else if (data.TimeoutUntilOld.HasValue && !data.TimeoutUntilNew.HasValue)
 			{
 				// A timeout was removed.
 
 				if (filtered != null && auditlog == null)
 				{
 					this.Logger.LogTrace("Re-scheduling timeout event.");
 					timer.Change(2000, Timeout.Infinite);
 					return;
 				}
 
 				var ea = new GuildMemberTimeoutRemoveEventArgs(this.ServiceProvider)
 				{
 					Guild = data.Guild,
 					Target = data.Member,
 					TimeoutBefore = data.TimeoutUntilOld.Value,
 					Actor = actor,
 					AuditLogId = filtered?.Id,
 					AuditLogReason = filtered?.Reason
 				};
 				await this._guildMemberTimeoutRemoved.InvokeAsync(this, ea).ConfigureAwait(false);
 			}
 
 			// Ending timer because it worked.
 			this.Logger.LogTrace("Removing timeout event.");
 			await timer.DisposeAsync();
 			this._tempTimers.Remove(tid);
 		}
 
 		/// <summary>
 		/// Handles the guild members chunk event.
 		/// </summary>
 		/// <param name="dat">The raw chunk data.</param>
 		internal async Task OnGuildMembersChunkEventAsync(JObject dat)
 		{
 			var guild = this.Guilds[(ulong)dat["guild_id"]];
 			var chunkIndex = (int)dat["chunk_index"];
 			var chunkCount = (int)dat["chunk_count"];
 			var nonce = (string)dat["nonce"];
 
 			var mbrs = new HashSet<DiscordMember>();
 			var pres = new HashSet<DiscordPresence>();
 
 			var members = dat["members"].ToObject<TransportMember[]>();
 
 			foreach (var member in members)
 			{
 				var mbr = new DiscordMember(member) { Discord = this, GuildId = guild.Id };
 
 				if (!this.UserCache.ContainsKey(mbr.Id))
 					this.UserCache[mbr.Id] = new DiscordUser(member.User) { Discord = this };
 
 				guild.MembersInternal[mbr.Id] = mbr;
 
 				mbrs.Add(mbr);
 			}
 
 			guild.MemberCount = guild.MembersInternal.Count;
 
 			var ea = new GuildMembersChunkEventArgs(this.ServiceProvider)
 			{
 				Guild = guild,
 				Members = new ReadOnlySet<DiscordMember>(mbrs),
 				ChunkIndex = chunkIndex,
 				ChunkCount = chunkCount,
 				Nonce = nonce,
 			};
 
 			if (dat["presences"] != null)
 			{
 				var presences = dat["presences"].ToObject<DiscordPresence[]>();
 
 				var presCount = presences.Length;
 				foreach (var presence in presences)
 				{
 					presence.Discord = this;
 					presence.Activity = new DiscordActivity(presence.RawActivity);
 
 					if (presence.RawActivities != null)
 					{
 						presence.InternalActivities = presence.RawActivities
 							.Select(x => new DiscordActivity(x)).ToArray();
 					}
 
 					pres.Add(presence);
 				}
 
 				ea.Presences = new ReadOnlySet<DiscordPresence>(pres);
 			}
 
 			if (dat["not_found"] != null)
 			{
 				var nf = dat["not_found"].ToObject<ISet<ulong>>();
 				ea.NotFound = new ReadOnlySet<ulong>(nf);
 			}
 
 			await this._guildMembersChunked.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		#endregion
 
 		#region Guild Role
 
 		/// <summary>
 		/// Handles the guild role create event.
 		/// </summary>
 		/// <param name="role">The role.</param>
 		/// <param name="guild">The guild.</param>
 		internal async Task OnGuildRoleCreateEventAsync(DiscordRole role, DiscordGuild guild)
 		{
 			role.Discord = this;
 			role.GuildId = guild.Id;
 
 			guild.RolesInternal[role.Id] = role;
 
 			var ea = new GuildRoleCreateEventArgs(this.ServiceProvider)
 			{
 				Guild = guild,
 				Role = role
 			};
 			await this._guildRoleCreated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the guild role update event.
 		/// </summary>
 		/// <param name="role">The role.</param>
 		/// <param name="guild">The guild.</param>
 		internal async Task OnGuildRoleUpdateEventAsync(DiscordRole role, DiscordGuild guild)
 		{
 			var newRole = guild.GetRole(role.Id);
 			var oldRole = new DiscordRole
 			{
 				GuildId = guild.Id,
 				ColorInternal = newRole.ColorInternal,
 				Discord = this,
 				IsHoisted = newRole.IsHoisted,
 				Id = newRole.Id,
 				IsManaged = newRole.IsManaged,
 				IsMentionable = newRole.IsMentionable,
 				Name = newRole.Name,
 				Permissions = newRole.Permissions,
 				Position = newRole.Position,
 				IconHash = newRole.IconHash,
 				Tags = newRole.Tags ?? null,
 				UnicodeEmojiString = newRole.UnicodeEmojiString
 			};
 
 			newRole.GuildId = guild.Id;
 			newRole.ColorInternal = role.ColorInternal;
 			newRole.IsHoisted = role.IsHoisted;
 			newRole.IsManaged = role.IsManaged;
 			newRole.IsMentionable = role.IsMentionable;
 			newRole.Name = role.Name;
 			newRole.Permissions = role.Permissions;
 			newRole.Position = role.Position;
 			newRole.IconHash = role.IconHash;
 			newRole.Tags = role.Tags ?? null;
 			newRole.UnicodeEmojiString = role.UnicodeEmojiString;
 
 			var ea = new GuildRoleUpdateEventArgs(this.ServiceProvider)
 			{
 				Guild = guild,
 				RoleAfter = newRole,
 				RoleBefore = oldRole
 			};
 			await this._guildRoleUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the guild role delete event.
 		/// </summary>
 		/// <param name="roleId">The role id.</param>
 		/// <param name="guild">The guild.</param>
 		internal async Task OnGuildRoleDeleteEventAsync(ulong roleId, DiscordGuild guild)
 		{
 			if (!guild.RolesInternal.TryRemove(roleId, out var role))
 				this.Logger.LogWarning($"Attempted to delete a nonexistent role ({roleId}) from guild ({guild}).");
 
 			var ea = new GuildRoleDeleteEventArgs(this.ServiceProvider)
 			{
 				Guild = guild,
 				Role = role
 			};
 			await this._guildRoleDeleted.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		#endregion
 
 		#region Invite
 
 		/// <summary>
 		/// Handles the invite create event.
 		/// </summary>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="invite">The invite.</param>
 		internal async Task OnInviteCreateEventAsync(ulong channelId, ulong guildId, DiscordInvite invite)
 		{
 			var guild = this.InternalGetCachedGuild(guildId);
 			var channel = this.InternalGetCachedChannel(channelId);
 
 			invite.Discord = this;
 
 			if (invite.Inviter is not null)
 			{
 				invite.Inviter.Discord = this;
 				this.UserCache.AddOrUpdate(invite.Inviter.Id, invite.Inviter, (old, @new) => @new);
 			}
 
 			guild.Invites[invite.Code] = invite;
 
 			var ea = new InviteCreateEventArgs(this.ServiceProvider)
 			{
 				Channel = channel,
 				Guild = guild,
 				Invite = invite
 			};
 			await this._inviteCreated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the invite delete event.
 		/// </summary>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="dat">The raw invite.</param>
 		internal async Task OnInviteDeleteEventAsync(ulong channelId, ulong guildId, JToken dat)
 		{
 			var guild = this.InternalGetCachedGuild(guildId);
 			var channel = this.InternalGetCachedChannel(channelId);
 
 			if (!guild.Invites.TryRemove(dat["code"].ToString(), out var invite))
 			{
 				invite = dat.ToObject<DiscordInvite>();
 				invite.Discord = this;
 			}
 
 			invite.IsRevoked = true;
 
 			var ea = new InviteDeleteEventArgs(this.ServiceProvider)
 			{
 				Channel = channel,
 				Guild = guild,
 				Invite = invite
 			};
 			await this._inviteDeleted.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		#endregion
 
 		#region Message
 
 		/// <summary>
 		/// Handles the message acknowledge event.
 		/// </summary>
 		/// <param name="chn">The channel.</param>
 		/// <param name="messageId">The message id.</param>
 		internal async Task OnMessageAckEventAsync(DiscordChannel chn, ulong messageId)
 		{
 			if (this.MessageCache == null || !this.MessageCache.TryGet(xm => xm.Id == messageId && xm.ChannelId == chn.Id, out var msg))
 			{
 				msg = new DiscordMessage
 				{
 					Id = messageId,
 					ChannelId = chn.Id,
 					Discord = this,
 				};
 			}
 
 			await this._messageAcknowledged.InvokeAsync(this, new MessageAcknowledgeEventArgs(this.ServiceProvider) { Message = msg }).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the message create event.
 		/// </summary>
 		/// <param name="message">The message.</param>
 		/// <param name="author">The transport user (author).</param>
 		/// <param name="member">The transport member.</param>
 		/// <param name="referenceAuthor">The reference transport user (author).</param>
 		/// <param name="referenceMember">The reference transport member.</param>
 		internal async Task OnMessageCreateEventAsync(DiscordMessage message, TransportUser author, TransportMember member, TransportUser referenceAuthor, TransportMember referenceMember)
 		{
 			message.Discord = this;
 			this.PopulateMessageReactionsAndCache(message, author, member);
 			message.PopulateMentions();
 
 			if (message.Channel == null && message.ChannelId == default)
 				this.Logger.LogWarning(LoggerEvents.WebSocketReceive, "Channel which the last message belongs to is not in cache - cache state might be invalid!");
 
 			if (message.ReferencedMessage != null)
 			{
 				message.ReferencedMessage.Discord = this;
 				this.PopulateMessageReactionsAndCache(message.ReferencedMessage, referenceAuthor, referenceMember);
 				message.ReferencedMessage.PopulateMentions();
 			}
 
 			foreach (var sticker in message.Stickers)
 				sticker.Discord = this;
 
 			var ea = new MessageCreateEventArgs(this.ServiceProvider)
 			{
 				Message = message,
 
-				MentionedUsers = new ReadOnlyCollection<DiscordUser>(message.MentionedUsersInternal),
-				MentionedRoles = message.MentionedRolesInternal != null ? new ReadOnlyCollection<DiscordRole>(message.MentionedRolesInternal) : null,
-				MentionedChannels = message.MentionedChannelsInternal != null ? new ReadOnlyCollection<DiscordChannel>(message.MentionedChannelsInternal) : null
+				MentionedUsers = message.MentionedUsersInternal.AsReadOnly(),
+				MentionedRoles = message.MentionedRolesInternal?.AsReadOnly(),
+				MentionedChannels = message.MentionedChannelsInternal?.AsReadOnly()
 			};
 			await this._messageCreated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the message update event.
 		/// </summary>
 		/// <param name="message">The message.</param>
 		/// <param name="author">The transport user (author).</param>
 		/// <param name="member">The transport member.</param>
 		/// <param name="referenceAuthor">The reference transport user (author).</param>
 		/// <param name="referenceMember">The reference transport member.</param>
 		internal async Task OnMessageUpdateEventAsync(DiscordMessage message, TransportUser author, TransportMember member, TransportUser referenceAuthor, TransportMember referenceMember)
 		{
 			DiscordGuild guild;
 
 			message.Discord = this;
 			var eventMessage = message;
 
 			DiscordMessage oldmsg = null;
 			if (this.Configuration.MessageCacheSize == 0
 				|| this.MessageCache == null
 				|| !this.MessageCache.TryGet(xm => xm.Id == eventMessage.Id && xm.ChannelId == eventMessage.ChannelId, out message))
 			{
 				message = eventMessage;
 				this.PopulateMessageReactionsAndCache(message, author, member);
 				guild = message.Channel?.Guild;
 
 				if (message.ReferencedMessage != null)
 				{
 					message.ReferencedMessage.Discord = this;
 					this.PopulateMessageReactionsAndCache(message.ReferencedMessage, referenceAuthor, referenceMember);
 					message.ReferencedMessage.PopulateMentions();
 				}
 			}
 			else
 			{
 				oldmsg = new DiscordMessage(message);
 
 				guild = message.Channel?.Guild;
 				message.EditedTimestampRaw = eventMessage.EditedTimestampRaw;
 				if (eventMessage.Content != null)
 					message.Content = eventMessage.Content;
 				message.EmbedsInternal.Clear();
 				message.EmbedsInternal.AddRange(eventMessage.EmbedsInternal);
 				message.Pinned = eventMessage.Pinned;
 				message.IsTts = eventMessage.IsTts;
 			}
 
 			message.PopulateMentions();
 
 			var ea = new MessageUpdateEventArgs(this.ServiceProvider)
 			{
 				Message = message,
 				MessageBefore = oldmsg,
-				MentionedUsers = new ReadOnlyCollection<DiscordUser>(message.MentionedUsersInternal),
-				MentionedRoles = message.MentionedRolesInternal != null ? new ReadOnlyCollection<DiscordRole>(message.MentionedRolesInternal) : null,
-				MentionedChannels = message.MentionedChannelsInternal != null ? new ReadOnlyCollection<DiscordChannel>(message.MentionedChannelsInternal) : null
+				MentionedUsers = message.MentionedUsersInternal.AsReadOnly(),
+				MentionedRoles = message.MentionedRolesInternal?.AsReadOnly(),
+				MentionedChannels = message.MentionedChannelsInternal
 			};
 			await this._messageUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the message delete event.
 		/// </summary>
 		/// <param name="messageId">The message id.</param>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="guildId">The optional guild id.</param>
 		internal async Task OnMessageDeleteEventAsync(ulong messageId, ulong channelId, ulong? guildId)
 		{
 			var channel = this.InternalGetCachedChannel(channelId) ?? this.InternalGetCachedThread(channelId);
 			var guild = this.InternalGetCachedGuild(guildId);
 
 			if (channel == null
 				|| this.Configuration.MessageCacheSize == 0
 				|| this.MessageCache == null
 				|| !this.MessageCache.TryGet(xm => xm.Id == messageId && xm.ChannelId == channelId, out var msg))
 			{
 				msg = new DiscordMessage
 				{
 
 					Id = messageId,
 					ChannelId = channelId,
 					Discord = this,
 				};
 			}
 
 			if (this.Configuration.MessageCacheSize > 0)
 				this.MessageCache?.Remove(xm => xm.Id == msg.Id && xm.ChannelId == channelId);
 
 			var ea = new MessageDeleteEventArgs(this.ServiceProvider)
 			{
 				Channel = channel,
 				Message = msg,
 				Guild = guild
 			};
 			await this._messageDeleted.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the message bulk delete event.
 		/// </summary>
 		/// <param name="messageIds">The message ids.</param>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="guildId">The optional guild id.</param>
 		internal async Task OnMessageBulkDeleteEventAsync(ulong[] messageIds, ulong channelId, ulong? guildId)
 		{
 			var channel = this.InternalGetCachedChannel(channelId) ?? this.InternalGetCachedThread(channelId);
 
 			var msgs = new List<DiscordMessage>(messageIds.Length);
 			foreach (var messageId in messageIds)
 			{
 				if (channel == null
 					|| this.Configuration.MessageCacheSize == 0
 					|| this.MessageCache == null
 					|| !this.MessageCache.TryGet(xm => xm.Id == messageId && xm.ChannelId == channelId, out var msg))
 				{
 					msg = new DiscordMessage
 					{
 						Id = messageId,
 						ChannelId = channelId,
 						Discord = this,
 					};
 				}
 				if (this.Configuration.MessageCacheSize > 0)
 					this.MessageCache?.Remove(xm => xm.Id == msg.Id && xm.ChannelId == channelId);
 				msgs.Add(msg);
 			}
 
 			var guild = this.InternalGetCachedGuild(guildId);
 
 			var ea = new MessageBulkDeleteEventArgs(this.ServiceProvider)
 			{
 				Channel = channel,
-				Messages = new ReadOnlyCollection<DiscordMessage>(msgs),
+				Messages = msgs,
 				Guild = guild
 			};
 			await this._messagesBulkDeleted.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		#endregion
 
 		#region Message Reaction
 
 		/// <summary>
 		/// Handles the message reaction add event.
 		/// </summary>
 		/// <param name="userId">The user id.</param>
 		/// <param name="messageId">The message id.</param>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="guildId">The optional guild id.</param>
 		/// <param name="mbr">The transport member.</param>
 		/// <param name="emoji">The emoji.</param>
 		internal async Task OnMessageReactionAddAsync(ulong userId, ulong messageId, ulong channelId, ulong? guildId, TransportMember mbr, DiscordEmoji emoji)
 		{
 			var channel = this.InternalGetCachedChannel(channelId) ?? this.InternalGetCachedThread(channelId);
 			var guild = this.InternalGetCachedGuild(guildId);
 			emoji.Discord = this;
 
 			var usr = this.UpdateUser(new DiscordUser { Id = userId, Discord = this }, guildId, guild, mbr);
 
 			if (channel == null
 				|| this.Configuration.MessageCacheSize == 0
 				|| this.MessageCache == null
 				|| !this.MessageCache.TryGet(xm => xm.Id == messageId && xm.ChannelId == channelId, out var msg))
 			{
 				msg = new DiscordMessage
 				{
 					Id = messageId,
 					ChannelId = channelId,
 					Discord = this,
 					ReactionsInternal = new List<DiscordReaction>()
 				};
 			}
 
 			var react = msg.ReactionsInternal.FirstOrDefault(xr => xr.Emoji == emoji);
 			if (react == null)
 			{
 				msg.ReactionsInternal.Add(react = new DiscordReaction
 				{
 					Count = 1,
 					Emoji = emoji,
 					IsMe = this.CurrentUser.Id == userId
 				});
 			}
 			else
 			{
 				react.Count++;
 				react.IsMe |= this.CurrentUser.Id == userId;
 			}
 
 			var ea = new MessageReactionAddEventArgs(this.ServiceProvider)
 			{
 				Message = msg,
 				User = usr,
 				Guild = guild,
 				Emoji = emoji
 			};
 			await this._messageReactionAdded.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the message reaction remove event.
 		/// </summary>
 		/// <param name="userId">The user id.</param>
 		/// <param name="messageId">The message id.</param>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="emoji">The emoji.</param>
 		internal async Task OnMessageReactionRemoveAsync(ulong userId, ulong messageId, ulong channelId, ulong? guildId, DiscordEmoji emoji)
 		{
 			var channel = this.InternalGetCachedChannel(channelId) ?? this.InternalGetCachedThread(channelId);
 
 			emoji.Discord = this;
 
 			if (!this.UserCache.TryGetValue(userId, out var usr))
 				usr = new DiscordUser { Id = userId, Discord = this };
 
 			if (channel?.Guild != null)
 				usr = channel.Guild.Members.TryGetValue(userId, out var member)
 					? member
 					: new DiscordMember(usr) { Discord = this, GuildId = channel.GuildId.Value };
 
 			if (channel == null
 				|| this.Configuration.MessageCacheSize == 0
 				|| this.MessageCache == null
 				|| !this.MessageCache.TryGet(xm => xm.Id == messageId && xm.ChannelId == channelId, out var msg))
 			{
 				msg = new DiscordMessage
 				{
 					Id = messageId,
 					ChannelId = channelId,
 					Discord = this
 				};
 			}
 
 			var react = msg.ReactionsInternal?.FirstOrDefault(xr => xr.Emoji == emoji);
 			if (react != null)
 			{
 				react.Count--;
 				react.IsMe &= this.CurrentUser.Id != userId;
 
 				if (msg.ReactionsInternal != null && react.Count <= 0) // shit happens
 					msg.ReactionsInternal.RemoveFirst(x => x.Emoji == emoji);
 			}
 
 			var guild = this.InternalGetCachedGuild(guildId);
 
 			var ea = new MessageReactionRemoveEventArgs(this.ServiceProvider)
 			{
 				Message = msg,
 				User = usr,
 				Guild = guild,
 				Emoji = emoji
 			};
 			await this._messageReactionRemoved.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the message reaction remove event.
 		/// Fired when all message reactions were removed.
 		/// </summary>
 		/// <param name="messageId">The message id.</param>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="guildId">The optional guild id.</param>
 		internal async Task OnMessageReactionRemoveAllAsync(ulong messageId, ulong channelId, ulong? guildId)
 		{
 			var channel = this.InternalGetCachedChannel(channelId) ?? this.InternalGetCachedThread(channelId);
 
 			if (channel == null
 				|| this.Configuration.MessageCacheSize == 0
 				|| this.MessageCache == null
 				|| !this.MessageCache.TryGet(xm => xm.Id == messageId && xm.ChannelId == channelId, out var msg))
 			{
 				msg = new DiscordMessage
 				{
 					Id = messageId,
 					ChannelId = channelId,
 					Discord = this
 				};
 			}
 
 			msg.ReactionsInternal?.Clear();
 
 			var guild = this.InternalGetCachedGuild(guildId);
 
 			var ea = new MessageReactionsClearEventArgs(this.ServiceProvider)
 			{
 				Message = msg
 			};
 
 			await this._messageReactionsCleared.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the message reaction remove event.
 		/// Fired when a emoji got removed.
 		/// </summary>
 		/// <param name="messageId">The message id.</param>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="dat">The raw discord emoji.</param>
 		internal async Task OnMessageReactionRemoveEmojiAsync(ulong messageId, ulong channelId, ulong guildId, JToken dat)
 		{
 			var guild = this.InternalGetCachedGuild(guildId);
 			var channel = this.InternalGetCachedChannel(channelId) ?? this.InternalGetCachedThread(channelId);
 
 			if (channel == null
 				|| this.Configuration.MessageCacheSize == 0
 				|| this.MessageCache == null
 				|| !this.MessageCache.TryGet(xm => xm.Id == messageId && xm.ChannelId == channelId, out var msg))
 			{
 				msg = new DiscordMessage
 				{
 					Id = messageId,
 					ChannelId = channelId,
 					Discord = this
 				};
 			}
 
 			var partialEmoji = dat.ToObject<DiscordEmoji>();
 
 			if (!guild.EmojisInternal.TryGetValue(partialEmoji.Id, out var emoji))
 			{
 				emoji = partialEmoji;
 				emoji.Discord = this;
 			}
 
 			msg.ReactionsInternal?.RemoveAll(r => r.Emoji.Equals(emoji));
 
 			var ea = new MessageReactionRemoveEmojiEventArgs(this.ServiceProvider)
 			{
 				Channel = channel,
 				Guild = guild,
 				Message = msg,
 				Emoji = emoji
 			};
 
 			await this._messageReactionRemovedEmoji.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		#endregion
 
 		#region Stage Instance
 
 		/// <summary>
 		/// Handles the stage instance create event.
 		/// </summary>
 		/// <param name="stage">The created stage instance.</param>
 		internal async Task OnStageInstanceCreateEventAsync(DiscordStageInstance stage)
 		{
 			stage.Discord = this;
 
 			var guild = this.InternalGetCachedGuild(stage.GuildId);
 			guild.StageInstancesInternal[stage.Id] = stage;
 
 			await this._stageInstanceCreated.InvokeAsync(this, new StageInstanceCreateEventArgs(this.ServiceProvider) { StageInstance = stage, Guild = stage.Guild }).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the stage instance update event.
 		/// </summary>
 		/// <param name="stage">The updated stage instance.</param>
 		internal async Task OnStageInstanceUpdateEventAsync(DiscordStageInstance stage)
 		{
 			stage.Discord = this;
 			var guild = this.InternalGetCachedGuild(stage.GuildId);
 			guild.StageInstancesInternal[stage.Id] = stage;
 
 			await this._stageInstanceUpdated.InvokeAsync(this, new StageInstanceUpdateEventArgs(this.ServiceProvider) { StageInstance = stage, Guild = stage.Guild }).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the stage instance delete event.
 		/// </summary>
 		/// <param name="stage">The deleted stage instance.</param>
 		internal async Task OnStageInstanceDeleteEventAsync(DiscordStageInstance stage)
 		{
 			stage.Discord = this;
 			var guild = this.InternalGetCachedGuild(stage.GuildId);
 			guild.StageInstancesInternal[stage.Id] = stage;
 
 			await this._stageInstanceDeleted.InvokeAsync(this, new StageInstanceDeleteEventArgs(this.ServiceProvider) { StageInstance = stage, Guild = stage.Guild }).ConfigureAwait(false);
 		}
 
 		#endregion
 
 		#region Thread
 
 		/// <summary>
 		/// Handles the thread create event.
 		/// </summary>
 		/// <param name="thread">The created thread.</param>
 		internal async Task OnThreadCreateEventAsync(DiscordThreadChannel thread)
 		{
 			thread.Discord = this;
 			this.InternalGetCachedGuild(thread.GuildId).ThreadsInternal.AddOrUpdate(thread.Id, thread, (oldThread, newThread) => newThread);
 
 			await this._threadCreated.InvokeAsync(this, new ThreadCreateEventArgs(this.ServiceProvider) { Thread = thread, Guild = thread.Guild, Parent = thread.Parent }).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the thread update event.
 		/// </summary>
 		/// <param name="thread">The updated thread.</param>
 		internal async Task OnThreadUpdateEventAsync(DiscordThreadChannel thread)
 		{
 			if (thread == null)
 				return;
 
 			thread.Discord = this;
 			var guild = thread.Guild;
 
 			var threadNew = this.InternalGetCachedThread(thread.Id);
 			DiscordThreadChannel threadOld = null;
 			ThreadUpdateEventArgs updateEvent;
 
 			if (threadNew != null)
 			{
 				threadOld = new DiscordThreadChannel
 				{
 					Discord = this,
 					Type = threadNew.Type,
 					ThreadMetadata = thread.ThreadMetadata,
 					ThreadMembersInternal = threadNew.ThreadMembersInternal,
 					ParentId = thread.ParentId,
 					OwnerId = thread.OwnerId,
 					Name = thread.Name,
 					LastMessageId = threadNew.LastMessageId,
 					MessageCount = thread.MessageCount,
 					MemberCount = thread.MemberCount,
 					GuildId = thread.GuildId,
 					LastPinTimestampRaw = threadNew.LastPinTimestampRaw,
 					PerUserRateLimit = threadNew.PerUserRateLimit,
 					CurrentMember = threadNew.CurrentMember
 				};
 
 				threadNew.ThreadMetadata = thread.ThreadMetadata;
 				threadNew.ParentId = thread.ParentId;
 				threadNew.OwnerId = thread.OwnerId;
 				threadNew.Name = thread.Name;
 				threadNew.LastMessageId = thread.LastMessageId.HasValue ? thread.LastMessageId : threadOld.LastMessageId;
 				threadNew.MessageCount = thread.MessageCount;
 				threadNew.MemberCount = thread.MemberCount;
 				threadNew.GuildId = thread.GuildId;
 
 				updateEvent = new ThreadUpdateEventArgs(this.ServiceProvider)
 				{
 					ThreadAfter = thread,
 					ThreadBefore = threadOld,
 					Guild = thread.Guild,
 					Parent = thread.Parent
 				};
 			}
 			else
 			{
 				updateEvent = new ThreadUpdateEventArgs(this.ServiceProvider)
 				{
 					ThreadAfter = thread,
 					Guild = thread.Guild,
 					Parent = thread.Parent
 				};
 				guild.ThreadsInternal[thread.Id] = thread;
 			}
 
 			await this._threadUpdated.InvokeAsync(this, updateEvent).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the thread delete event.
 		/// </summary>
 		/// <param name="thread">The deleted thread.</param>
 		internal async Task OnThreadDeleteEventAsync(DiscordThreadChannel thread)
 		{
 			if (thread == null)
 				return;
 
 			thread.Discord = this;
 
 			var gld = thread.Guild;
 			if (gld.ThreadsInternal.TryRemove(thread.Id, out var cachedThread))
 				thread = cachedThread;
 
 			await this._threadDeleted.InvokeAsync(this, new ThreadDeleteEventArgs(this.ServiceProvider) { Thread = thread, Guild = thread.Guild, Parent = thread.Parent, Type = thread.Type }).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the thread list sync event.
 		/// </summary>
 		/// <param name="guild">The synced guild.</param>
 		/// <param name="channelIds">The synced channel ids.</param>
 		/// <param name="threads">The synced threads.</param>
 		/// <param name="members">The synced thread members.</param>
 		internal async Task OnThreadListSyncEventAsync(DiscordGuild guild, IReadOnlyList<ulong?> channelIds, IReadOnlyList<DiscordThreadChannel> threads, IReadOnlyList<DiscordThreadChannelMember> members)
 		{
 			guild.Discord = this;
 
 			var channels = channelIds.Select(x => guild.GetChannel(x.Value)); //getting channel objects
 			foreach (var chan in channels)
 			{
 				chan.Discord = this;
 			}
 			threads.Select(x => x.Discord = this);
 
-			await this._threadListSynced.InvokeAsync(this, new ThreadListSyncEventArgs(this.ServiceProvider) { Guild = guild, Channels = channels.ToList().AsReadOnly(), Threads = threads, Members = members.ToList().AsReadOnly() }).ConfigureAwait(false);
+			await this._threadListSynced.InvokeAsync(this, new ThreadListSyncEventArgs(this.ServiceProvider) { Guild = guild, Channels = channels.ToArray(), Threads = threads, Members = members.ToArray() }).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the thread member update event.
 		/// </summary>
 		/// <param name="member">The updated member.</param>
 		internal async Task OnThreadMemberUpdateEventAsync(DiscordThreadChannelMember member)
 		{
 			member.Discord = this;
 			var thread = this.InternalGetCachedThread(member.Id);
 			if (thread == null)
 			{
 				var tempThread = await this.ApiClient.GetThreadAsync(member.Id);
 				thread = this.GuildsInternal[member.GuildId].ThreadsInternal.AddOrUpdate(member.Id, tempThread, (old, newThread) => newThread);
 			}
 
 			thread.CurrentMember = member;
 			thread.Guild.ThreadsInternal.AddOrUpdate(member.Id, thread, (oldThread, newThread) => newThread);
 
 
 			await this._threadMemberUpdated.InvokeAsync(this, new ThreadMemberUpdateEventArgs(this.ServiceProvider) { ThreadMember = member, Thread = thread }).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the thread members update event.
 		/// </summary>
 		/// <param name="guild">The target guild.</param>
 		/// <param name="threadId">The thread id of the target thread this update belongs to.</param>
 		/// <param name="membersAdded">The added members.</param>
 		/// <param name="membersRemoved">The ids of the removed members.</param>
 		/// <param name="memberCount">The new member count.</param>
 		internal async Task OnThreadMembersUpdateEventAsync(DiscordGuild guild, ulong threadId, JArray membersAdded, JArray membersRemoved, int memberCount)
 		{
 			var thread = this.InternalGetCachedThread(threadId);
 			if (thread == null)
 			{
 				var tempThread = await this.ApiClient.GetThreadAsync(threadId);
 				thread = guild.ThreadsInternal.AddOrUpdate(threadId, tempThread, (old, newThread) => newThread);
 			}
 
 			thread.Discord = this;
 			guild.Discord = this;
 			List<DiscordThreadChannelMember> addedMembers = new();
 			List<ulong> removedMemberIds = new();
 
 			if (membersAdded != null)
 			{
 				foreach (var xj in membersAdded)
 				{
 					var xtm = xj.ToDiscordObject<DiscordThreadChannelMember>();
 					xtm.Discord = this;
 					xtm.GuildId = guild.Id;
 					if (xtm != null)
 						addedMembers.Add(xtm);
 
 					if (xtm.Id == this.CurrentUser.Id)
 						thread.CurrentMember = xtm;
 				}
 			}
 
 			var removedMembers = new List<DiscordMember>();
 			if (membersRemoved != null)
 			{
 				foreach (var removedId in membersRemoved)
 				{
 					removedMembers.Add(guild.MembersInternal.TryGetValue((ulong)removedId, out var member) ? member : new DiscordMember { Id = (ulong)removedId, GuildId = guild.Id, Discord = this });
 				}
 			}
 
 			if (removedMemberIds.Contains(this.CurrentUser.Id)) //indicates the bot was removed from the thread
 				thread.CurrentMember = null;
 
 			thread.MemberCount = memberCount;
 
 			var threadMembersUpdateArg = new ThreadMembersUpdateEventArgs(this.ServiceProvider)
 			{
 				Guild = guild,
 				Thread = thread,
 				AddedMembers = addedMembers,
 				RemovedMembers = removedMembers,
 				MemberCount = memberCount
 			};
 
 			await this._threadMembersUpdated.InvokeAsync(this, threadMembersUpdateArg).ConfigureAwait(false);
 		}
 
 		#endregion
 
 		#region Activities
 		/// <summary>
 		/// Dispatches the <see cref="EmbeddedActivityUpdated"/> event.
 		/// </summary>
 		/// <param name="trActivity">The transport activity.</param>
 		/// <param name="guild">The guild.</param>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="jUsers">The users in the activity.</param>
 		/// <param name="appId">The application id.</param>
 		internal async Task OnEmbeddedActivityUpdateAsync(JObject trActivity, DiscordGuild guild, ulong channelId, JArray jUsers, ulong appId)
 			=> await Task.Delay(20);
 
 		/*{
             try
             {
                 var users = j_users?.ToObject<List<ulong>>();
 
                 DiscordActivity old = null;
                 var uid = $"{guild.Id}_{channel_id}_{app_id}";
 
                 if (this._embeddedActivities.TryGetValue(uid, out var activity))
                 {
                     old = new DiscordActivity(activity);
                     DiscordJson.PopulateObject(tr_activity, activity);
                 }
                 else
                 {
                     activity = tr_activity.ToObject<DiscordActivity>();
                     this._embeddedActivities[uid] = activity;
                 }
 
                 var activity_users = new List<DiscordMember>();
 
                 var channel = this.InternalGetCachedChannel(channel_id) ?? await this.ApiClient.GetChannelAsync(channel_id);
 
                 if (users != null)
                 {
                     foreach (var user in users)
                     {
                         var activity_user = guild._members.TryGetValue(user, out var member) ? member : new DiscordMember { Id = user, _guild_id = guild.Id, Discord = this };
                         activity_users.Add(activity_user);
                     }
                 }
                 else
                     activity_users = null;
 
                 var ea = new EmbeddedActivityUpdateEventArgs(this.ServiceProvider)
                 {
                     Guild = guild,
                     Users = activity_users,
                     Channel = channel
 
                 };
                 await this._embeddedActivityUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
             } catch (Exception ex)
             {
                 this.Logger.LogError(ex, ex.Message);
             }
         }*/
 
 		#endregion
 
 		#region User/Presence Update
 
 		/// <summary>
 		/// Handles the presence update event.
 		/// </summary>
 		/// <param name="rawPresence">The raw presence.</param>
 		/// <param name="rawUser">The raw user.</param>
 
 		internal async Task OnPresenceUpdateEventAsync(JObject rawPresence, JObject rawUser)
 		{
 			var uid = (ulong)rawUser["id"];
 			DiscordPresence old = null;
 
 			if (this.PresencesInternal.TryGetValue(uid, out var presence))
 			{
 				old = new DiscordPresence(presence);
 				DiscordJson.PopulateObject(rawPresence, presence);
 			}
 			else
 			{
 				presence = rawPresence.ToObject<DiscordPresence>();
 				presence.Discord = this;
 				presence.Activity = new DiscordActivity(presence.RawActivity);
 				this.PresencesInternal[presence.InternalUser.Id] = presence;
 			}
 
 			// reuse arrays / avoid linq (this is a hot zone)
 			if (presence.Activities == null || rawPresence["activities"] == null)
 			{
 				presence.InternalActivities = Array.Empty<DiscordActivity>();
 			}
 			else
 			{
 				if (presence.InternalActivities.Length != presence.RawActivities.Length)
 					presence.InternalActivities = new DiscordActivity[presence.RawActivities.Length];
 
 				for (var i = 0; i < presence.InternalActivities.Length; i++)
 					presence.InternalActivities[i] = new DiscordActivity(presence.RawActivities[i]);
 
 				if (presence.InternalActivities.Length > 0)
 				{
 					presence.RawActivity = presence.RawActivities[0];
 
 					if (presence.Activity != null)
 						presence.Activity.UpdateWith(presence.RawActivity);
 					else
 						presence.Activity = new DiscordActivity(presence.RawActivity);
 				}
 			}
 
 			if (this.UserCache.TryGetValue(uid, out var usr))
 			{
 				if (old != null)
 				{
 					old.InternalUser.Username = usr.Username;
 					old.InternalUser.Discriminator = usr.Discriminator;
 					old.InternalUser.AvatarHash = usr.AvatarHash;
 				}
 
 				if (rawUser["username"] is object)
 					usr.Username = (string)rawUser["username"];
 				if (rawUser["discriminator"] is object)
 					usr.Discriminator = (string)rawUser["discriminator"];
 				if (rawUser["avatar"] is object)
 					usr.AvatarHash = (string)rawUser["avatar"];
 
 				presence.InternalUser.Username = usr.Username;
 				presence.InternalUser.Discriminator = usr.Discriminator;
 				presence.InternalUser.AvatarHash = usr.AvatarHash;
 			}
 
 			var usrafter = usr ?? new DiscordUser(presence.InternalUser);
 			var ea = new PresenceUpdateEventArgs(this.ServiceProvider)
 			{
 				Status = presence.Status,
 				Activity = presence.Activity,
 				User = usr,
 				PresenceBefore = old,
 				PresenceAfter = presence,
 				UserBefore = old != null ? new DiscordUser(old.InternalUser) : usrafter,
 				UserAfter = usrafter
 			};
 			await this._presenceUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the user settings update event.
 		/// </summary>
 		/// <param name="user">The transport user.</param>
 
 		internal async Task OnUserSettingsUpdateEventAsync(TransportUser user)
 		{
 			var usr = new DiscordUser(user) { Discord = this };
 
 			var ea = new UserSettingsUpdateEventArgs(this.ServiceProvider)
 			{
 				User = usr
 			};
 			await this._userSettingsUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the user update event.
 		/// </summary>
 		/// <param name="user">The transport user.</param>
 
 		internal async Task OnUserUpdateEventAsync(TransportUser user)
 		{
 			var usrOld = new DiscordUser
 			{
 				AvatarHash = this.CurrentUser.AvatarHash,
 				Discord = this,
 				Discriminator = this.CurrentUser.Discriminator,
 				Email = this.CurrentUser.Email,
 				Id = this.CurrentUser.Id,
 				IsBot = this.CurrentUser.IsBot,
 				MfaEnabled = this.CurrentUser.MfaEnabled,
 				Username = this.CurrentUser.Username,
 				Verified = this.CurrentUser.Verified
 			};
 
 			this.CurrentUser.AvatarHash = user.AvatarHash;
 			this.CurrentUser.Discriminator = user.Discriminator;
 			this.CurrentUser.Email = user.Email;
 			this.CurrentUser.Id = user.Id;
 			this.CurrentUser.IsBot = user.IsBot;
 			this.CurrentUser.MfaEnabled = user.MfaEnabled;
 			this.CurrentUser.Username = user.Username;
 			this.CurrentUser.Verified = user.Verified;
 
 			var ea = new UserUpdateEventArgs(this.ServiceProvider)
 			{
 				UserAfter = this.CurrentUser,
 				UserBefore = usrOld
 			};
 			await this._userUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		#endregion
 
 		#region Voice
 
 		/// <summary>
 		/// Handles the voice state update event.
 		/// </summary>
 		/// <param name="raw">The raw voice state update object.</param>
 
 		internal async Task OnVoiceStateUpdateEventAsync(JObject raw)
 		{
 			var gid = (ulong)raw["guild_id"];
 			var uid = (ulong)raw["user_id"];
 			var gld = this.GuildsInternal[gid];
 
 			var vstateNew = raw.ToObject<DiscordVoiceState>();
 			vstateNew.Discord = this;
 
 			gld.VoiceStatesInternal.TryRemove(uid, out var vstateOld);
 
 			if (vstateNew.Channel != null)
 			{
 				gld.VoiceStatesInternal[vstateNew.UserId] = vstateNew;
 			}
 
 			if (gld.MembersInternal.TryGetValue(uid, out var mbr))
 			{
 				mbr.IsMuted = vstateNew.IsServerMuted;
 				mbr.IsDeafened = vstateNew.IsServerDeafened;
 			}
 			else
 			{
 				var transportMbr = vstateNew.TransportMember;
 				this.UpdateUser(new DiscordUser(transportMbr.User) { Discord = this }, gid, gld, transportMbr);
 			}
 
 			var ea = new VoiceStateUpdateEventArgs(this.ServiceProvider)
 			{
 				Guild = vstateNew.Guild,
 				Channel = vstateNew.Channel,
 				User = vstateNew.User,
 				SessionId = vstateNew.SessionId,
 
 				Before = vstateOld,
 				After = vstateNew
 			};
 			await this._voiceStateUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the voice server update event.
 		/// </summary>
 		/// <param name="endpoint">The new endpoint.</param>
 		/// <param name="token">The new token.</param>
 		/// <param name="guild">The guild.</param>
 
 		internal async Task OnVoiceServerUpdateEventAsync(string endpoint, string token, DiscordGuild guild)
 		{
 			var ea = new VoiceServerUpdateEventArgs(this.ServiceProvider)
 			{
 				Endpoint = endpoint,
 				VoiceToken = token,
 				Guild = guild
 			};
 			await this._voiceServerUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		#endregion
 
 		#region Commands
 
 		/// <summary>
 		/// Handles the application command create event.
 		/// </summary>
 		/// <param name="cmd">The application command.</param>
 		/// <param name="guildId">The optional guild id.</param>
 
 		internal async Task OnApplicationCommandCreateAsync(DiscordApplicationCommand cmd, ulong? guildId)
 		{
 			cmd.Discord = this;
 
 			var guild = this.InternalGetCachedGuild(guildId);
 
 			if (guild == null && guildId.HasValue)
 			{
 				guild = new DiscordGuild
 				{
 					Id = guildId.Value,
 					Discord = this
 				};
 			}
 
 			var ea = new ApplicationCommandEventArgs(this.ServiceProvider)
 			{
 				Guild = guild,
 				Command = cmd
 			};
 
 			await this._applicationCommandCreated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the application command update event.
 		/// </summary>
 		/// <param name="cmd">The application command.</param>
 		/// <param name="guildId">The optional guild id.</param>
 
 		internal async Task OnApplicationCommandUpdateAsync(DiscordApplicationCommand cmd, ulong? guildId)
 		{
 			cmd.Discord = this;
 
 			var guild = this.InternalGetCachedGuild(guildId);
 
 			if (guild == null && guildId.HasValue)
 			{
 				guild = new DiscordGuild
 				{
 					Id = guildId.Value,
 					Discord = this
 				};
 			}
 
 			var ea = new ApplicationCommandEventArgs(this.ServiceProvider)
 			{
 				Guild = guild,
 				Command = cmd
 			};
 
 			await this._applicationCommandUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the application command delete event.
 		/// </summary>
 		/// <param name="cmd">The application command.</param>
 		/// <param name="guildId">The optional guild id.</param>
 
 		internal async Task OnApplicationCommandDeleteAsync(DiscordApplicationCommand cmd, ulong? guildId)
 		{
 			cmd.Discord = this;
 
 			var guild = this.InternalGetCachedGuild(guildId);
 
 			if (guild == null && guildId.HasValue)
 			{
 				guild = new DiscordGuild
 				{
 					Id = guildId.Value,
 					Discord = this
 				};
 			}
 
 			var ea = new ApplicationCommandEventArgs(this.ServiceProvider)
 			{
 				Guild = guild,
 				Command = cmd
 			};
 
 			await this._applicationCommandDeleted.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the guild application command counts update event.
 		/// </summary>
 		/// <param name="chatInputCommandCount">The <see cref="ApplicationCommandType.ChatInput"/> count.</param>
 		/// <param name="userContextMenuCommandCount">The <see cref="ApplicationCommandType.User"/> count.</param>
 		/// <param name="messageContextMenuCount">The <see cref="ApplicationCommandType.Message"/> count.</param>
 		/// <param name="guildId">The guild id.</param>
 		/// <returns>Count of application commands.</returns>
 		internal async Task OnGuildApplicationCommandCountsUpdateAsync(int chatInputCommandCount, int userContextMenuCommandCount, int messageContextMenuCount, ulong guildId)
 		{
 			var guild = this.InternalGetCachedGuild(guildId);
 
 			if (guild == null)
 			{
 				guild = new DiscordGuild
 				{
 					Id = guildId,
 					Discord = this
 				};
 			}
 
 			var ea = new GuildApplicationCommandCountEventArgs(this.ServiceProvider)
 			{
 				SlashCommands = chatInputCommandCount,
 				UserContextMenuCommands = userContextMenuCommandCount,
 				MessageContextMenuCommands = messageContextMenuCount,
 				Guild = guild
 			};
 
 			await this._guildApplicationCommandCountUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the application command permissions update event.
 		/// </summary>
 		/// <param name="perms">The new permissions.</param>
 		/// <param name="channelId">The command id.</param>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="applicationId">The application id.</param>
 		internal async Task OnApplicationCommandPermissionsUpdateAsync(IEnumerable<DiscordApplicationCommandPermission> perms, ulong channelId, ulong guildId, ulong applicationId)
 		{
 			if (applicationId != this.CurrentApplication.Id)
 				return;
 
 			var guild = this.InternalGetCachedGuild(guildId);
 
 			DiscordApplicationCommand cmd;
 			try
 			{
 				cmd = await this.GetGuildApplicationCommandAsync(guildId, channelId);
 			}
 			catch (NotFoundException)
 			{
 				cmd = await this.GetGlobalApplicationCommandAsync(channelId);
 			}
 
 			if (guild == null)
 			{
 				guild = new DiscordGuild
 				{
 					Id = guildId,
 					Discord = this
 				};
 			}
 
 			var ea = new ApplicationCommandPermissionsUpdateEventArgs(this.ServiceProvider)
 			{
 				Permissions = perms.ToList(),
 				Command = cmd,
 				ApplicationId = applicationId,
 				Guild = guild
 			};
 
 			await this._applicationCommandPermissionsUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		#endregion
 
 		#region Interaction
 
 		/// <summary>
 		/// Handles the interaction create event.
 		/// </summary>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="user">The transport user.</param>
 		/// <param name="member">The transport member.</param>
 		/// <param name="interaction">The interaction.</param>
 		internal async Task OnInteractionCreateAsync(ulong? guildId, ulong channelId, TransportUser user, TransportMember member, DiscordInteraction interaction)
 		{
 			var usr = new DiscordUser(user) { Discord = this };
 
 			interaction.ChannelId = channelId;
 			interaction.GuildId = guildId;
 			interaction.Discord = this;
 			interaction.Data.Discord = this;
 
 			if (member != null)
 			{
 				usr = new DiscordMember(member) { GuildId = guildId.Value, Discord = this };
 				this.UpdateUser(usr, guildId, interaction.Guild, member);
 			}
 			else
 			{
 				this.UserCache.AddOrUpdate(usr.Id, usr, (old, @new) => @new);
 			}
 
 			interaction.User = usr;
 
 			var resolved = interaction.Data.Resolved;
 			if (resolved != null)
 			{
 				if (resolved.Users != null)
 				{
 					foreach (var c in resolved.Users)
 					{
 						c.Value.Discord = this;
 						this.UserCache.AddOrUpdate(c.Value.Id, c.Value, (old, @new) => @new);
 					}
 				}
 
 				if (resolved.Members != null)
 				{
 					foreach (var c in resolved.Members)
 					{
 						c.Value.Discord = this;
 						c.Value.Id = c.Key;
 						c.Value.GuildId = guildId.Value;
 						c.Value.User.Discord = this;
 						this.UserCache.AddOrUpdate(c.Value.User.Id, c.Value.User, (old, @new) => @new);
 					}
 				}
 
 				if (resolved.Channels != null)
 				{
 					foreach (var c in resolved.Channels)
 					{
 						c.Value.Discord = this;
 
 						if (guildId.HasValue)
 							c.Value.GuildId = guildId.Value;
 					}
 				}
 
 				if (resolved.Roles != null)
 				{
 					foreach (var c in resolved.Roles)
 					{
 						c.Value.Discord = this;
 
 						if (guildId.HasValue)
 							c.Value.GuildId = guildId.Value;
 					}
 				}
 
 
 				if (resolved.Messages != null)
 				{
 					foreach (var m in resolved.Messages)
 					{
 						m.Value.Discord = this;
 
 						if (guildId.HasValue)
 							m.Value.GuildId = guildId.Value;
 					}
 				}
 
 
 				if (resolved.Attachments != null)
 					foreach (var a in resolved.Attachments)
 						a.Value.Discord = this;
 			}
 
 			if (interaction.Type is InteractionType.Component || interaction.Type is InteractionType.ModalSubmit)
 			{
 				if (interaction.Message != null)
 				{
 					interaction.Message.Discord = this;
 					interaction.Message.ChannelId = interaction.ChannelId;
 				}
 				var cea = new ComponentInteractionCreateEventArgs(this.ServiceProvider)
 				{
 					Message = interaction.Message,
 					Interaction = interaction
 				};
 
 				await this._componentInteractionCreated.InvokeAsync(this, cea).ConfigureAwait(false);
 			}
 			else
 			{
 				if (interaction.Data.Target.HasValue) // Context-Menu. //
 				{
 					var targetId = interaction.Data.Target.Value;
 					DiscordUser targetUser = null;
 					DiscordMember targetMember = null;
 					DiscordMessage targetMessage = null;
 
 					interaction.Data.Resolved.Messages?.TryGetValue(targetId, out targetMessage);
 					interaction.Data.Resolved.Members?.TryGetValue(targetId, out targetMember);
 					interaction.Data.Resolved.Users?.TryGetValue(targetId, out targetUser);
 
 					var ctea = new ContextMenuInteractionCreateEventArgs(this.ServiceProvider)
 					{
 						Interaction = interaction,
 						TargetUser = targetMember ?? targetUser,
 						TargetMessage = targetMessage,
 						Type = interaction.Data.Type,
 					};
 					await this._contextMenuInteractionCreated.InvokeAsync(this, ctea).ConfigureAwait(false);
 				}
 				else
 				{
 					var ea = new InteractionCreateEventArgs(this.ServiceProvider)
 					{
 						Interaction = interaction
 					};
 
 					await this._interactionCreated.InvokeAsync(this, ea).ConfigureAwait(false);
 				}
 			}
 		}
 
 		#endregion
 
 		#region Misc
 
 		/// <summary>
 		/// Handles the typing start event.
 		/// </summary>
 		/// <param name="userId">The user id.</param>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="channel">The channel.</param>
 		/// <param name="guildId">The optional guild id.</param>
 		/// <param name="started">The time when the user started typing.</param>
 		/// <param name="mbr">The transport member.</param>
 		internal async Task OnTypingStartEventAsync(ulong userId, ulong channelId, DiscordChannel channel, ulong? guildId, DateTimeOffset started, TransportMember mbr)
 		{
 			if (channel == null)
 			{
 				channel = new DiscordChannel
 				{
 					Discord = this,
 					Id = channelId,
 					GuildId = guildId ?? default,
 				};
 			}
 
 			var guild = this.InternalGetCachedGuild(guildId);
 			var usr = this.UpdateUser(new DiscordUser { Id = userId, Discord = this }, guildId, guild, mbr);
 
 			var ea = new TypingStartEventArgs(this.ServiceProvider)
 			{
 				Channel = channel,
 				User = usr,
 				Guild = guild,
 				StartedAt = started
 			};
 			await this._typingStarted.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles the webhooks update.
 		/// </summary>
 		/// <param name="channel">The channel.</param>
 		/// <param name="guild">The guild.</param>
 		internal async Task OnWebhooksUpdateAsync(DiscordChannel channel, DiscordGuild guild)
 		{
 			var ea = new WebhooksUpdateEventArgs(this.ServiceProvider)
 			{
 				Channel = channel,
 				Guild = guild
 			};
 			await this._webhooksUpdated.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Handles all unknown events.
 		/// </summary>
 		/// <param name="payload">The payload.</param>
 		internal async Task OnUnknownEventAsync(GatewayPayload payload)
 		{
 			var ea = new UnknownEventArgs(this.ServiceProvider) { EventName = payload.EventName, Json = (payload.Data as JObject)?.ToString() };
 			await this._unknownEvent.InvokeAsync(this, ea).ConfigureAwait(false);
 		}
 
 		#endregion
 
 		#endregion
 	}
 }
diff --git a/DisCatSharp/Clients/DiscordWebhookClient.cs b/DisCatSharp/Clients/DiscordWebhookClient.cs
index 6f889aced..9f5c1d14d 100644
--- a/DisCatSharp/Clients/DiscordWebhookClient.cs
+++ b/DisCatSharp/Clients/DiscordWebhookClient.cs
@@ -1,283 +1,283 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 using DisCatSharp.Entities;
 using DisCatSharp.Exceptions;
 using DisCatSharp.Net;
 
 using Microsoft.Extensions.Logging;
 
 namespace DisCatSharp
 {
 	/// <summary>
 	/// Represents a webhook-only client. This client can be used to execute Discord Webhooks.
 	/// </summary>
 	public class DiscordWebhookClient
 	{
 		/// <summary>
 		/// Gets the logger for this client.
 		/// </summary>
 		public ILogger<DiscordWebhookClient> Logger { get; }
 
 		/// <summary>
 		/// Gets the webhook regex.
 		/// This regex has 2 named capture groups: "id" and "token".
 		/// </summary>
 		private static Regex s_webhookRegex { get; } = new(@"(?:https?:\/\/)?discord(?:app)?.com\/api\/(?:v\d\/)?webhooks\/(?<id>\d+)\/(?<token>[A-Za-z0-9_\-]+)", RegexOptions.ECMAScript);
 
 		/// <summary>
 		/// Gets the collection of registered webhooks.
 		/// </summary>
 		public IReadOnlyList<DiscordWebhook> Webhooks { get; }
 
 		/// <summary>
 		/// Gets or sets the username for registered webhooks. Note that this only takes effect when broadcasting.
 		/// </summary>
 		public string Username { get; set; }
 
 		/// <summary>
 		/// Gets or set the avatar for registered webhooks. Note that this only takes effect when broadcasting.
 		/// </summary>
 		public string AvatarUrl { get; set; }
 
 		internal List<DiscordWebhook> Hooks;
 		internal DiscordApiClient Apiclient;
 
 		internal LogLevel MinimumLogLevel;
 		internal string LogTimestampFormat;
 
 		/// <summary>
 		/// Creates a new webhook client.
 		/// </summary>
 		public DiscordWebhookClient()
 			: this(null, null)
 		{ }
 
 		/// <summary>
 		/// Creates a new webhook client, with specified HTTP proxy, timeout, and logging settings.
 		/// </summary>
 		/// <param name="proxy">The proxy to use for HTTP connections. Defaults to null.</param>
 		/// <param name="timeout">The optional timeout to use for HTTP requests. Set to <see cref="System.Threading.Timeout.InfiniteTimeSpan"/> to disable timeouts. Defaults to null.</param>
 		/// <param name="useRelativeRateLimit">Whether to use the system clock for computing rate limit resets. See <see cref="DiscordConfiguration.UseRelativeRatelimit"/> for more details. Defaults to true.</param>
 		/// <param name="loggerFactory">The optional logging factory to use for this client. Defaults to null.</param>
 		/// <param name="minimumLogLevel">The minimum logging level for messages. Defaults to information.</param>
 		/// <param name="logTimestampFormat">The timestamp format to use for the logger.</param>
 		public DiscordWebhookClient(IWebProxy proxy = null, TimeSpan? timeout = null, bool useRelativeRateLimit = true,
 			ILoggerFactory loggerFactory = null, LogLevel minimumLogLevel = LogLevel.Information, string logTimestampFormat = "yyyy-MM-dd HH:mm:ss zzz")
 		{
 			this.MinimumLogLevel = minimumLogLevel;
 			this.LogTimestampFormat = logTimestampFormat;
 
 			if (loggerFactory == null)
 			{
 				loggerFactory = new DefaultLoggerFactory();
 				loggerFactory.AddProvider(new DefaultLoggerProvider(this));
 			}
 
 			this.Logger = loggerFactory.CreateLogger<DiscordWebhookClient>();
 
 			var parsedTimeout = timeout ?? TimeSpan.FromSeconds(10);
 
 			this.Apiclient = new DiscordApiClient(proxy, parsedTimeout, useRelativeRateLimit, this.Logger);
 			this.Hooks = new List<DiscordWebhook>();
-			this.Webhooks = new ReadOnlyCollection<DiscordWebhook>(this.Hooks);
+			this.Webhooks = this.Hooks;
 		}
 
 		/// <summary>
 		/// Registers a webhook with this client. This retrieves a webhook based on the ID and token supplied.
 		/// </summary>
 		/// <param name="id">The ID of the webhook to add.</param>
 		/// <param name="token">The token of the webhook to add.</param>
 		/// <returns>The registered webhook.</returns>
 		public async Task<DiscordWebhook> AddWebhookAsync(ulong id, string token)
 		{
 			if (string.IsNullOrWhiteSpace(token))
 				throw new ArgumentNullException(nameof(token));
 			token = token.Trim();
 
 			if (this.Hooks.Any(x => x.Id == id))
 				throw new InvalidOperationException("This webhook is registered with this client.");
 
 			var wh = await this.Apiclient.GetWebhookWithTokenAsync(id, token).ConfigureAwait(false);
 			this.Hooks.Add(wh);
 
 			return wh;
 		}
 
 		/// <summary>
 		/// Registers a webhook with this client. This retrieves a webhook from webhook URL.
 		/// </summary>
 		/// <param name="url">URL of the webhook to retrieve. This URL must contain both ID and token.</param>
 		/// <returns>The registered webhook.</returns>
 		public Task<DiscordWebhook> AddWebhookAsync(Uri url)
 		{
 			if (url == null)
 				throw new ArgumentNullException(nameof(url));
 
 			var m = s_webhookRegex.Match(url.ToString());
 			if (!m.Success)
 				throw new ArgumentException("Invalid webhook URL supplied.", nameof(url));
 
 			var idraw = m.Groups["id"];
 			var tokenraw = m.Groups["token"];
 			if (!ulong.TryParse(idraw.Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var id))
 				throw new ArgumentException("Invalid webhook URL supplied.", nameof(url));
 
 			var token = tokenraw.Value;
 			return this.AddWebhookAsync(id, token);
 		}
 
 		/// <summary>
 		/// Registers a webhook with this client. This retrieves a webhook using the supplied full discord client.
 		/// </summary>
 		/// <param name="id">ID of the webhook to register.</param>
 		/// <param name="client">Discord client to which the webhook will belong.</param>
 		/// <returns>The registered webhook.</returns>
 		public async Task<DiscordWebhook> AddWebhookAsync(ulong id, BaseDiscordClient client)
 		{
 			if (client == null)
 				throw new ArgumentNullException(nameof(client));
 
 			if (this.Hooks.Any(x => x.Id == id))
 				throw new ArgumentException("This webhook is already registered with this client.");
 
 			var wh = await client.ApiClient.GetWebhookAsync(id).ConfigureAwait(false);
 
 			// personally I don't think we need to override anything.
 			// it would even make sense to keep the hook as-is, in case
 			// it's returned without a token for some bizarre reason
 			// remember -- discord is not really consistent
 			//var nwh = new DiscordWebhook()
 			//{
 			//    ApiClient = _apiclient,
 			//    AvatarHash = wh.AvatarHash,
 			//    ChannelId = wh.ChannelId,
 			//    GuildId = wh.GuildId,
 			//    Id = wh.Id,
 			//    Name = wh.Name,
 			//    Token = wh.Token,
 			//    User = wh.User,
 			//    Discord = null
 			//};
 			this.Hooks.Add(wh);
 
 			return wh;
 		}
 
 		/// <summary>
 		/// Registers a webhook with this client. This reuses the supplied webhook object.
 		/// </summary>
 		/// <param name="webhook">Webhook to register.</param>
 		/// <returns>The registered webhook.</returns>
 		public DiscordWebhook AddWebhook(DiscordWebhook webhook)
 		{
 			if (webhook == null)
 				throw new ArgumentNullException(nameof(webhook));
 
 			if (this.Hooks.Any(x => x.Id == webhook.Id))
 				throw new ArgumentException("This webhook is already registered with this client.");
 
 			//var nwh = new DiscordWebhook()
 			//{
 			//    ApiClient = _apiclient,
 			//    AvatarHash = webhook.AvatarHash,
 			//    ChannelId = webhook.ChannelId,
 			//    GuildId = webhook.GuildId,
 			//    Id = webhook.Id,
 			//    Name = webhook.Name,
 			//    Token = webhook.Token,
 			//    User = webhook.User,
 			//    Discord = null
 			//};
 			this.Hooks.Add(webhook);
 
 			return webhook;
 		}
 
 		/// <summary>
 		/// Unregisters a webhook with this client.
 		/// </summary>
 		/// <param name="id">ID of the webhook to unregister.</param>
 		/// <returns>The unregistered webhook.</returns>
 		public DiscordWebhook RemoveWebhook(ulong id)
 		{
 			if (!this.Hooks.Any(x => x.Id == id))
 				throw new ArgumentException("This webhook is not registered with this client.");
 
 			var wh = this.GetRegisteredWebhook(id);
 			this.Hooks.Remove(wh);
 			return wh;
 		}
 
 		/// <summary>
 		/// Gets a registered webhook with specified ID.
 		/// </summary>
 		/// <param name="id">ID of the registered webhook to retrieve.</param>
 		/// <returns>The requested webhook.</returns>
 		public DiscordWebhook GetRegisteredWebhook(ulong id)
 			=> this.Hooks.FirstOrDefault(xw => xw.Id == id);
 
 		/// <summary>
 		/// Broadcasts a message to all registered webhooks.
 		/// </summary>
 		/// <param name="builder">Webhook builder filled with data to send.</param>
 		/// <returns>A dictionary of <see cref="DisCatSharp.Entities.DiscordWebhook"/>s and <see cref="DisCatSharp.Entities.DiscordMessage"/>s.</returns>
 		public async Task<Dictionary<DiscordWebhook, DiscordMessage>> BroadcastMessageAsync(DiscordWebhookBuilder builder)
 		{
 			var deadhooks = new List<DiscordWebhook>();
 			var messages = new Dictionary<DiscordWebhook, DiscordMessage>();
 
 			foreach (var hook in this.Hooks)
 			{
 				try
 				{
 					messages.Add(hook, await hook.ExecuteAsync(builder).ConfigureAwait(false));
 				}
 				catch (NotFoundException)
 				{
 					deadhooks.Add(hook);
 				}
 			}
 
 			// Removing dead webhooks from collection
 			foreach (var xwh in deadhooks) this.Hooks.Remove(xwh);
 
 			return messages;
 		}
 
 		~DiscordWebhookClient()
 		{
 			this.Hooks.Clear();
 			this.Hooks = null;
 			this.Apiclient.Rest.Dispose();
 		}
 	}
 }
diff --git a/DisCatSharp/Entities/Application/DiscordApplicationCommand.cs b/DisCatSharp/Entities/Application/DiscordApplicationCommand.cs
index ec254a800..cde8b3fe8 100644
--- a/DisCatSharp/Entities/Application/DiscordApplicationCommand.cs
+++ b/DisCatSharp/Entities/Application/DiscordApplicationCommand.cs
@@ -1,200 +1,200 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 
 using DisCatSharp.Enums;
 
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Entities
 {
 	/// <summary>
 	/// Represents a command that is registered to an application.
 	/// </summary>
 	public sealed class DiscordApplicationCommand : SnowflakeObject, IEquatable<DiscordApplicationCommand>
 	{
 		/// <summary>
 		/// Gets the type of this application command.
 		/// </summary>
 		[JsonProperty("type")]
 		public ApplicationCommandType Type { get; internal set; }
 
 		/// <summary>
 		/// Gets the unique ID of this command's application.
 		/// </summary>
 		[JsonProperty("application_id")]
 		public ulong ApplicationId { get; internal set; }
 
 		/// <summary>
 		/// Gets the name of this command.
 		/// </summary>
 		[JsonProperty("name")]
 		public string Name { get; internal set; }
 
 		/// <summary>
 		/// Sets the name localizations.
 		/// </summary>
 		[JsonProperty("name_localizations", NullValueHandling = NullValueHandling.Ignore)]
 		internal Dictionary<string, string> RawNameLocalizations { get; set; }
 
 		/// <summary>
 		/// Gets the name localizations.
 		/// </summary>
 		[JsonIgnore]
 		public DiscordApplicationCommandLocalization NameLocalizations
 			=> new(this.RawNameLocalizations);
 
 		/// <summary>
 		/// Gets the description of this command.
 		/// </summary>
 		[JsonProperty("description")]
 		public string Description { get; internal set; }
 
 		/// <summary>
 		/// Sets the description localizations.
 		/// </summary>
 		[JsonProperty("description_localizations", NullValueHandling = NullValueHandling.Ignore)]
 		internal Dictionary<string, string> RawDescriptionLocalizations { get; set; }
 
 		/// <summary>
 		/// Gets the description localizations.
 		/// </summary>
 		[JsonIgnore]
 		public DiscordApplicationCommandLocalization DescriptionLocalizations
 			=> new(this.RawDescriptionLocalizations);
 
 		/// <summary>
 		/// Gets the potential parameters for this command.
 		/// </summary>
 		[JsonProperty("options", NullValueHandling = NullValueHandling.Ignore)]
 		public IReadOnlyCollection<DiscordApplicationCommandOption> Options { get; internal set; }
 
 		/// <summary>
 		/// Gets the commands needed permissions.
 		/// </summary>
 		[JsonProperty("default_member_permissions", NullValueHandling = NullValueHandling.Ignore)]
 		public Permissions? DefaultMemberPermissions { get; internal set; }
 
 		/// <summary>
 		/// Gets whether the command can be used in direct messages.
 		/// </summary>
 		[JsonProperty("dm_permission", NullValueHandling = NullValueHandling.Ignore)]
 		public bool? DmPermission { get; internal set; }
 
 		/// <summary>
 		/// Gets the version number for this command.
 		/// </summary>
 		[JsonProperty("version")]
 		public ulong Version { get; internal set; }
 
 		/// <summary>
 		/// Creates a new instance of a <see cref="DiscordApplicationCommand"/>.
 		/// </summary>
 		/// <param name="name">The name of the command.</param>
 		/// <param name="description">The description of the command.</param>
 		/// <param name="options">Optional parameters for this command.</param>
 		/// <param name="type">The type of the command. Defaults to ChatInput.</param>
 		/// <param name="nameLocalizations">The localizations of the command name.</param>
 		/// <param name="descriptionLocalizations">The localizations of the command description.</param>
 		/// <param name="defaultMemberPermissions">The default member permissions.</param>
 		/// <param name="dmPermission">The dm permission.</param>
 		public DiscordApplicationCommand(string name, string description, IEnumerable<DiscordApplicationCommandOption> options = null, ApplicationCommandType type = ApplicationCommandType.ChatInput, DiscordApplicationCommandLocalization nameLocalizations = null, DiscordApplicationCommandLocalization descriptionLocalizations = null, Permissions? defaultMemberPermissions = null, bool? dmPermission = null)
 		{
 			if (type is ApplicationCommandType.ChatInput)
 			{
 				if (!Utilities.IsValidSlashCommandName(name))
 					throw new ArgumentException("Invalid slash command name specified. It must be below 32 characters and not contain any whitespace.", nameof(name));
 				if (name.Any(ch => char.IsUpper(ch)))
 					throw new ArgumentException("Slash command name cannot have any upper case characters.", nameof(name));
 				if (description.Length > 100)
 					throw new ArgumentException("Slash command description cannot exceed 100 characters.", nameof(description));
 
 				this.RawNameLocalizations = nameLocalizations?.GetKeyValuePairs();
 				this.RawDescriptionLocalizations = descriptionLocalizations?.GetKeyValuePairs();
 			}
 			else
 			{
 				if (!string.IsNullOrWhiteSpace(description))
 					throw new ArgumentException("Context menus do not support descriptions.");
 				if (options?.Any() ?? false)
 					throw new ArgumentException("Context menus do not support options.");
 				description = string.Empty;
 
 				this.RawNameLocalizations = nameLocalizations?.GetKeyValuePairs();
 			}
 
-			var optionsList = options != null ? new ReadOnlyCollection<DiscordApplicationCommandOption>(options.ToList()) : null;
+			var optionsList = options?.ToArray();
 
 			this.Type = type;
 			this.Name = name;
 			this.Description = description;
 			this.Options = optionsList;
 			this.DefaultMemberPermissions = defaultMemberPermissions;
 			this.DmPermission = dmPermission;
 		}
 
 		/// <summary>
 		/// Checks whether this <see cref="DiscordApplicationCommand"/> object is equal to another object.
 		/// </summary>
 		/// <param name="other">The command to compare to.</param>
 		/// <returns>Whether the command is equal to this <see cref="DiscordApplicationCommand"/>.</returns>
 		public bool Equals(DiscordApplicationCommand other)
 			=> this.Id == other.Id;
 
 		/// <summary>
 		/// Determines if two <see cref="DiscordApplicationCommand"/> objects are equal.
 		/// </summary>
 		/// <param name="e1">The first command object.</param>
 		/// <param name="e2">The second command object.</param>
 		/// <returns>Whether the two <see cref="DiscordApplicationCommand"/> objects are equal.</returns>
 		public static bool operator ==(DiscordApplicationCommand e1, DiscordApplicationCommand e2)
 			=> e1.Equals(e2);
 
 		/// <summary>
 		/// Determines if two <see cref="DiscordApplicationCommand"/> objects are not equal.
 		/// </summary>
 		/// <param name="e1">The first command object.</param>
 		/// <param name="e2">The second command object.</param>
 		/// <returns>Whether the two <see cref="DiscordApplicationCommand"/> objects are not equal.</returns>
 		public static bool operator !=(DiscordApplicationCommand e1, DiscordApplicationCommand e2)
 			=> !(e1 == e2);
 
 		/// <summary>
 		/// Determines if a <see cref="object"/> is equal to the current <see cref="DiscordApplicationCommand"/>.
 		/// </summary>
 		/// <param name="other">The object to compare to.</param>
 		/// <returns>Whether the two <see cref="DiscordApplicationCommand"/> objects are not equal.</returns>
 		public override bool Equals(object other)
 			=> other is DiscordApplicationCommand dac && this.Equals(dac);
 
 		/// <summary>
 		/// Gets the hash code for this <see cref="DiscordApplicationCommand"/>.
 		/// </summary>
 		/// <returns>The hash code for this <see cref="DiscordApplicationCommand"/>.</returns>
 		public override int GetHashCode()
 			=> this.Id.GetHashCode();
 	}
 }
diff --git a/DisCatSharp/Entities/Application/DiscordApplicationCommandOption.cs b/DisCatSharp/Entities/Application/DiscordApplicationCommandOption.cs
index 7dd726d9c..16ac19001 100644
--- a/DisCatSharp/Entities/Application/DiscordApplicationCommandOption.cs
+++ b/DisCatSharp/Entities/Application/DiscordApplicationCommandOption.cs
@@ -1,164 +1,164 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Entities
 {
 	/// <summary>
 	/// Represents a parameter for a <see cref="DiscordApplicationCommand"/>.
 	/// </summary>
 	public sealed class DiscordApplicationCommandOption
 	{
 		/// <summary>
 		/// Gets the type of this command parameter.
 		/// </summary>
 		[JsonProperty("type")]
 		public ApplicationCommandOptionType Type { get; internal set; }
 
 		/// <summary>
 		/// Gets the name of this command parameter.
 		/// </summary>
 		[JsonProperty("name")]
 		public string Name { get; internal set; }
 
 		/// <summary>
 		/// Sets the name localizations.
 		/// </summary>
 		[JsonProperty("name_localizations", NullValueHandling = NullValueHandling.Ignore)]
 		internal Dictionary<string, string> RawNameLocalizations { get; set; }
 
 		/// <summary>
 		/// Gets the name localizations.
 		/// </summary>
 		[JsonIgnore]
 		public DiscordApplicationCommandLocalization NameLocalizations
 			=> new(this.RawNameLocalizations);
 
 		/// <summary>
 		/// Gets the description of this command parameter.
 		/// </summary>
 		[JsonProperty("description")]
 		public string Description { get; internal set; }
 
 		/// <summary>
 		/// Sets the description localizations.
 		/// </summary>
 		[JsonProperty("description_localizations", NullValueHandling = NullValueHandling.Ignore)]
 		internal Dictionary<string, string> RawDescriptionLocalizations { get; set; }
 
 		/// <summary>
 		/// Gets the description localizations.
 		/// </summary>
 		[JsonIgnore]
 		public DiscordApplicationCommandLocalization DescriptionLocalizations
 			=> new(this.RawDescriptionLocalizations);
 
 		/// <summary>
 		/// Gets whether this command parameter is required.
 		/// </summary>
 		[JsonProperty("required", NullValueHandling = NullValueHandling.Ignore)]
 		public bool? Required { get; internal set; }
 
 		/// <summary>
 		/// Gets the optional choices for this command parameter.
 		/// Not applicable for auto-complete options.
 		/// </summary>
 		[JsonProperty("choices", NullValueHandling = NullValueHandling.Ignore)]
 		public IReadOnlyCollection<DiscordApplicationCommandOptionChoice> Choices { get; internal set; }
 
 		/// <summary>
 		/// Gets the optional subcommand parameters for this parameter.
 		/// </summary>
 		[JsonProperty("options", NullValueHandling = NullValueHandling.Ignore)]
 		public IReadOnlyCollection<DiscordApplicationCommandOption> Options { get; internal set; }
 
 		/// <summary>
 		/// Gets the optional allowed channel types.
 		/// </summary>
 		[JsonProperty("channel_types", NullValueHandling = NullValueHandling.Ignore)]
 		public IReadOnlyCollection<ChannelType> ChannelTypes { get; internal set; }
 
 		/// <summary>
 		/// Gets whether this option provides autocompletion.
 		/// </summary>
 		[JsonProperty("autocomplete", NullValueHandling = NullValueHandling.Ignore)]
 		public bool? AutoComplete { get; internal set; }
 
 		/// <summary>
 		/// Gets the minimum value for this slash command parameter.
 		/// </summary>
 		[JsonProperty("min_value", NullValueHandling = NullValueHandling.Ignore)]
 		public object MinimumValue { get; internal set; }
 
 		/// <summary>
 		/// Gets the maximum value for this slash command parameter.
 		/// </summary>
 		[JsonProperty("max_value", NullValueHandling = NullValueHandling.Ignore)]
 		public object MaximumValue { get; internal set; }
 
 		/// <summary>
 		/// Creates a new instance of a <see cref="DiscordApplicationCommandOption"/>.
 		/// </summary>
 		/// <param name="name">The name of this parameter.</param>
 		/// <param name="description">The description of the parameter.</param>
 		/// <param name="type">The type of this parameter.</param>
 		/// <param name="required">Whether the parameter is required.</param>
 		/// <param name="choices">The optional choice selection for this parameter.</param>
 		/// <param name="options">The optional subcommands for this parameter.</param>
 		/// <param name="channelTypes">If the option is a channel type, the channels shown will be restricted to these types.</param>
 		/// <param name="autocomplete">Whether this option provides autocompletion.</param>
 		/// <param name="minimumValue">The minimum value for this parameter. Only valid for types <see cref="ApplicationCommandOptionType.Integer"/> or <see cref="ApplicationCommandOptionType.Number"/>.</param>
 		/// <param name="maximumValue">The maximum value for this parameter. Only valid for types <see cref="ApplicationCommandOptionType.Integer"/> or <see cref="ApplicationCommandOptionType.Number"/>.</param>
 		/// <param name="nameLocalizations">The localizations of the parameter name.</param>
 		/// <param name="descriptionLocalizations">The localizations of the parameter description.</param>
 		public DiscordApplicationCommandOption(string name, string description, ApplicationCommandOptionType type, bool? required = null, IEnumerable<DiscordApplicationCommandOptionChoice> choices = null, IEnumerable<DiscordApplicationCommandOption> options = null, IEnumerable<ChannelType> channelTypes = null, bool? autocomplete = null, object minimumValue = null, object maximumValue = null, DiscordApplicationCommandLocalization nameLocalizations = null, DiscordApplicationCommandLocalization descriptionLocalizations = null)
 		{
 			if (!Utilities.IsValidSlashCommandName(name))
 				throw new ArgumentException("Invalid application command option name specified. It must be below 32 characters and not contain any whitespace.", nameof(name));
 			if (name.Any(char.IsUpper))
 				throw new ArgumentException("Application command option name cannot have any upper case characters.", nameof(name));
 			if (description.Length > 100)
 				throw new ArgumentException("Application command option description cannot exceed 100 characters.", nameof(description));
 			if ((autocomplete ?? false) && (choices?.Any() ?? false))
 				throw new InvalidOperationException("Auto-complete slash command options cannot provide choices.");
 
 			this.Name = name;
 			this.Description = description;
 			this.Type = type;
 			this.Required = required;
-			this.Choices = choices != null ? new ReadOnlyCollection<DiscordApplicationCommandOptionChoice>(choices.ToList()) : null;
-			this.Options = options != null ? new ReadOnlyCollection<DiscordApplicationCommandOption>(options.ToList()) : null;
-			this.ChannelTypes = channelTypes != null ? new ReadOnlyCollection<ChannelType>(channelTypes.ToList()) : null;
+			this.Choices = choices?.ToArray();
+			this.Options = options?.ToArray();
+			this.ChannelTypes = channelTypes?.ToArray();
 			this.AutoComplete = autocomplete;
 			this.MinimumValue = minimumValue;
 			this.MaximumValue = maximumValue;
 			this.RawNameLocalizations = nameLocalizations?.GetKeyValuePairs();
 			this.RawDescriptionLocalizations = descriptionLocalizations?.GetKeyValuePairs();
 		}
 	}
 }
diff --git a/DisCatSharp/Entities/Channel/DiscordChannel.cs b/DisCatSharp/Entities/Channel/DiscordChannel.cs
index 9006bbf1c..f5f8f4f14 100644
--- a/DisCatSharp/Entities/Channel/DiscordChannel.cs
+++ b/DisCatSharp/Entities/Channel/DiscordChannel.cs
@@ -1,1318 +1,1330 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
 using DisCatSharp.Enums;
 using DisCatSharp.Net;
 using DisCatSharp.Net.Abstractions;
 using DisCatSharp.Net.Models;
 
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Entities
 {
 	/// <summary>
 	/// Represents a discord channel.
 	/// </summary>
 	public class DiscordChannel : SnowflakeObject, IEquatable<DiscordChannel>
 	{
 		/// <summary>
 		/// Gets ID of the guild to which this channel belongs.
 		/// </summary>
 		[JsonProperty("guild_id", NullValueHandling = NullValueHandling.Ignore)]
 		public ulong? GuildId { get; internal set; }
 
 		/// <summary>
 		/// Gets ID of the category that contains this channel.
 		/// </summary>
 		[JsonProperty("parent_id", NullValueHandling = NullValueHandling.Include)]
 		public ulong? ParentId { get; internal set; }
 
 		/// <summary>
 		/// Gets the category that contains this channel.
 		/// </summary>
 		[JsonIgnore]
 		public DiscordChannel Parent
 			=> this.ParentId.HasValue ? this.Guild.GetChannel(this.ParentId.Value) : null;
 
 		/// <summary>
 		/// Gets the name of this channel.
 		/// </summary>
 		[JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
 		public string Name { get; internal set; }
 
 		/// <summary>
 		/// Gets the type of this channel.
 		/// </summary>
 		[JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
 		public ChannelType Type { get; internal set; }
 
 		/// <summary>
 		/// Gets this channel's banner hash, when applicable.
 		/// </summary>
 		[JsonProperty("banner")]
 		public string BannerHash { get; internal set; }
 
 		/// <summary>
 		/// Gets this channel's banner in url form.
 		/// </summary>
 		[JsonIgnore]
 		public string BannerUrl
 			=> !string.IsNullOrWhiteSpace(this.BannerHash) ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Uri}{Endpoints.CHANNELS}/{this.Id.ToString(CultureInfo.InvariantCulture)}{Endpoints.BANNERS}/{this.BannerHash}.{(this.BannerHash.StartsWith("a_") ? "gif" : "png")}" : null;
 
 		/// <summary>
 		/// Gets the position of this channel.
 		/// </summary>
 		[JsonProperty("position", NullValueHandling = NullValueHandling.Ignore)]
 		public int Position { get; internal set; }
 
 		/// <summary>
 		/// Gets the flags of this channel.
 		/// </summary>
 		[JsonProperty("flags", NullValueHandling = NullValueHandling.Ignore)]
 		public ChannelFlags Flags { get; internal set; }
 
 		/// <summary>
 		/// Gets the maximum available position to move the channel to.
 		/// This can contain outdated information.
 		/// </summary>
 		public int GetMaxPosition()
 		{
 			var channels = this.Guild.Channels.Values;
 			return this.ParentId != null
 				? this.Type == ChannelType.Text || this.Type == ChannelType.News
-					? channels.Where(xc => xc.ParentId == this.ParentId && (xc.Type == ChannelType.Text || xc.Type == ChannelType.News)).OrderBy(xc => xc.Position).Last().Position
+					? channels.Where(xc =>
+							xc.ParentId == this.ParentId &&
+							(xc.Type == ChannelType.Text || xc.Type == ChannelType.News))
+						.Max(xc => xc.Position)
 					: this.Type == ChannelType.Voice || this.Type == ChannelType.Stage
-						? channels.Where(xc => xc.ParentId == this.ParentId && (xc.Type == ChannelType.Voice || xc.Type == ChannelType.Stage)).OrderBy(xc => xc.Position).Last().Position
-						: channels.Where(xc => xc.ParentId == this.ParentId && xc.Type == this.Type).OrderBy(xc => xc.Position).Last().Position
-				: channels.Where(xc => xc.ParentId == null && xc.Type == this.Type).OrderBy(xc => xc.Position).Last().Position;
+						? channels.Where(xc =>
+							xc.ParentId == this.ParentId &&
+							(xc.Type == ChannelType.Voice || xc.Type == ChannelType.Stage)).Max(xc => xc.Position)
+						: channels.Where(xc => xc.ParentId == this.ParentId && xc.Type == this.Type)
+							.Max(xc => xc.Position)
+				: channels.Where(xc => xc.ParentId == null && xc.Type == this.Type).Max(xc => xc.Position);
 		}
 
 		/// <summary>
 		/// Gets the minimum available position to move the channel to.
 		/// </summary>
 		public int GetMinPosition()
 		{
 			var channels = this.Guild.Channels.Values;
 			return this.ParentId != null
 				? this.Type == ChannelType.Text || this.Type == ChannelType.News
-					? channels.Where(xc => xc.ParentId == this.ParentId && (xc.Type == ChannelType.Text || xc.Type == ChannelType.News)).OrderBy(xc => xc.Position).First().Position
+					? channels.Where(xc =>
+							xc.ParentId == this.ParentId &&
+							(xc.Type == ChannelType.Text || xc.Type == ChannelType.News))
+						.Min(xc => xc.Position)
 					: this.Type == ChannelType.Voice || this.Type == ChannelType.Stage
-						? channels.Where(xc => xc.ParentId == this.ParentId && (xc.Type == ChannelType.Voice || xc.Type == ChannelType.Stage)).OrderBy(xc => xc.Position).First().Position
-						: channels.Where(xc => xc.ParentId == this.ParentId && xc.Type == this.Type).OrderBy(xc => xc.Position).First().Position
-				: channels.Where(xc => xc.ParentId == null && xc.Type == this.Type).OrderBy(xc => xc.Position).First().Position;
+						? channels.Where(xc =>
+							xc.ParentId == this.ParentId &&
+							(xc.Type == ChannelType.Voice || xc.Type == ChannelType.Stage)).Min(xc => xc.Position)
+						: channels.Where(xc => xc.ParentId == this.ParentId && xc.Type == this.Type)
+							.Min(xc => xc.Position)
+				: channels.Where(xc => xc.ParentId == null && xc.Type == this.Type).Min(xc => xc.Position);
 		}
 
 		/// <summary>
 		/// Gets whether this channel is a DM channel.
 		/// </summary>
 		[JsonIgnore]
 		public bool IsPrivate
 			=> this.Type == ChannelType.Private || this.Type == ChannelType.Group;
 
 		/// <summary>
 		/// Gets whether this channel is a channel category.
 		/// </summary>
 		[JsonIgnore]
 		public bool IsCategory
 			=> this.Type == ChannelType.Category;
 
 		/// <summary>
 		/// Gets whether this channel is a stage channel.
 		/// </summary>
 		[JsonIgnore]
 		public bool IsStage
 			=> this.Type == ChannelType.Stage;
 
 		/// <summary>
 		/// Gets the guild to which this channel belongs.
 		/// </summary>
 		[JsonIgnore]
 		public DiscordGuild Guild
 			=> this.GuildId.HasValue && this.Discord.Guilds.TryGetValue(this.GuildId.Value, out var guild) ? guild : null;
 
 		/// <summary>
 		/// Gets a collection of permission overwrites for this channel.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyList<DiscordOverwrite> PermissionOverwrites
 			=> this._permissionOverwritesLazy.Value;
 
 		[JsonProperty("permission_overwrites", NullValueHandling = NullValueHandling.Ignore)]
 		internal List<DiscordOverwrite> PermissionOverwritesInternal = new();
 		[JsonIgnore]
 		private readonly Lazy<IReadOnlyList<DiscordOverwrite>> _permissionOverwritesLazy;
 
 		/// <summary>
 		/// Gets the channel's topic. This is applicable to text channels only.
 		/// </summary>
 		[JsonProperty("topic", NullValueHandling = NullValueHandling.Ignore)]
 		public string Topic { get; internal set; }
 
 		/// <summary>
 		/// Gets the ID of the last message sent in this channel. This is applicable to text channels only.
 		/// </summary>
 		[JsonProperty("last_message_id", NullValueHandling = NullValueHandling.Ignore)]
 		public ulong? LastMessageId { get; internal set; }
 
 		/// <summary>
 		/// Gets this channel's bitrate. This is applicable to voice channels only.
 		/// </summary>
 		[JsonProperty("bitrate", NullValueHandling = NullValueHandling.Ignore)]
 		public int? Bitrate { get; internal set; }
 
 		/// <summary>
 		/// Gets this channel's user limit. This is applicable to voice channels only.
 		/// </summary>
 		[JsonProperty("user_limit", NullValueHandling = NullValueHandling.Ignore)]
 		public int? UserLimit { get; internal set; }
 
 		/// <summary>
 		/// <para>Gets the slow mode delay configured for this channel.</para>
 		/// <para>All bots, as well as users with <see cref="Permissions.ManageChannels"/> or <see cref="Permissions.ManageMessages"/> permissions in the channel are exempt from slow mode.</para>
 		/// </summary>
 		[JsonProperty("rate_limit_per_user")]
 		public int? PerUserRateLimit { get; internal set; }
 
 		/// <summary>
 		/// Gets this channel's video quality mode. This is applicable to voice channels only.
 		/// </summary>
 		[JsonProperty("video_quality_mode", NullValueHandling = NullValueHandling.Ignore)]
 		public VideoQualityMode? QualityMode { get; internal set; }
 
 		/// <summary>
 		/// List of available tags for forum posts.
 		/// </summary>
 		[JsonProperty("available_tags", NullValueHandling = NullValueHandling.Ignore)]
 		public List<ForumPostTag> AvailableTags { get; internal set; }
 
 		/// <summary>
 		/// Starter template for forum posts.
 		/// </summary>
 		[JsonProperty("template", NullValueHandling = NullValueHandling.Ignore)]
 		public string Template { get; internal set; }
 
 		/// <summary>
 		/// Gets when the last pinned message was pinned.
 		/// </summary>
 		[JsonIgnore]
 		public DateTimeOffset? LastPinTimestamp
 			=> !string.IsNullOrWhiteSpace(this.LastPinTimestampRaw) && DateTimeOffset.TryParse(this.LastPinTimestampRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ?
 				dto : null;
 
 		/// <summary>
 		/// Gets when the last pinned message was pinned as raw string.
 		/// </summary>
 		[JsonProperty("last_pin_timestamp", NullValueHandling = NullValueHandling.Ignore)]
 		internal string LastPinTimestampRaw { get; set; }
 
 		/// <summary>
 		/// Gets this channel's default duration for newly created threads, in minutes, to automatically archive the thread after recent activity.
 		/// </summary>
 		[JsonProperty("default_auto_archive_duration", NullValueHandling = NullValueHandling.Ignore)]
 		public ThreadAutoArchiveDuration? DefaultAutoArchiveDuration { get; internal set; }
 
 		/// <summary>
 		/// Gets this channel's mention string.
 		/// </summary>
 		[JsonIgnore]
 		public string Mention
 			=> Formatter.Mention(this);
 
 		/// <summary>
 		/// Gets this channel's children. This applies only to channel categories.
 		/// </summary>
 		[JsonIgnore]
-		public IReadOnlyList<DiscordChannel> Children =>
+		public IEnumerable<DiscordChannel> Children =>
 			!this.IsCategory
 				? throw new ArgumentException("Only channel categories contain children.")
-				: this.Guild.ChannelsInternal.Values.Where(e => e.ParentId == this.Id).ToList();
+				: this.Guild.ChannelsInternal.Values.Where(e => e.ParentId == this.Id);
 
 		/// <summary>
 		/// Gets the list of members currently in the channel (if voice channel), or members who can see the channel (otherwise).
 		/// </summary>
 		[JsonIgnore]
-		public virtual IReadOnlyList<DiscordMember> Users =>
+		public virtual IEnumerable<DiscordMember> Users =>
 			this.Guild == null
 				? throw new InvalidOperationException("Cannot query users outside of guild channels.")
 				: this.IsVoiceJoinable()
-					? this.Guild.Members.Values.Where(x => x.VoiceState?.ChannelId == this.Id).ToList()
-					: this.Guild.Members.Values.Where(x => (this.PermissionsFor(x) & Permissions.AccessChannels) == Permissions.AccessChannels).ToList();
+					? this.Guild.Members.Values.Where(x => x.VoiceState?.ChannelId == this.Id)
+					: this.Guild.Members.Values.Where(x => (this.PermissionsFor(x) & Permissions.AccessChannels) == Permissions.AccessChannels);
 
 		/// <summary>
 		/// Gets whether this channel is an NSFW channel.
 		/// </summary>
 		[JsonProperty("nsfw")]
 		public bool IsNsfw { get; internal set; }
 
 		/// <summary>
 		/// Gets this channel's region id (if voice channel).
 		/// </summary>
 		[JsonProperty("rtc_region", NullValueHandling = NullValueHandling.Ignore)]
 		internal string RtcRegionId { get; set; }
 
 		/// <summary>
 		/// Gets this channel's region override (if voice channel).
 		/// </summary>
 		[JsonIgnore]
 		public DiscordVoiceRegion RtcRegion
 			=> this.RtcRegionId != null ? this.Discord.VoiceRegions[this.RtcRegionId] : null;
 
 
 		/// <summary>
 		/// Only sent on the resolved channels of interaction responses for application commands.
 		/// Gets the permissions of the user in this channel who invoked the command.
 		/// </summary>
 		[JsonProperty("permissions", NullValueHandling = NullValueHandling.Ignore)]
 		public Permissions? UserPermissions { get; internal set; }
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordChannel"/> class.
 		/// </summary>
 		internal DiscordChannel()
 		{
-			this._permissionOverwritesLazy = new Lazy<IReadOnlyList<DiscordOverwrite>>(() => new ReadOnlyCollection<DiscordOverwrite>(this.PermissionOverwritesInternal));
+			this._permissionOverwritesLazy = new Lazy<IReadOnlyList<DiscordOverwrite>>(() => this.PermissionOverwritesInternal);
 		}
 
 		#region Methods
 
 		/// <summary>
 		/// Sends a message to this channel.
 		/// </summary>
 		/// <param name="content">Content of the message to send.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.SendMessages"/> permission if TTS is true and <see cref="Permissions.SendTtsMessages"/> if TTS is true.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordMessage> SendMessageAsync(string content) =>
 			!this.IsWritable()
 				? throw new ArgumentException("Cannot send a text message to a non-text channel.")
 				: this.Discord.ApiClient.CreateMessageAsync(this.Id, content, null, sticker: null, replyMessageId: null, mentionReply: false, failOnInvalidReply: false);
 
 		/// <summary>
 		/// Sends a message to this channel.
 		/// </summary>
 		/// <param name="embed">Embed to attach to the message.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.SendMessages"/> permission and <see cref="Permissions.SendTtsMessages"/> if TTS is true.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordMessage> SendMessageAsync(DiscordEmbed embed) =>
 			!this.IsWritable()
 				? throw new ArgumentException("Cannot send a text message to a non-text channel.")
 				: this.Discord.ApiClient.CreateMessageAsync(this.Id, null, embed != null ? new[] { embed } : null, sticker: null, replyMessageId: null, mentionReply: false, failOnInvalidReply: false);
 
 		/// <summary>
 		/// Sends a message to this channel.
 		/// </summary>
 		/// <param name="embed">Embed to attach to the message.</param>
 		/// <param name="content">Content of the message to send.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.SendMessages"/> permission if TTS is true and <see cref="Permissions.SendTtsMessages"/> if TTS is true.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordMessage> SendMessageAsync(string content, DiscordEmbed embed) =>
 			!this.IsWritable()
 				? throw new ArgumentException("Cannot send a text message to a non-text channel.")
 				: this.Discord.ApiClient.CreateMessageAsync(this.Id, content, embed != null ? new[] { embed } : null, sticker: null, replyMessageId: null, mentionReply: false, failOnInvalidReply: false);
 
 		/// <summary>
 		/// Sends a message to this channel.
 		/// </summary>
 		/// <param name="builder">The builder with all the items to send.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.SendMessages"/> permission TTS is true and <see cref="Permissions.SendTtsMessages"/> if TTS is true.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordMessage> SendMessageAsync(DiscordMessageBuilder builder)
 			=> this.Discord.ApiClient.CreateMessageAsync(this.Id, builder);
 
 		/// <summary>
 		/// Sends a message to this channel.
 		/// </summary>
 		/// <param name="action">The builder with all the items to send.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.SendMessages"/> permission TTS is true and <see cref="Permissions.SendTtsMessages"/> if TTS is true.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordMessage> SendMessageAsync(Action<DiscordMessageBuilder> action)
 		{
 			var builder = new DiscordMessageBuilder();
 			action(builder);
 
 
 			return !this.IsWritable()
 				? throw new ArgumentException("Cannot send a text message to a non-text channel.")
 				: this.Discord.ApiClient.CreateMessageAsync(this.Id, builder);
 		}
 
 		/// <summary>
 		/// Deletes a guild channel
 		/// </summary>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task DeleteAsync(string reason = null)
 			=> this.Discord.ApiClient.DeleteChannelAsync(this.Id, reason);
 
 		/// <summary>
 		/// Clones this channel. This operation will create a channel with identical settings to this one. Note that this will not copy messages.
 		/// </summary>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <returns>Newly-created channel.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordChannel> CloneAsync(string reason = null)
 		{
 			if (this.Guild == null)
 				throw new InvalidOperationException("Non-guild channels cannot be cloned.");
 
 			var ovrs = new List<DiscordOverwriteBuilder>();
 			foreach (var ovr in this.PermissionOverwritesInternal)
 				ovrs.Add(await new DiscordOverwriteBuilder().FromAsync(ovr).ConfigureAwait(false));
 
 			var bitrate = this.Bitrate;
 			var userLimit = this.UserLimit;
 			Optional<int?> perUserRateLimit = this.PerUserRateLimit;
 
 			if (!this.IsVoiceJoinable())
 			{
 				bitrate = null;
 				userLimit = null;
 			}
 
 			if (this.Type == ChannelType.Stage)
 			{
 				userLimit = null;
 			}
 			if (!this.IsWritable())
 			{
 				perUserRateLimit = Optional.None;
 			}
 
 			return await this.Guild.CreateChannelAsync(this.Name, this.Type, this.Parent, this.Topic, bitrate, userLimit, ovrs, this.IsNsfw, perUserRateLimit, this.QualityMode, this.DefaultAutoArchiveDuration, reason).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Returns a specific message
 		/// </summary>
 		/// <param name="id">The id of the message</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ReadMessageHistory"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordMessage> GetMessageAsync(ulong id) =>
 			this.Discord.Configuration.MessageCacheSize > 0
 			&& this.Discord is DiscordClient dc
 			&& dc.MessageCache != null
 			&& dc.MessageCache.TryGet(xm => xm.Id == id && xm.ChannelId == this.Id, out var msg)
 				? msg
 				: await this.Discord.ApiClient.GetMessageAsync(this.Id, id).ConfigureAwait(false);
 
 		/// <summary>
 		/// Modifies the current channel.
 		/// </summary>
 		/// <param name="action">Action to perform on this channel</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/>.</exception>
 		/// <exception cref="System.NotSupportedException">Thrown when the client does not have the correct <see cref="PremiumTier"/> for modifying the <see cref="ThreadAutoArchiveDuration"/>.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task ModifyAsync(Action<ChannelEditModel> action)
 		{
 			var mdl = new ChannelEditModel();
 			action(mdl);
 
 			if (mdl.DefaultAutoArchiveDuration.HasValue)
 			{
 				if (!Utilities.CheckThreadAutoArchiveDurationFeature(this.Guild, mdl.DefaultAutoArchiveDuration.Value))
 					throw new NotSupportedException($"Cannot modify DefaultAutoArchiveDuration. Guild needs boost tier {(mdl.DefaultAutoArchiveDuration.Value == ThreadAutoArchiveDuration.ThreeDays ? "one" : "two")}.");
 			}
 			if (mdl.Banner.HasValue)
 			{
 				if (!this.Guild.Features.CanSetChannelBanner)
 					throw new NotSupportedException($"Cannot modify Banner. Guild needs boost tier three.");
 			}
 
 			var bannerb64 = ImageTool.Base64FromStream(mdl.Banner);
 
 			return this.Discord.ApiClient.ModifyChannelAsync(this.Id, mdl.Name, mdl.Position, mdl.Topic, mdl.Nsfw,
 				mdl.Parent.Map(p => p?.Id), mdl.Bitrate, mdl.UserLimit, mdl.PerUserRateLimit, mdl.RtcRegion.Map(r => r?.Id),
 				mdl.QualityMode, mdl.DefaultAutoArchiveDuration, mdl.Type, mdl.PermissionOverwrites, bannerb64, mdl.AuditLogReason);
 		}
 
 		/// <summary>
 		/// Updates the channel position when it doesn't have a category.
 		/// 
 		/// Use <see cref="ModifyParentAsync"/> for moving to other categories.
 		/// Use <see cref="RemoveParentAsync"/> to move out of a category.
 		/// Use <see cref="ModifyPositionInCategoryAsync"/> for moving within a category.
 		/// </summary>
 		/// <param name="position">Position the channel should be moved to.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task ModifyPositionAsync(int position, string reason = null)
 		{
 			if (this.Guild == null)
 				throw new ArgumentException("Cannot modify order of non-guild channels.");
 			if (!this.IsMovable())
 				throw new NotSupportedException("You can't move this type of channel in categories.");
 			if (this.ParentId != null)
 				throw new ArgumentException("Cannot modify order of channels within a category. Use ModifyPositionInCategoryAsync instead.");
 
 			var pmds = this.Guild.ChannelsInternal.Values.Where(xc => xc.Type == this.Type).OrderBy(xc => xc.Position)
 				.Select(x => new RestGuildChannelReorderPayload
 				{
 					ChannelId = x.Id,
 					Position = x.Id == this.Id ? position : x.Position >= position ? x.Position + 1 : x.Position
 				});
 
 			return this.Discord.ApiClient.ModifyGuildChannelPositionAsync(this.Guild.Id, pmds, reason);
 		}
 
 		/// <summary>
 		/// Updates the channel position within it's own category.
 		/// 
 		/// Use <see cref="ModifyParentAsync"/> for moving to other categories.
 		/// Use <see cref="RemoveParentAsync"/> to move out of a category.
 		/// Use <see cref="ModifyPositionAsync"/> to move channels outside a category.
 		/// </summary>
 		/// <param name="position">The position.</param>
 		/// <param name="reason">The reason.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		/// <exception cref="System.IndexOutOfRangeException">Thrown when <paramref name="position"/> is out of range.</exception>
 		/// <exception cref="System.ArgumentException">Thrown when function is called on a channel without a parent channel.</exception>
 		public async Task ModifyPositionInCategoryAsync(int position, string reason = null)
 		{
 			if (!this.IsMovableInParent())
 				throw new NotSupportedException("You can't move this type of channel in categories.");
 
 			var isUp = position > this.Position;
 
 			var channels = await this.InternalRefreshChannelsAsync();
 
 			var chns = this.ParentId != null
 				? this.Type == ChannelType.Text || this.Type == ChannelType.News
 					? channels.Where(xc => xc.ParentId == this.ParentId && (xc.Type == ChannelType.Text || xc.Type == ChannelType.News))
 					: this.Type == ChannelType.Voice || this.Type == ChannelType.Stage
 						? channels.Where(xc => xc.ParentId == this.ParentId && (xc.Type == ChannelType.Voice || xc.Type == ChannelType.Stage))
 						: channels.Where(xc => xc.ParentId == this.ParentId && xc.Type == this.Type)
 				: this.Type == ChannelType.Text || this.Type == ChannelType.News
 					? channels.Where(xc => xc.ParentId == null && (xc.Type == ChannelType.Text || xc.Type == ChannelType.News))
 					: this.Type == ChannelType.Voice || this.Type == ChannelType.Stage
 						? channels.Where(xc => xc.ParentId == null && (xc.Type == ChannelType.Voice || xc.Type == ChannelType.Stage))
 						: channels.Where(xc => xc.ParentId == null && xc.Type == this.Type);
 
 			var ochns = chns.OrderBy(xc => xc.Position).ToArray();
 			var min = ochns.First().Position;
 			var max = ochns.Last().Position;
 
 			if (position > max || position < min)
 				throw new IndexOutOfRangeException($"Position is not in range. {position} is {(position > max ? "greater then the maximal" : "lower then the minimal")} position.");
 
 			var pmds = ochns.Select(x =>
 				new RestGuildChannelReorderPayload
 				{
 					ChannelId = x.Id,
 					Position = x.Id == this.Id
 						? position
 						: isUp
 							? x.Position <= position && x.Position > this.Position ? x.Position - 1 : x.Position
 							: x.Position >= position && x.Position < this.Position ? x.Position + 1 : x.Position
 				}
 			);
 
 			await this.Discord.ApiClient.ModifyGuildChannelPositionAsync(this.Guild.Id, pmds, reason).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Internally refreshes the channel list.
 		/// </summary>
 		private async Task<IReadOnlyList<DiscordChannel>> InternalRefreshChannelsAsync()
 		{
 			await this.RefreshPositionsAsync();
-			return this.Guild.Channels.Values.ToList().AsReadOnly();
+			return this.Guild.Channels.Values.ToArray();
 		}
 
 		/// <summary>
 		/// Refreshes the positions.
 		/// </summary>
 		public async Task RefreshPositionsAsync()
 		{
 			var channels = await this.Discord.ApiClient.GetGuildChannelsAsync(this.Guild.Id);
 			this.Guild.ChannelsInternal.Clear();
-			foreach (var channel in channels.ToList())
+			foreach (var channel in channels)
 			{
 				channel.Discord = this.Discord;
 				foreach (var xo in channel.PermissionOverwritesInternal)
 				{
 					xo.Discord = this.Discord;
 					xo.ChannelId = channel.Id;
 				}
 				this.Guild.ChannelsInternal[channel.Id] = channel;
 			}
 		}
 
 		/// <summary>
 		/// Updates the channel position within it's own category.
 		/// Valid modes: '+' or 'down' to move a channel down | '-' or 'up' to move a channel up.
 		///
 		/// Use <see cref="ModifyParentAsync"/> for moving to other categories.
 		/// Use <see cref="RemoveParentAsync"/> to move out of a category.
 		/// Use <see cref="ModifyPositionAsync"/> to move channels outside a category.
 		/// </summary>
 		/// <param name="mode">The mode. Valid: '+' or 'down' to move a channel down | '-' or 'up' to move a channel up</param>
 		/// <param name="position">The position.</param>
 		/// <param name="reason">The reason.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		/// <exception cref="System.IndexOutOfRangeException">Thrown when <paramref name="position"/> is out of range.</exception>
 		/// <exception cref="System.ArgumentException">Thrown when function is called on a channel without a parent channel, a wrong mode is givven or given position is zero.</exception>
 		public Task ModifyPositionInCategorySmartAsync(string mode, int position, string reason = null)
 		{
 			if (!this.IsMovableInParent())
 				throw new NotSupportedException("You can't move this type of channel in categories.");
 
 			if (mode != "+" && mode != "-" && mode != "down" && mode != "up")
 				throw new ArgumentException("Error with the selected mode: Valid is '+' or 'down' to move a channel down and '-' or 'up' to move a channel up");
 
 			var positive = mode == "+" || mode == "positive" || mode == "down";
 			var negative = mode == "-" || mode == "negative" || mode == "up";
 			return positive
 				? position < this.GetMaxPosition()
 					? this.ModifyPositionInCategoryAsync(this.Position + position, reason)
 					: throw new IndexOutOfRangeException($"Position is not in range of category.")
 				: negative
 					? position > this.GetMinPosition()
 						? this.ModifyPositionInCategoryAsync(this.Position - position, reason)
 						: throw new IndexOutOfRangeException($"Position is not in range of category.")
 					: throw new ArgumentException("You can only modify with +X or -X. 0 is not valid.");
 		}
 
 		/// <summary>
 		/// Updates the channel parent, moving the channel to the bottom of the new category.
 		/// </summary>
 		/// <param name="newParent">New parent for channel. Use <see cref="RemoveParentAsync(string)"/> to remove from parent.</param>
 		/// <param name="lockPermissions">Sync permissions with parent. Defaults to null.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task ModifyParentAsync(DiscordChannel newParent, bool? lockPermissions = null, string reason = null)
 		{
 			if (this.Guild == null)
 				throw new ArgumentException("Cannot modify parent of non-guild channels.");
 			if (!this.IsMovableInParent())
 				throw new NotSupportedException("You can't move this type of channel in categories.");
 			if (newParent.Type is not ChannelType.Category)
 				throw new ArgumentException("Only category type channels can be parents.");
 
 
 			var position = this.Guild.ChannelsInternal.Values.Where(xc => xc.Type == this.Type && xc.ParentId == newParent.Id) // gets list same type channels in parent
                             .Select(xc => xc.Position).DefaultIfEmpty(-1).Max() + 1; // returns highest position of list +1, default val: 0
 
 			var pmds = this.Guild.ChannelsInternal.Values.Where(xc => xc.Type == this.Type)
 				.OrderBy(xc => xc.Position)
 				.Select(x =>
 				{
 					var pmd = new RestGuildChannelNewParentPayload
 					{
 						ChannelId = x.Id,
 						Position = x.Position >= position ? x.Position + 1 : x.Position,
 					};
 					if (x.Id == this.Id)
 					{
 						pmd.Position = position;
 						pmd.ParentId = newParent is not null ? newParent.Id : null;
 						pmd.LockPermissions = lockPermissions;
 					}
 
 					return pmd;
 				});
 
 			return this.Discord.ApiClient.ModifyGuildChannelParentAsync(this.Guild.Id, pmds, reason);
 		}
 
 		/// <summary>
 		/// Moves the channel out of a category.
 		/// </summary>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task RemoveParentAsync(string reason = null)
 		{
 			if (this.Guild == null)
 				throw new ArgumentException("Cannot modify parent of non-guild channels.");
 			if (!this.IsMovableInParent())
 				throw new NotSupportedException("You can't move this type of channel in categories.");
 
 			var pmds = this.Guild.ChannelsInternal.Values.Where(xc => xc.Type == this.Type)
 				.OrderBy(xc => xc.Position)
 				.Select(x =>
 				{
 					var pmd = new RestGuildChannelNoParentPayload { ChannelId = x.Id };
 					if (x.Id == this.Id)
 					{
 						pmd.Position = 1;
 						pmd.ParentId = null;
 					}
 					else
 					{
 						pmd.Position = x.Position < this.Position ? x.Position + 1 : x.Position;
 					}
 
 					return pmd;
 				});
 
 			return this.Discord.ApiClient.DetachGuildChannelParentAsync(this.Guild.Id, pmds, reason);
 		}
 
 		/// <summary>
 		/// Returns a list of messages before a certain message.
 		/// <param name="limit">The amount of messages to fetch.</param>
 		/// <param name="before">Message to fetch before from.</param>
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.AccessChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<IReadOnlyList<DiscordMessage>> GetMessagesBeforeAsync(ulong before, int limit = 100)
 			=> this.GetMessagesInternalAsync(limit, before, null, null);
 
 		/// <summary>
 		/// Returns a list of messages after a certain message.
 		/// <param name="limit">The amount of messages to fetch.</param>
 		/// <param name="after">Message to fetch after from.</param>
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.AccessChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<IReadOnlyList<DiscordMessage>> GetMessagesAfterAsync(ulong after, int limit = 100)
 			=> this.GetMessagesInternalAsync(limit, null, after, null);
 
 		/// <summary>
 		/// Returns a list of messages around a certain message.
 		/// <param name="limit">The amount of messages to fetch.</param>
 		/// <param name="around">Message to fetch around from.</param>
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.AccessChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<IReadOnlyList<DiscordMessage>> GetMessagesAroundAsync(ulong around, int limit = 100)
 			=> this.GetMessagesInternalAsync(limit, null, null, around);
 
 		/// <summary>
 		/// Returns a list of messages from the last message in the channel.
 		/// <param name="limit">The amount of messages to fetch.</param>
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.AccessChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<IReadOnlyList<DiscordMessage>> GetMessagesAsync(int limit = 100) =>
 			this.GetMessagesInternalAsync(limit, null, null, null);
 
 		/// <summary>
 		/// Returns a list of messages
 		/// </summary>
 		/// <param name="limit">How many messages should be returned.</param>
 		/// <param name="before">Get messages before snowflake.</param>
 		/// <param name="after">Get messages after snowflake.</param>
 		/// <param name="around">Get messages around snowflake.</param>
 		private async Task<IReadOnlyList<DiscordMessage>> GetMessagesInternalAsync(int limit = 100, ulong? before = null, ulong? after = null, ulong? around = null)
 		{
 			if (!this.IsWritable())
 				throw new ArgumentException("Cannot get the messages of a non-text channel.");
 
 			if (limit < 0)
 				throw new ArgumentException("Cannot get a negative number of messages.");
 
 			if (limit == 0)
 				return Array.Empty<DiscordMessage>();
 
 			//return this.Discord.ApiClient.GetChannelMessagesAsync(this.Id, limit, before, after, around);
 			if (limit > 100 && around != null)
 				throw new InvalidOperationException("Cannot get more than 100 messages around the specified ID.");
 
 			var msgs = new List<DiscordMessage>(limit);
 			var remaining = limit;
 			ulong? last = null;
 			var isAfter = after != null;
 
 			int lastCount;
 			do
 			{
 				var fetchSize = remaining > 100 ? 100 : remaining;
 				var fetch = await this.Discord.ApiClient.GetChannelMessagesAsync(this.Id, fetchSize, !isAfter ? last ?? before : null, isAfter ? last ?? after : null, around).ConfigureAwait(false);
 
 				lastCount = fetch.Count;
 				remaining -= lastCount;
 
 				if (!isAfter)
 				{
 					msgs.AddRange(fetch);
 					last = fetch.LastOrDefault()?.Id;
 				}
 				else
 				{
 					msgs.InsertRange(0, fetch);
 					last = fetch.FirstOrDefault()?.Id;
 				}
 			}
 			while (remaining > 0 && lastCount > 0);
 
-			return new ReadOnlyCollection<DiscordMessage>(msgs);
+			return msgs;
 		}
 
 		/// <summary>
 		/// Deletes multiple messages if they are less than 14 days old.  If they are older, none of the messages will be deleted and you will receive a <see cref="DisCatSharp.Exceptions.BadRequestException"/> error.
 		/// </summary>
 		/// <param name="messages">A collection of messages to delete.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageMessages"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task DeleteMessagesAsync(IEnumerable<DiscordMessage> messages, string reason = null)
 		{
 			// don't enumerate more than once
 			var msgs = messages.Where(x => x.Channel.Id == this.Id).Select(x => x.Id).ToArray();
 			if (messages == null || !msgs.Any())
 				throw new ArgumentException("You need to specify at least one message to delete.");
 
 			if (msgs.Length < 2)
 			{
 				await this.Discord.ApiClient.DeleteMessageAsync(this.Id, msgs.Single(), reason).ConfigureAwait(false);
 				return;
 			}
 
 			for (var i = 0; i < msgs.Length; i += 100)
 				await this.Discord.ApiClient.DeleteMessagesAsync(this.Id, msgs.Skip(i).Take(100), reason).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Deletes a message
 		/// </summary>
 		/// <param name="message">The message to be deleted.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageMessages"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task DeleteMessageAsync(DiscordMessage message, string reason = null)
 			=> this.Discord.ApiClient.DeleteMessageAsync(this.Id, message.Id, reason);
 
 		/// <summary>
 		/// Returns a list of invite objects
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.CreateInstantInvite"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<IReadOnlyList<DiscordInvite>> GetInvitesAsync() =>
 			this.Guild == null
 				? throw new ArgumentException("Cannot get the invites of a channel that does not belong to a guild.")
 				: this.Discord.ApiClient.GetChannelInvitesAsync(this.Id);
 
 		/// <summary>
 		/// Create a new invite object
 		/// </summary>
 		/// <param name="maxAge">Duration of invite in seconds before expiry, or 0 for never.  Defaults to 86400.</param>
 		/// <param name="maxUses">Max number of uses or 0 for unlimited. Defaults to 0</param>
 		/// <param name="temporary">Whether this invite should be temporary. Defaults to false.</param>
 		/// <param name="unique">Whether this invite should be unique. Defaults to false.</param>
 		/// <param name="targetType">The target type. Defaults to null.</param>
 		/// <param name="targetApplication">The target activity. Defaults to null.</param>
 		/// <param name="targetUser">The target user id. Defaults to null.</param>
 		/// <param name="reason">The audit log reason.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.CreateInstantInvite"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordInvite> CreateInviteAsync(int maxAge = 86400, int maxUses = 0, bool temporary = false, bool unique = false, TargetType? targetType = null, TargetActivity? targetApplication = null, ulong? targetUser = null, string reason = null)
 			=> this.Discord.ApiClient.CreateChannelInviteAsync(this.Id, maxAge, maxUses, targetType, targetApplication, targetUser, temporary, unique, reason);
 
 		#region Stage
 
 		/// <summary>
 		/// Opens a stage.
 		/// </summary>
 		/// <param name="topic">Topic of the stage.</param>
 		/// <param name="sendStartNotification">Whether @everyone should be notified.</param>
 		/// <param name="privacyLevel">Privacy level of the stage (Defaults to <see cref="StagePrivacyLevel.GuildOnly"/>.</param>
 		/// <param name="reason">Audit log reason.</param>
 		/// <returns>Stage instance</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordStageInstance> OpenStageAsync(string topic, bool sendStartNotification = false, StagePrivacyLevel privacyLevel = StagePrivacyLevel.GuildOnly, string reason = null)
 			=> await this.Discord.ApiClient.CreateStageInstanceAsync(this.Id, topic, sendStartNotification, privacyLevel, reason);
 
 		/// <summary>
 		/// Modifies a stage topic.
 		/// </summary>
 		/// <param name="topic">New topic of the stage.</param>
 		/// <param name="privacyLevel">New privacy level of the stage.</param>
 		/// <param name="reason">Audit log reason.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task ModifyStageAsync(Optional<string> topic, Optional<StagePrivacyLevel> privacyLevel, string reason = null)
 			=> await this.Discord.ApiClient.ModifyStageInstanceAsync(this.Id, topic, privacyLevel, reason);
 
 		/// <summary>
 		/// Closes a stage.
 		/// </summary>
 		/// <param name="reason">Audit log reason.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task CloseStageAsync(string reason = null)
 			=> await this.Discord.ApiClient.DeleteStageInstanceAsync(this.Id, reason);
 
 		/// <summary>
 		/// Gets a stage.
 		/// </summary>
 		/// <returns>The requested stage.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.AccessChannels"/> or <see cref="Permissions.UseVoice"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordStageInstance> GetStageAsync()
 			=> await this.Discord.ApiClient.GetStageInstanceAsync(this.Id);
 
 		#endregion
 
 		#region Scheduled Events
 
 		/// <summary>
 		/// Creates a scheduled event based on the channel type.
 		/// </summary>
 		/// <param name="name">The name.</param>
 		/// <param name="scheduledStartTime">The scheduled start time.</param>
 		/// <param name="description">The description.</param>
 		/// <param name="coverImage">The cover image.</param>
 		/// <param name="reason">The reason.</param>
 		/// <returns>A scheduled event.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the resource does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordScheduledEvent> CreateScheduledEventAsync(string name, DateTimeOffset scheduledStartTime, string description = null, Optional<Stream> coverImage = default, string reason = null)
 		{
 			if (!this.IsVoiceJoinable())
 				throw new NotSupportedException("Cannot create a scheduled event for this type of channel. Channel type must be either voice or stage.");
 
 			var type = this.Type == ChannelType.Voice ? ScheduledEventEntityType.Voice : ScheduledEventEntityType.StageInstance;
 
 			return await this.Guild.CreateScheduledEventAsync(name, scheduledStartTime, null, this, null, description, type, coverImage, reason);
 		}
 
 		#endregion
 
 		#region Threads
 
 		/// <summary>
 		/// Creates a thread.
 		/// Depending on whether it is created inside an <see cref="ChannelType.News"/> or an <see cref="ChannelType.Text"/> it is either an <see cref="ChannelType.NewsThread"/> or an <see cref="ChannelType.PublicThread"/>.
 		/// Depending on whether the <see cref="ChannelType"/> is set to <see cref="ChannelType.PrivateThread"/> it is either an <see cref="ChannelType.PrivateThread"/> or an <see cref="ChannelType.PublicThread"/> (default).
 		/// </summary>
 		/// <param name="name">The name of the thread.</param>
 		/// <param name="autoArchiveDuration"><see cref="ThreadAutoArchiveDuration"/> till it gets archived. Defaults to <see cref="ThreadAutoArchiveDuration.OneHour"/>.</param>
 		/// <param name="type">Can be either an <see cref="ChannelType.PrivateThread"/>, <see cref="ChannelType.NewsThread"/> or an <see cref="ChannelType.PublicThread"/>.</param>
 		/// <param name="rateLimitPerUser">The per user ratelimit, aka slowdown.</param>
 		/// <param name="reason">Audit log reason.</param>
 		/// <returns>The created thread.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.CreatePublicThreads"/> or <see cref="Permissions.SendMessagesInThreads"/> or if creating a private thread the <see cref="Permissions.CreatePrivateThreads"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild hasn't enabled threads atm.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		/// <exception cref="System.NotSupportedException">Thrown when the <see cref="ThreadAutoArchiveDuration"/> cannot be modified. This happens, when the guild hasn't reached a certain boost <see cref="PremiumTier"/>. Or if <see cref="GuildFeatures.CanCreatePrivateThreads"/> is not enabled for guild. This happens, if the guild does not have <see cref="PremiumTier.TierTwo"/></exception>
 		public async Task<DiscordThreadChannel> CreateThreadAsync(string name, ThreadAutoArchiveDuration autoArchiveDuration = ThreadAutoArchiveDuration.OneHour, ChannelType type = ChannelType.PublicThread, int? rateLimitPerUser = null, string reason = null) =>
 			type != ChannelType.NewsThread && type != ChannelType.PublicThread && type != ChannelType.PrivateThread
 				? throw new NotSupportedException("Wrong thread type given.")
 				: !this.IsThreadHolder()
 					? throw new NotSupportedException("Parent channel can't have threads.")
 					: type == ChannelType.PrivateThread
 						? Utilities.CheckThreadPrivateFeature(this.Guild)
 							? Utilities.CheckThreadAutoArchiveDurationFeature(this.Guild, autoArchiveDuration)
 								? await this.Discord.ApiClient.CreateThreadAsync(this.Id, null, name, autoArchiveDuration, type, rateLimitPerUser, reason)
 								: throw new NotSupportedException($"Cannot modify ThreadAutoArchiveDuration. Guild needs boost tier {(autoArchiveDuration == ThreadAutoArchiveDuration.ThreeDays ? "one" : "two")}.")
 							: throw new NotSupportedException($"Cannot create a private thread. Guild needs to be boost tier two.")
 						: Utilities.CheckThreadAutoArchiveDurationFeature(this.Guild, autoArchiveDuration)
 							? await this.Discord.ApiClient.CreateThreadAsync(this.Id, null, name, autoArchiveDuration, this.Type == ChannelType.News ? ChannelType.NewsThread : ChannelType.PublicThread, rateLimitPerUser, reason)
 							: throw new NotSupportedException($"Cannot modify ThreadAutoArchiveDuration. Guild needs boost tier {(autoArchiveDuration == ThreadAutoArchiveDuration.ThreeDays ? "one" : "two")}.");
 
 		/// <summary>
 		/// Gets joined archived private threads. Can contain more threads.
 		/// If the result's value 'HasMore' is true, you need to recall this function to get older threads.
 		/// </summary>
 		/// <param name="before">Get threads created before this thread id.</param>
 		/// <param name="limit">Defines the limit of returned <see cref="DiscordThreadResult"/>.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ReadMessageHistory"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordThreadResult> GetJoinedPrivateArchivedThreadsAsync(ulong? before, int? limit)
 			=> await this.Discord.ApiClient.GetJoinedPrivateArchivedThreadsAsync(this.Id, before, limit);
 
 		/// <summary>
 		/// Gets archived public threads. Can contain more threads.
 		/// If the result's value 'HasMore' is true, you need to recall this function to get older threads.
 		/// </summary>
 		/// <param name="before">Get threads created before this thread id.</param>
 		/// <param name="limit">Defines the limit of returned <see cref="DiscordThreadResult"/>.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ReadMessageHistory"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordThreadResult> GetPublicArchivedThreadsAsync(ulong? before, int? limit)
 			=> await this.Discord.ApiClient.GetPublicArchivedThreadsAsync(this.Id, before, limit);
 
 		/// <summary>
 		/// Gets archived private threads. Can contain more threads.
 		/// If the result's value 'HasMore' is true, you need to recall this function to get older threads.
 		/// </summary>
 		/// <param name="before">Get threads created before this thread id.</param>
 		/// <param name="limit">Defines the limit of returned <see cref="DiscordThreadResult"/>.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageThreads"/> or <see cref="Permissions.ReadMessageHistory"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordThreadResult> GetPrivateArchivedThreadsAsync(ulong? before, int? limit)
 			=> await this.Discord.ApiClient.GetPrivateArchivedThreadsAsync(this.Id, before, limit);
 
 		#endregion
 
 		/// <summary>
 		/// Adds a channel permission overwrite for specified role.
 		/// </summary>
 		/// <param name="role">The role to have the permission added.</param>
 		/// <param name="allow">The permissions to allow.</param>
 		/// <param name="deny">The permissions to deny.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageRoles"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task AddOverwriteAsync(DiscordRole role, Permissions allow = Permissions.None, Permissions deny = Permissions.None, string reason = null)
 			=> this.Discord.ApiClient.EditChannelPermissionsAsync(this.Id, role.Id, allow, deny, "role", reason);
 
 
 		/// <summary>
 		/// Adds a channel permission overwrite for specified member.
 		/// </summary>
 		/// <param name="member">The member to have the permission added.</param>
 		/// <param name="allow">The permissions to allow.</param>
 		/// <param name="deny">The permissions to deny.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageRoles"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task AddOverwriteAsync(DiscordMember member, Permissions allow = Permissions.None, Permissions deny = Permissions.None, string reason = null)
 			=> this.Discord.ApiClient.EditChannelPermissionsAsync(this.Id, member.Id, allow, deny, "member", reason);
 
 		/// <summary>
 		/// Deletes a channel permission overwrite for specified member.
 		/// </summary>
 		/// <param name="member">The member to have the permission deleted.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageRoles"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task DeleteOverwriteAsync(DiscordMember member, string reason = null)
 			=> this.Discord.ApiClient.DeleteChannelPermissionAsync(this.Id, member.Id, reason);
 
 		/// <summary>
 		/// Deletes a channel permission overwrite for specified role.
 		/// </summary>
 		/// <param name="role">The role to have the permission deleted.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageRoles"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task DeleteOverwriteAsync(DiscordRole role, string reason = null)
 			=> this.Discord.ApiClient.DeleteChannelPermissionAsync(this.Id, role.Id, reason);
 
 		/// <summary>
 		/// Post a typing indicator.
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task TriggerTypingAsync() =>
 			!this.IsWritable()
 				? throw new ArgumentException("Cannot start typing in a non-text channel.")
 				: this.Discord.ApiClient.TriggerTypingAsync(this.Id);
 
 		/// <summary>
 		/// Returns all pinned messages.
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.AccessChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<IReadOnlyList<DiscordMessage>> GetPinnedMessagesAsync() =>
 			!this.IsWritable()
 				? throw new ArgumentException("A non-text channel does not have pinned messages.")
 				: this.Discord.ApiClient.GetPinnedMessagesAsync(this.Id);
 
 		/// <summary>
 		/// Create a new webhook.
 		/// </summary>
 		/// <param name="name">The name of the webhook.</param>
 		/// <param name="avatar">The image for the default webhook avatar.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageWebhooks"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordWebhook> CreateWebhookAsync(string name, Optional<Stream> avatar = default, string reason = null)
 		{
 			var av64 = ImageTool.Base64FromStream(avatar);
 			return await this.Discord.ApiClient.CreateWebhookAsync(this.Id, name, av64, reason).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Returns a list of webhooks.
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageWebhooks"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<IReadOnlyList<DiscordWebhook>> GetWebhooksAsync()
 			=> this.Discord.ApiClient.GetChannelWebhooksAsync(this.Id);
 
 		/// <summary>
 		/// Moves a member to this voice channel.
 		/// </summary>
 		/// <param name="member">The member to be moved.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.MoveMembers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the channel does not exists or if the Member does not exists.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task PlaceMemberAsync(DiscordMember member)
 		{
 			if (!this.IsVoiceJoinable())
 				throw new ArgumentException("Cannot place a member in a non-voice channel.");
 
 			await this.Discord.ApiClient.ModifyGuildMemberAsync(this.Guild.Id, member.Id, default, default, default,
 				default, this.Id, null).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Follows a news channel.
 		/// </summary>
 		/// <param name="targetChannel">Channel to crosspost messages to.</param>
 		/// <exception cref="System.ArgumentException">Thrown when trying to follow a non-news channel.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the current user doesn't have <see cref="Permissions.ManageWebhooks"/> on the target channel.</exception>
 		public Task<DiscordFollowedChannel> FollowAsync(DiscordChannel targetChannel) =>
 			this.Type != ChannelType.News
 				? throw new ArgumentException("Cannot follow a non-news channel.")
 				: this.Discord.ApiClient.FollowChannelAsync(this.Id, targetChannel.Id);
 
 		/// <summary>
 		/// Publishes a message in a news channel to following channels.
 		/// </summary>
 		/// <param name="message">Message to publish.</param>
 		/// <exception cref="System.ArgumentException">Thrown when the message has already been crossposted.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">
 		///     Thrown when the current user doesn't have <see cref="Permissions.ManageWebhooks"/> and/or <see cref="Permissions.SendMessages"/>
 		/// </exception>
 		public Task<DiscordMessage> CrosspostMessageAsync(DiscordMessage message) =>
 			(message.Flags & MessageFlags.Crossposted) == MessageFlags.Crossposted
 				? throw new ArgumentException("Message is already crossposted.")
 				: this.Discord.ApiClient.CrosspostMessageAsync(this.Id, message.Id);
 
 		/// <summary>
 		/// Updates the current user's suppress state in this channel, if stage channel.
 		/// </summary>
 		/// <param name="suppress">Toggles the suppress state.</param>
 		/// <param name="requestToSpeakTimestamp">Sets the time the user requested to speak.</param>
 		/// <exception cref="System.ArgumentException">Thrown when the channel is not a stage channel.</exception>
 		public async Task UpdateCurrentUserVoiceStateAsync(bool? suppress, DateTimeOffset? requestToSpeakTimestamp = null)
 		{
 			if (this.Type != ChannelType.Stage)
 				throw new ArgumentException("Voice state can only be updated in a stage channel.");
 
 			await this.Discord.ApiClient.UpdateCurrentUserVoiceStateAsync(this.GuildId.Value, this.Id, suppress, requestToSpeakTimestamp).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Calculates permissions for a given member.
 		/// </summary>
 		/// <param name="mbr">Member to calculate permissions for.</param>
 		/// <returns>Calculated permissions for a given member.</returns>
 		public Permissions PermissionsFor(DiscordMember mbr)
 		{
 			// user > role > everyone
 			// allow > deny > undefined
 			// =>
 			// user allow > user deny > role allow > role deny > everyone allow > everyone deny
 
 			if (this.IsPrivate || this.Guild == null)
 				return Permissions.None;
 
 			if (this.Guild.OwnerId == mbr.Id)
 				return PermissionMethods.FullPerms;
 
 			Permissions perms;
 
 			// assign @everyone permissions
 			var everyoneRole = this.Guild.EveryoneRole;
 			perms = everyoneRole.Permissions;
 
 			// roles that member is in
 			var mbRoles = mbr.Roles.Where(xr => xr.Id != everyoneRole.Id);
 
 			// assign permissions from member's roles (in order)
 			perms |= mbRoles.Aggregate(Permissions.None, (c, role) => c | role.Permissions);
 
 			// Administrator grants all permissions and cannot be overridden
 			if ((perms & Permissions.Administrator) == Permissions.Administrator)
 				return PermissionMethods.FullPerms;
 
 			// channel overrides for roles that member is in
 			var mbRoleOverrides = mbRoles
 				.Select(xr => this.PermissionOverwritesInternal.FirstOrDefault(xo => xo.Id == xr.Id))
 				.Where(xo => xo != null)
-				.ToList();
+				.ToArray();
 
 			// assign channel permission overwrites for @everyone pseudo-role
 			var everyoneOverwrites = this.PermissionOverwritesInternal.FirstOrDefault(xo => xo.Id == everyoneRole.Id);
 			if (everyoneOverwrites != null)
 			{
 				perms &= ~everyoneOverwrites.Denied;
 				perms |= everyoneOverwrites.Allowed;
 			}
 
 			// assign channel permission overwrites for member's roles (explicit deny)
 			perms &= ~mbRoleOverrides.Aggregate(Permissions.None, (c, overs) => c | overs.Denied);
 			// assign channel permission overwrites for member's roles (explicit allow)
 			perms |= mbRoleOverrides.Aggregate(Permissions.None, (c, overs) => c | overs.Allowed);
 
 			// channel overrides for just this member
 			var mbOverrides = this.PermissionOverwritesInternal.FirstOrDefault(xo => xo.Id == mbr.Id);
 			if (mbOverrides == null) return perms;
 
 			// assign channel permission overwrites for just this member
 			perms &= ~mbOverrides.Denied;
 			perms |= mbOverrides.Allowed;
 
 			return perms;
 		}
 
 		/// <summary>
 		/// Returns a string representation of this channel.
 		/// </summary>
 		/// <returns>String representation of this channel.</returns>
 		public override string ToString() =>
 			this.Type == ChannelType.Category
 				? $"Channel Category {this.Name} ({this.Id})"
 				: this.Type == ChannelType.Text || this.Type == ChannelType.News || this.IsThread()
 					? $"Channel #{this.Name} ({this.Id})"
 					: this.IsVoiceJoinable()
 						? $"Channel #!{this.Name} ({this.Id})"
 						: !string.IsNullOrWhiteSpace(this.Name) ? $"Channel {this.Name} ({this.Id})" : $"Channel {this.Id}";
 
 		#endregion
 
 		/// <summary>
 		/// Checks whether this <see cref="DiscordChannel"/> is equal to another object.
 		/// </summary>
 		/// <param name="obj">Object to compare to.</param>
 		/// <returns>Whether the object is equal to this <see cref="DiscordChannel"/>.</returns>
 		public override bool Equals(object obj)
 			=> this.Equals(obj as DiscordChannel);
 
 		/// <summary>
 		/// Checks whether this <see cref="DiscordChannel"/> is equal to another <see cref="DiscordChannel"/>.
 		/// </summary>
 		/// <param name="e"><see cref="DiscordChannel"/> to compare to.</param>
 		/// <returns>Whether the <see cref="DiscordChannel"/> is equal to this <see cref="DiscordChannel"/>.</returns>
 		public bool Equals(DiscordChannel e)
 			=> e is not null && (ReferenceEquals(this, e) || this.Id == e.Id);
 
 		/// <summary>
 		/// Gets the hash code for this <see cref="DiscordChannel"/>.
 		/// </summary>
 		/// <returns>The hash code for this <see cref="DiscordChannel"/>.</returns>
 		public override int GetHashCode()
 			=> this.Id.GetHashCode();
 
 		/// <summary>
 		/// Gets whether the two <see cref="DiscordChannel"/> objects are equal.
 		/// </summary>
 		/// <param name="e1">First channel to compare.</param>
 		/// <param name="e2">Second channel to compare.</param>
 		/// <returns>Whether the two channels are equal.</returns>
 		public static bool operator ==(DiscordChannel e1, DiscordChannel e2)
 		{
 			var o1 = e1 as object;
 			var o2 = e2 as object;
 
 			return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || e1.Id == e2.Id);
 		}
 
 		/// <summary>
 		/// Gets whether the two <see cref="DiscordChannel"/> objects are not equal.
 		/// </summary>
 		/// <param name="e1">First channel to compare.</param>
 		/// <param name="e2">Second channel to compare.</param>
 		/// <returns>Whether the two channels are not equal.</returns>
 		public static bool operator !=(DiscordChannel e1, DiscordChannel e2)
 			=> !(e1 == e2);
 	}
 }
diff --git a/DisCatSharp/Entities/Channel/DiscordGuildDirectoryChannel.cs b/DisCatSharp/Entities/Channel/DiscordGuildDirectoryChannel.cs
index 535cd9762..583dddeb3 100644
--- a/DisCatSharp/Entities/Channel/DiscordGuildDirectoryChannel.cs
+++ b/DisCatSharp/Entities/Channel/DiscordGuildDirectoryChannel.cs
@@ -1,96 +1,96 @@
 // 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 System.Collections.Generic;
 using System.Linq;
 
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Entities
 {
 	/// <summary>
 	/// Represents a discord guild directory channel.
 	/// </summary>
 	public class DiscordGuildDirectoryChannel : DiscordChannel, IEquatable<DiscordGuildDirectoryChannel>
 	{
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordGuildDirectoryChannel"/> class.
 		/// </summary>
 		internal DiscordGuildDirectoryChannel()
 		{ }
 
 		[JsonIgnore]
 		public IReadOnlyList<DiscordGuildDirectoryEntry> Entries =>
-			this.Guild.ChannelsInternal.Values.Where(e => e.ParentId == this.Id).Select(x => x as DiscordGuildDirectoryEntry).ToList();
+			this.Guild.ChannelsInternal.Values.Where(e => e.ParentId == this.Id).Select(x => x as DiscordGuildDirectoryEntry).ToArray();
 
 		#region Methods
 
 		#endregion
 
 		/// <summary>
 		/// Checks whether this <see cref="DiscordGuildDirectoryChannel"/> is equal to another object.
 		/// </summary>
 		/// <param name="obj">Object to compare to.</param>
 		/// <returns>Whether the object is equal to this <see cref="DiscordGuildDirectoryChannel"/>.</returns>
 		public override bool Equals(object obj)
 			=> this.Equals(obj as DiscordGuildDirectoryChannel);
 
 		/// <summary>
 		/// Checks whether this <see cref="DiscordGuildDirectoryChannel"/> is equal to another <see cref="DiscordGuildDirectoryChannel"/>.
 		/// </summary>
 		/// <param name="e"><see cref="DiscordGuildDirectoryChannel"/> to compare to.</param>
 		/// <returns>Whether the <see cref="DiscordGuildDirectoryChannel"/> is equal to this <see cref="DiscordGuildDirectoryChannel"/>.</returns>
 		public bool Equals(DiscordGuildDirectoryChannel e)
 			=> e is not null && (ReferenceEquals(this, e) || this.Id == e.Id);
 
 		/// <summary>
 		/// Gets the hash code for this <see cref="DiscordGuildDirectoryChannel"/>.
 		/// </summary>
 		/// <returns>The hash code for this <see cref="DiscordGuildDirectoryChannel"/>.</returns>
 		public override int GetHashCode()
 			=> this.Id.GetHashCode();
 
 		/// <summary>
 		/// Gets whether the two <see cref="DiscordGuildDirectoryChannel"/> objects are equal.
 		/// </summary>
 		/// <param name="e1">First channel to compare.</param>
 		/// <param name="e2">Second channel to compare.</param>
 		/// <returns>Whether the two channels are equal.</returns>
 		public static bool operator ==(DiscordGuildDirectoryChannel e1, DiscordGuildDirectoryChannel e2)
 		{
 			var o1 = e1 as object;
 			var o2 = e2 as object;
 
 			return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || e1.Id == e2.Id);
 		}
 
 		/// <summary>
 		/// Gets whether the two <see cref="DiscordGuildDirectoryChannel"/> objects are not equal.
 		/// </summary>
 		/// <param name="e1">First channel to compare.</param>
 		/// <param name="e2">Second channel to compare.</param>
 		/// <returns>Whether the two channels are not equal.</returns>
 		public static bool operator !=(DiscordGuildDirectoryChannel e1, DiscordGuildDirectoryChannel e2)
 			=> !(e1 == e2);
 	}
 }
diff --git a/DisCatSharp/Entities/Embed/DiscordEmbedBuilder.cs b/DisCatSharp/Entities/Embed/DiscordEmbedBuilder.cs
index 10150743c..7299a4677 100644
--- a/DisCatSharp/Entities/Embed/DiscordEmbedBuilder.cs
+++ b/DisCatSharp/Entities/Embed/DiscordEmbedBuilder.cs
@@ -1,653 +1,651 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 
 using DisCatSharp.Net;
 
 namespace DisCatSharp.Entities
 {
 	/// <summary>
 	/// Constructs embeds.
 	/// </summary>
 	public sealed class DiscordEmbedBuilder
 	{
 		/// <summary>
 		/// Gets or sets the embed's title.
 		/// </summary>
 		public string Title
 		{
 			get => this._title;
 			set
 			{
 				if (value != null && value.Length > 256)
 					throw new ArgumentException("Title length cannot exceed 256 characters.", nameof(value));
 				this._title = value;
 			}
 		}
 		private string _title;
 
 		/// <summary>
 		/// Gets or sets the embed's description.
 		/// </summary>
 		public string Description
 		{
 			get => this._description;
 			set
 			{
 				if (value != null && value.Length > 4096)
 					throw new ArgumentException("Description length cannot exceed 4096 characters.", nameof(value));
 				this._description = value;
 			}
 		}
 		private string _description;
 
 		/// <summary>
 		/// Gets or sets the url for the embed's title.
 		/// </summary>
 		public string Url
 		{
 			get => this._url?.ToString();
 			set => this._url = string.IsNullOrEmpty(value) ? null : new Uri(value);
 		}
 		private Uri _url;
 
 		/// <summary>
 		/// Gets or sets the embed's color.
 		/// </summary>
 		public Optional<DiscordColor> Color { get; set; }
 
 		/// <summary>
 		/// Gets or sets the embed's timestamp.
 		/// </summary>
 		public DateTimeOffset? Timestamp { get; set; }
 
 		/// <summary>
 		/// Gets or sets the embed's image url.
 		/// </summary>
 		public string ImageUrl
 		{
 			get => this._imageUri?.ToString();
 			set => this._imageUri = string.IsNullOrEmpty(value) ? null : new DiscordUri(value);
 		}
 		private DiscordUri _imageUri;
 
 		/// <summary>
 		/// Gets or sets the embed's author.
 		/// </summary>
 		public EmbedAuthor Author { get; set; }
 
 		/// <summary>
 		/// Gets or sets the embed's footer.
 		/// </summary>
 		public EmbedFooter Footer { get; set; }
 
 		/// <summary>
 		/// Gets or sets the embed's thumbnail.
 		/// </summary>
 		public EmbedThumbnail Thumbnail { get; set; }
 
 		/// <summary>
 		/// Gets the embed's fields.
 		/// </summary>
-		public IReadOnlyList<DiscordEmbedField> Fields { get; }
+		public IReadOnlyList<DiscordEmbedField> Fields => this._fields;
 		private readonly List<DiscordEmbedField> _fields = new();
 
 		/// <summary>
 		/// Constructs a new empty embed builder.
 		/// </summary>
 		public DiscordEmbedBuilder()
-		{
-			this.Fields = new ReadOnlyCollection<DiscordEmbedField>(this._fields);
-		}
+		{ }
 
 		/// <summary>
 		/// Constructs a new embed builder using another embed as prototype.
 		/// </summary>
 		/// <param name="original">Embed to use as prototype.</param>
 		public DiscordEmbedBuilder(DiscordEmbed original)
 			: this()
 		{
 			this.Title = original.Title;
 			this.Description = original.Description;
 			this.Url = original.Url?.ToString();
 			this.ImageUrl = original.Image?.Url?.ToString();
 			this.Color = original.Color;
 			this.Timestamp = original.Timestamp;
 
 			if (original.Thumbnail != null)
 				this.Thumbnail = new EmbedThumbnail
 				{
 					Url = original.Thumbnail.Url?.ToString(),
 					Height = original.Thumbnail.Height,
 					Width = original.Thumbnail.Width
 				};
 
 			if (original.Author != null)
 				this.Author = new EmbedAuthor
 				{
 					IconUrl = original.Author.IconUrl?.ToString(),
 					Name = original.Author.Name,
 					Url = original.Author.Url?.ToString()
 				};
 
 			if (original.Footer != null)
 				this.Footer = new EmbedFooter
 				{
 					IconUrl = original.Footer.IconUrl?.ToString(),
 					Text = original.Footer.Text
 				};
 
 			if (original.Fields?.Any() == true)
 				this._fields.AddRange(original.Fields);
 
 			while (this._fields.Count > 25)
 				this._fields.RemoveAt(this._fields.Count - 1);
 		}
 
 		/// <summary>
 		/// Sets the embed's title.
 		/// </summary>
 		/// <param name="title">Title to set.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder WithTitle(string title)
 		{
 			this.Title = title;
 			return this;
 		}
 
 		/// <summary>
 		/// Sets the embed's description.
 		/// </summary>
 		/// <param name="description">Description to set.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder WithDescription(string description)
 		{
 			this.Description = description;
 			return this;
 		}
 
 		/// <summary>
 		/// Sets the embed's title url.
 		/// </summary>
 		/// <param name="url">Title url to set.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder WithUrl(string url)
 		{
 			this.Url = url;
 			return this;
 		}
 
 		/// <summary>
 		/// Sets the embed's title url.
 		/// </summary>
 		/// <param name="url">Title url to set.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder WithUrl(Uri url)
 		{
 			this._url = url;
 			return this;
 		}
 
 		/// <summary>
 		/// Sets the embed's color.
 		/// </summary>
 		/// <param name="color">Embed color to set.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder WithColor(DiscordColor color)
 		{
 			this.Color = color;
 			return this;
 		}
 
 		/// <summary>
 		/// Sets the embed's timestamp.
 		/// </summary>
 		/// <param name="timestamp">Timestamp to set.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder WithTimestamp(DateTimeOffset? timestamp)
 		{
 			this.Timestamp = timestamp;
 			return this;
 		}
 
 		/// <summary>
 		/// Sets the embed's timestamp.
 		/// </summary>
 		/// <param name="timestamp">Timestamp to set.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder WithTimestamp(DateTime? timestamp)
 		{
 			this.Timestamp = timestamp == null ? null : (DateTimeOffset?)new DateTimeOffset(timestamp.Value);
 			return this;
 		}
 
 		/// <summary>
 		/// Sets the embed's timestamp based on a snowflake.
 		/// </summary>
 		/// <param name="snowflake">Snowflake to calculate timestamp from.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder WithTimestamp(ulong snowflake)
 		{
 			this.Timestamp = new DateTimeOffset(2015, 1, 1, 0, 0, 0, TimeSpan.Zero).AddMilliseconds(snowflake >> 22);
 			return this;
 		}
 
 		/// <summary>
 		/// Sets the embed's image url.
 		/// </summary>
 		/// <param name="url">Image url to set.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder WithImageUrl(string url)
 		{
 			this.ImageUrl = url;
 			return this;
 		}
 
 		/// <summary>
 		/// Sets the embed's image url.
 		/// </summary>
 		/// <param name="url">Image url to set.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder WithImageUrl(Uri url)
 		{
 			this._imageUri = new DiscordUri(url);
 			return this;
 		}
 
 		/// <summary>
 		/// Sets the embed's thumbnail.
 		/// </summary>
 		/// <param name="url">Thumbnail url to set.</param>
 		/// <param name="height">The height of the thumbnail to set.</param>
 		/// <param name="width">The width of the thumbnail to set.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder WithThumbnail(string url, int height = 0, int width = 0)
 		{
 			this.Thumbnail = new EmbedThumbnail
 			{
 				Url = url,
 				Height = height,
 				Width = width
 			};
 
 			return this;
 		}
 
 		/// <summary>
 		/// Sets the embed's thumbnail.
 		/// </summary>
 		/// <param name="url">Thumbnail url to set.</param>
 		/// <param name="height">The height of the thumbnail to set.</param>
 		/// <param name="width">The width of the thumbnail to set.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder WithThumbnail(Uri url, int height = 0, int width = 0)
 		{
 			this.Thumbnail = new EmbedThumbnail
 			{
 				Uri = new DiscordUri(url),
 				Height = height,
 				Width = width
 			};
 
 			return this;
 		}
 
 		/// <summary>
 		/// Sets the embed's author.
 		/// </summary>
 		/// <param name="name">Author's name.</param>
 		/// <param name="url">Author's url.</param>
 		/// <param name="iconUrl">Author icon's url.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder WithAuthor(string name = null, string url = null, string iconUrl = null)
 		{
 			if (!string.IsNullOrEmpty(name) && name.Length > 256)
 				throw new NotSupportedException("Embed author name can not exceed 256 chars. See https://discord.com/developers/docs/resources/channel#embed-limits.");
 			this.Author = string.IsNullOrEmpty(name) && string.IsNullOrEmpty(url) && string.IsNullOrEmpty(iconUrl)
 				? null
 				: new EmbedAuthor
 				{
 					Name = name,
 					Url = url,
 					IconUrl = iconUrl
 				};
 			return this;
 		}
 
 		/// <summary>
 		/// Sets the embed's footer.
 		/// </summary>
 		/// <param name="text">Footer's text.</param>
 		/// <param name="iconUrl">Footer icon's url.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder WithFooter(string text = null, string iconUrl = null)
 		{
 			if (text != null && text.Length > 2048)
 				throw new ArgumentException("Footer text length cannot exceed 2048 characters.", nameof(text));
 
 			this.Footer = string.IsNullOrEmpty(text) && string.IsNullOrEmpty(iconUrl)
 				? null
 				: new EmbedFooter
 				{
 					Text = text,
 					IconUrl = iconUrl
 				};
 			return this;
 		}
 
 		/// <summary>
 		/// Adds a field to this embed.
 		/// </summary>
 		/// <param name="name">Name of the field to add.</param>
 		/// <param name="value">Value of the field to add.</param>
 		/// <param name="inline">Whether the field is to be inline or not.</param>
 		/// <returns>This embed builder.</returns>
 		[Obsolete("DiscordEmbedFields should be constructed manually.")]
 		public DiscordEmbedBuilder AddField(string name, string value, bool inline = false)
 			=> this.AddField(new DiscordEmbedField(name, value, inline));
 
 		/// <summary>
 		/// Adds a field to this embed.
 		/// </summary>
 		/// <param name="field">The field to add.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder AddField(DiscordEmbedField field)
 		{
 			if (this._fields.Count >= 25)
 				throw new InvalidOperationException("Cannot add more than 25 fields.");
 
 			this._fields.Add(field);
 
 			return this;
 		}
 
 		/// <summary>
 		/// Adds multiple fields to this embed.
 		/// </summary>
 		/// <param name="fields">The fields to add.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder AddFields(params DiscordEmbedField[] fields)
 			=> this.AddFields((IEnumerable<DiscordEmbedField>)fields);
 
 		/// <summary>
 		/// Adds multiple fields to this embed.
 		/// </summary>
 		/// <param name="fields">The fields to add.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder AddFields(IEnumerable<DiscordEmbedField> fields)
 			=> fields.Aggregate(this, (x, y) => x.AddField(y));
 
 		/// <summary>
 		/// Removes a field from this embed, if it is part of it.
 		/// </summary>
 		/// <param name="field">The field to remove.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder RemoveField(DiscordEmbedField field)
 		{
 			this._fields.Remove(field);
 			return this;
 		}
 
 		/// <summary>
 		/// Removes multiple fields from this embed, if they are part of it.
 		/// </summary>
 		/// <param name="fields">The fields to remove.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder RemoveFields(params DiscordEmbedField[] fields)
 		{
 			this.RemoveFields((IEnumerable<DiscordEmbedField>)fields);
 			return this;
 		}
 
 		/// <summary>
 		/// Removes multiple fields from this embed, if they are part of it.
 		/// </summary>
 		/// <param name="fields">The fields to remove.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbed RemoveFields(IEnumerable<DiscordEmbedField> fields)
 		{
 			this._fields.RemoveAll(x => fields.Contains(x));
 			return this;
 		}
 
 		/// <summary>
 		/// Removes a field of the specified index from this embed.
 		/// </summary>
 		/// <param name="index">Index of the field to remove.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder RemoveFieldAt(int index)
 		{
 			this._fields.RemoveAt(index);
 			return this;
 		}
 
 		/// <summary>
 		/// Removes fields of the specified range from this embed.
 		/// </summary>
 		/// <param name="index">Index of the first field to remove.</param>
 		/// <param name="count">Number of fields to remove.</param>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder RemoveFieldRange(int index, int count)
 		{
 			this._fields.RemoveRange(index, count);
 			return this;
 		}
 
 		/// <summary>
 		/// Removes all fields from this embed.
 		/// </summary>
 		/// <returns>This embed builder.</returns>
 		public DiscordEmbedBuilder ClearFields()
 		{
 			this._fields.Clear();
 			return this;
 		}
 
 		/// <summary>
 		/// Constructs a new embed from data supplied to this builder.
 		/// </summary>
 		/// <returns>New discord embed.</returns>
 		public DiscordEmbed Build()
 		{
 			var embed = new DiscordEmbed
 			{
 				Title = this._title,
 				Description = this._description,
 				Url = this._url,
 				ColorInternal = this.Color.Map(e => e.Value),
 				Timestamp = this.Timestamp
 			};
 
 			if (this.Footer != null)
 				embed.Footer = new DiscordEmbedFooter
 				{
 					Text = this.Footer.Text,
 					IconUrl = this.Footer.IconUri
 				};
 
 			if (this.Author != null)
 				embed.Author = new DiscordEmbedAuthor
 				{
 					Name = this.Author.Name,
 					Url = this.Author.Uri,
 					IconUrl = this.Author.IconUri
 				};
 
 			if (this._imageUri != null)
 				embed.Image = new DiscordEmbedImage { Url = this._imageUri };
 			if (this.Thumbnail != null)
 				embed.Thumbnail = new DiscordEmbedThumbnail
 				{
 					Url = this.Thumbnail.Uri,
 					Height = this.Thumbnail.Height,
 					Width = this.Thumbnail.Width
 				};
 
-			embed.Fields = new ReadOnlyCollection<DiscordEmbedField>(new List<DiscordEmbedField>(this._fields)); // copy the list, don't wrap it, prevents mutation
+			embed.Fields = new List<DiscordEmbedField>(this._fields); // copy the list, don't wrap it, prevents mutation
 
 			var charCount = 0;
 			if (embed.Fields.Any())
 			{
 				foreach (var field in embed.Fields)
 				{
 					charCount += field.Name.Length;
 					charCount += field.Value.Length;
 				}
 			}
 
 			if (embed.Author != null && !string.IsNullOrEmpty(embed.Author.Name))
 				charCount += embed.Author.Name.Length;
 
 			if (embed.Footer != null && !string.IsNullOrEmpty(embed.Footer.Text))
 				charCount += embed.Footer.Text.Length;
 
 			if (!string.IsNullOrEmpty(embed.Title))
 				charCount += embed.Title.Length;
 
 			if (!string.IsNullOrEmpty(embed.Description))
 				charCount += embed.Description.Length;
 
 			return charCount >= 6000
 				? throw new NotSupportedException("Total char count can not exceed 6000 chars. See https://discord.com/developers/docs/resources/channel#embed-limits.")
 				: embed;
 		}
 
 		/// <summary>
 		/// Implicitly converts this builder to an embed.
 		/// </summary>
 		/// <param name="builder">Builder to convert.</param>
 		public static implicit operator DiscordEmbed(DiscordEmbedBuilder builder)
 			=> builder?.Build();
 
 		/// <summary>
 		/// Represents an embed author.
 		/// </summary>
 		public class EmbedAuthor
 		{
 			/// <summary>
 			/// Gets or sets the name of the author.
 			/// </summary>
 			public string Name
 			{
 				get => this._name;
 				set
 				{
 					if (value != null && value.Length > 256)
 						throw new ArgumentException("Author name length cannot exceed 256 characters.", nameof(value));
 					this._name = value;
 				}
 			}
 			private string _name;
 
 			/// <summary>
 			/// Gets or sets the Url to which the author's link leads.
 			/// </summary>
 			public string Url
 			{
 				get => this.Uri?.ToString();
 				set => this.Uri = string.IsNullOrEmpty(value) ? null : new Uri(value);
 			}
 			internal Uri Uri;
 
 			/// <summary>
 			/// Gets or sets the Author's icon url.
 			/// </summary>
 			public string IconUrl
 			{
 				get => this.IconUri?.ToString();
 				set => this.IconUri = string.IsNullOrEmpty(value) ? null : new DiscordUri(value);
 			}
 			internal DiscordUri IconUri;
 		}
 
 		/// <summary>
 		/// Represents an embed footer.
 		/// </summary>
 		public class EmbedFooter
 		{
 			/// <summary>
 			/// Gets or sets the text of the footer.
 			/// </summary>
 			public string Text
 			{
 				get => this._text;
 				set
 				{
 					if (value != null && value.Length > 2048)
 						throw new ArgumentException("Footer text length cannot exceed 2048 characters.", nameof(value));
 					this._text = value;
 				}
 			}
 			private string _text;
 
 			/// <summary>
 			/// Gets or sets the Url
 			/// </summary>
 			public string IconUrl
 			{
 				get => this.IconUri?.ToString();
 				set => this.IconUri = string.IsNullOrEmpty(value) ? null : new DiscordUri(value);
 			}
 			internal DiscordUri IconUri;
 		}
 
 		/// <summary>
 		/// Represents an embed thumbnail.
 		/// </summary>
 		public class EmbedThumbnail
 		{
 			/// <summary>
 			/// Gets or sets the thumbnail's image url.
 			/// </summary>
 			public string Url
 			{
 				get => this.Uri?.ToString();
 				set => this.Uri = string.IsNullOrEmpty(value) ? null : new DiscordUri(value);
 			}
 			internal DiscordUri Uri;
 
 			/// <summary>
 			/// Gets or sets the thumbnail's height.
 			/// </summary>
 			public int Height
 			{
 				get => this._height;
 				set => this._height = value >= 0 ? value : 0;
 			}
 			private int _height;
 
 			/// <summary>
 			/// Gets or sets the thumbnail's width.
 			/// </summary>
 			public int Width
 			{
 				get => this._width;
 				set => this._width = value >= 0 ? value : 0;
 			}
 			private int _width;
 		}
 	}
 }
diff --git a/DisCatSharp/Entities/Emoji/DiscordEmoji.cs b/DisCatSharp/Entities/Emoji/DiscordEmoji.cs
index 6f839e490..a5727c5c6 100644
--- a/DisCatSharp/Entities/Emoji/DiscordEmoji.cs
+++ b/DisCatSharp/Entities/Emoji/DiscordEmoji.cs
@@ -1,376 +1,376 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
 
 using DisCatSharp.Enums;
 using DisCatSharp.Net;
 
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Entities
 {
 	/// <summary>
 	/// Represents a Discord emoji.
 	/// </summary>
 	public partial class DiscordEmoji : SnowflakeObject, IEquatable<DiscordEmoji>
 	{
 		/// <summary>
 		/// Gets the name of this emoji.
 		/// </summary>
 		[JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
 		public string Name { get; internal set; }
 
 		/// <summary>
 		/// Gets IDs the roles this emoji is enabled for.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyList<ulong> Roles => this._rolesLazy.Value;
 
 		[JsonProperty("roles", NullValueHandling = NullValueHandling.Ignore)]
 		public List<ulong> RolesInternal;
 		private readonly Lazy<IReadOnlyList<ulong>> _rolesLazy;
 
 		/// <summary>
 		/// Gets whether this emoji requires colons to use.
 		/// </summary>
 		[JsonProperty("require_colons")]
 		public bool RequiresColons { get; internal set; }
 
 		/// <summary>
 		/// Gets whether this emoji is managed by an integration.
 		/// </summary>
 		[JsonProperty("managed")]
 		public bool IsManaged { get; internal set; }
 
 		/// <summary>
 		/// Gets whether this emoji is animated.
 		/// </summary>
 		[JsonProperty("animated")]
 		public bool IsAnimated { get; internal set; }
 
 		/// <summary>
 		/// Gets whether the emoji is available for use.
 		/// An emoji may not be available due to loss of server boost.
 		/// </summary>
 		[JsonProperty("available", NullValueHandling = NullValueHandling.Ignore)]
 		public bool IsAvailable { get; internal set; }
 
 		/// <summary>
 		/// Gets the image URL of this emoji.
 		/// </summary>
 		[JsonIgnore]
 		public string Url =>
 			this.Id == 0
 				? throw new InvalidOperationException("Cannot get URL of unicode emojis.")
 				: this.IsAnimated
 					? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.EMOJIS}/{this.Id.ToString(CultureInfo.InvariantCulture)}.gif"
 					: $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.EMOJIS}/{this.Id.ToString(CultureInfo.InvariantCulture)}.png";
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordEmoji"/> class.
 		/// </summary>
 		internal DiscordEmoji()
 		{
-			this._rolesLazy = new Lazy<IReadOnlyList<ulong>>(() => new ReadOnlyCollection<ulong>(this.RolesInternal));
+			this._rolesLazy = new Lazy<IReadOnlyList<ulong>>(() => this.RolesInternal);
 		}
 
 		/// <summary>
 		/// Gets emoji's name in non-Unicode format (eg. :thinking: instead of the Unicode representation of the emoji).
 		/// </summary>
 		public string GetDiscordName()
 		{
 			s_discordNameLookup.TryGetValue(this.Name, out var name);
 
 			return name ?? $":{ this.Name }:";
 		}
 
 		/// <summary>
 		/// Returns a string representation of this emoji.
 		/// </summary>
 		/// <returns>String representation of this emoji.</returns>
 		public override string ToString()
 			=> this.Id != 0
 				? this.IsAnimated
 					? $"<a:{this.Name}:{this.Id.ToString(CultureInfo.InvariantCulture)}>"
 					: $"<:{this.Name}:{this.Id.ToString(CultureInfo.InvariantCulture)}>"
 				: this.Name;
 
 		/// <summary>
 		/// Checks whether this <see cref="DiscordEmoji"/> is equal to another object.
 		/// </summary>
 		/// <param name="obj">Object to compare to.</param>
 		/// <returns>Whether the object is equal to this <see cref="DiscordEmoji"/>.</returns>
 		public override bool Equals(object obj)
 			=> this.Equals(obj as DiscordEmoji);
 
 		/// <summary>
 		/// Checks whether this <see cref="DiscordEmoji"/> is equal to another <see cref="DiscordEmoji"/>.
 		/// </summary>
 		/// <param name="e"><see cref="DiscordEmoji"/> to compare to.</param>
 		/// <returns>Whether the <see cref="DiscordEmoji"/> is equal to this <see cref="DiscordEmoji"/>.</returns>
 		public bool Equals(DiscordEmoji e)
 			=> e is not null && (ReferenceEquals(this, e) || (this.Id == e.Id && this.Name == e.Name));
 
 		/// <summary>
 		/// Gets the hash code for this <see cref="DiscordEmoji"/>.
 		/// </summary>
 		/// <returns>The hash code for this <see cref="DiscordEmoji"/>.</returns>
 		public override int GetHashCode()
 		{
 			var hash = 13;
 			hash = (hash * 7) + this.Id.GetHashCode();
 			hash = (hash * 7) + this.Name.GetHashCode();
 
 			return hash;
 		}
 
 		/// <summary>
 		/// Gets the reactions string.
 		/// </summary>
 		internal string ToReactionString()
 			=> this.Id != 0 ? $"{this.Name}:{this.Id.ToString(CultureInfo.InvariantCulture)}" : this.Name;
 
 		/// <summary>
 		/// Gets whether the two <see cref="DiscordEmoji"/> objects are equal.
 		/// </summary>
 		/// <param name="e1">First emoji to compare.</param>
 		/// <param name="e2">Second emoji to compare.</param>
 		/// <returns>Whether the two emoji are equal.</returns>
 		public static bool operator ==(DiscordEmoji e1, DiscordEmoji e2)
 		{
 			var o1 = e1 as object;
 			var o2 = e2 as object;
 
 			return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || e1.Id == e2.Id);
 		}
 
 		/// <summary>
 		/// Gets whether the two <see cref="DiscordEmoji"/> objects are not equal.
 		/// </summary>
 		/// <param name="e1">First emoji to compare.</param>
 		/// <param name="e2">Second emoji to compare.</param>
 		/// <returns>Whether the two emoji are not equal.</returns>
 		public static bool operator !=(DiscordEmoji e1, DiscordEmoji e2)
 			=> !(e1 == e2);
 
 		/// <summary>
 		/// Implicitly converts this emoji to its string representation.
 		/// </summary>
 		/// <param name="e1">Emoji to convert.</param>
 		public static implicit operator string(DiscordEmoji e1)
 			=> e1.ToString();
 
 		/// <summary>
 		/// Checks whether specified unicode entity is a valid unicode emoji.
 		/// </summary>
 		/// <param name="unicodeEntity">Entity to check.</param>
 		/// <returns>Whether it's a valid emoji.</returns>
 		public static bool IsValidUnicode(string unicodeEntity)
 			=> s_discordNameLookup.ContainsKey(unicodeEntity);
 
 		/// <summary>
 		/// Creates an emoji object from a unicode entity.
 		/// </summary>
 		/// <param name="client"><see cref="BaseDiscordClient"/> to attach to the object.</param>
 		/// <param name="unicodeEntity">Unicode entity to create the object from.</param>
 		/// <returns>Create <see cref="DiscordEmoji"/> object.</returns>
 		public static DiscordEmoji FromUnicode(BaseDiscordClient client, string unicodeEntity)
 			=> !IsValidUnicode(unicodeEntity)
 				? throw new ArgumentException("Specified unicode entity is not a valid unicode emoji.", nameof(unicodeEntity))
 				: new DiscordEmoji { Name = unicodeEntity, Discord = client };
 
 		/// <summary>
 		/// Creates an emoji object from a unicode entity.
 		/// </summary>
 		/// <param name="unicodeEntity">Unicode entity to create the object from.</param>
 		/// <returns>Create <see cref="DiscordEmoji"/> object.</returns>
 		public static DiscordEmoji FromUnicode(string unicodeEntity)
 			=> FromUnicode(null, unicodeEntity);
 
 		/// <summary>
 		/// Attempts to create an emoji object from a unicode entity.
 		/// </summary>
 		/// <param name="client"><see cref="BaseDiscordClient"/> to attach to the object.</param>
 		/// <param name="unicodeEntity">Unicode entity to create the object from.</param>
 		/// <param name="emoji">Resulting <see cref="DiscordEmoji"/> object.</param>
 		/// <returns>Whether the operation was successful.</returns>
 		public static bool TryFromUnicode(BaseDiscordClient client, string unicodeEntity, out DiscordEmoji emoji)
 		{
 			// this is a round-trip operation because of FE0F inconsistencies.
 			// through this, the inconsistency is normalized.
 
 			emoji = null;
 			if (!s_discordNameLookup.TryGetValue(unicodeEntity, out var discordName))
 				return false;
 
 			if (!s_unicodeEmojis.TryGetValue(discordName, out unicodeEntity))
 				return false;
 
 			emoji = new DiscordEmoji { Name = unicodeEntity, Discord = client };
 			return true;
 		}
 
 		/// <summary>
 		/// Attempts to create an emoji object from a unicode entity.
 		/// </summary>
 		/// <param name="unicodeEntity">Unicode entity to create the object from.</param>
 		/// <param name="emoji">Resulting <see cref="DiscordEmoji"/> object.</param>
 		/// <returns>Whether the operation was successful.</returns>
 		public static bool TryFromUnicode(string unicodeEntity, out DiscordEmoji emoji)
 			=> TryFromUnicode(null, unicodeEntity, out emoji);
 
 		/// <summary>
 		/// Creates an emoji object from a guild emote.
 		/// </summary>
 		/// <param name="client"><see cref="BaseDiscordClient"/> to attach to the object.</param>
 		/// <param name="id">Id of the emote.</param>
 		/// <returns>Create <see cref="DiscordEmoji"/> object.</returns>
 		public static DiscordEmoji FromGuildEmote(BaseDiscordClient client, ulong id)
 		{
 			if (client == null)
 				throw new ArgumentNullException(nameof(client), "Client cannot be null.");
 
 			foreach (var guild in client.Guilds.Values)
 			{
 				if (guild.Emojis.TryGetValue(id, out var found))
 					return found;
 			}
 
 			throw new KeyNotFoundException("Given emote was not found.");
 		}
 
 		/// <summary>
 		/// Attempts to create an emoji object from a guild emote.
 		/// </summary>
 		/// <param name="client"><see cref="BaseDiscordClient"/> to attach to the object.</param>
 		/// <param name="id">Id of the emote.</param>
 		/// <param name="emoji">Resulting <see cref="DiscordEmoji"/> object.</param>
 		/// <returns>Whether the operation was successful.</returns>
 		public static bool TryFromGuildEmote(BaseDiscordClient client, ulong id, out DiscordEmoji emoji)
 		{
 			if (client == null)
 				throw new ArgumentNullException(nameof(client), "Client cannot be null.");
 
 			foreach (var guild in client.Guilds.Values)
 			{
 				if (guild.Emojis.TryGetValue(id, out emoji))
 					return true;
 			}
 
 			emoji = null;
 			return false;
 		}
 
 		/// <summary>
 		/// Creates an emoji obejct from emote name that includes colons (eg. :thinking:). This method also supports
 		/// skin tone variations (eg. :ok_hand::skin-tone-2:), standard emoticons (eg. :D), as well as guild emoji
 		/// (still specified by :name:).
 		/// </summary>
 		/// <param name="client"><see cref="BaseDiscordClient"/> to attach to the object.</param>
 		/// <param name="name">Name of the emote to find, including colons (eg. :thinking:).</param>
 		/// <param name="includeGuilds">Should guild emojis be included in the search.</param>
 		/// <returns>Create <see cref="DiscordEmoji"/> object.</returns>
 		public static DiscordEmoji FromName(BaseDiscordClient client, string name, bool includeGuilds = true)
 		{
 			if (client == null)
 				throw new ArgumentNullException(nameof(client), "Client cannot be null.");
 
 			if (string.IsNullOrWhiteSpace(name))
 				throw new ArgumentNullException(nameof(name), "Name cannot be empty or null.");
 
 			if (s_unicodeEmojis.TryGetValue(name, out var unicodeEntity))
 				return new DiscordEmoji { Discord = client, Name = unicodeEntity };
 
 			if (includeGuilds)
 			{
 				var allEmojis = client.Guilds.Values
 					.SelectMany(xg => xg.Emojis.Values); // save cycles - don't order
 
 				var ek = name.AsSpan().Slice(1, name.Length - 2);
 				foreach (var emoji in allEmojis)
 					if (emoji.Name.AsSpan().SequenceEqual(ek))
 						return emoji;
 			}
 
 			throw new ArgumentException("Invalid emoji name specified.", nameof(name));
 		}
 
 		/// <summary>
 		/// Attempts to create an emoji object from emote name that includes colons (eg. :thinking:). This method also
 		/// supports skin tone variations (eg. :ok_hand::skin-tone-2:), standard emoticons (eg. :D), as well as guild
 		/// emoji (still specified by :name:).
 		/// </summary>
 		/// <param name="client"><see cref="BaseDiscordClient"/> to attach to the object.</param>
 		/// <param name="name">Name of the emote to find, including colons (eg. :thinking:).</param>
 		/// <param name="emoji">Resulting <see cref="DiscordEmoji"/> object.</param>
 		/// <returns>Whether the operation was successful.</returns>
 		public static bool TryFromName(BaseDiscordClient client, string name, out DiscordEmoji emoji)
 			=> TryFromName(client, name, true, out emoji);
 
 		/// <summary>
 		/// Attempts to create an emoji object from emote name that includes colons (eg. :thinking:). This method also
 		/// supports skin tone variations (eg. :ok_hand::skin-tone-2:), standard emoticons (eg. :D), as well as guild
 		/// emoji (still specified by :name:).
 		/// </summary>
 		/// <param name="client"><see cref="BaseDiscordClient"/> to attach to the object.</param>
 		/// <param name="name">Name of the emote to find, including colons (eg. :thinking:).</param>
 		/// <param name="includeGuilds">Should guild emojis be included in the search.</param>
 		/// <param name="emoji">Resulting <see cref="DiscordEmoji"/> object.</param>
 		/// <returns>Whether the operation was successful.</returns>
 		public static bool TryFromName(BaseDiscordClient client, string name, bool includeGuilds, out DiscordEmoji emoji)
 		{
 			if (client == null)
 				throw new ArgumentNullException(nameof(client), "Client cannot be null.");
 
 			if (string.IsNullOrWhiteSpace(name))
 				throw new ArgumentNullException(nameof(name), "Name cannot be empty or null.");
 
 			if (s_unicodeEmojis.TryGetValue(name, out var unicodeEntity))
 			{
 				emoji = new DiscordEmoji { Discord = client, Name = unicodeEntity };
 				return true;
 			}
 
 			if (includeGuilds)
 			{
 				var allEmojis = client.Guilds.Values
 					.SelectMany(xg => xg.Emojis.Values); // save cycles - don't order
 
 				var ek = name.AsSpan().Slice(1, name.Length - 2);
 				foreach (var xemoji in allEmojis)
 					if (xemoji.Name.AsSpan().SequenceEqual(ek))
 					{
 						emoji = xemoji;
 						return true;
 					}
 			}
 
 			emoji = null;
 			return false;
 		}
 	}
 }
diff --git a/DisCatSharp/Entities/Guild/DiscordGuild.AuditLog.cs b/DisCatSharp/Entities/Guild/DiscordGuild.AuditLog.cs
index 8e2917e4e..1d40a1038 100644
--- a/DisCatSharp/Entities/Guild/DiscordGuild.AuditLog.cs
+++ b/DisCatSharp/Entities/Guild/DiscordGuild.AuditLog.cs
@@ -1,1294 +1,1293 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 
 using DisCatSharp.Enums;
 using DisCatSharp.Net;
 using DisCatSharp.Net.Abstractions;
 
 using Microsoft.Extensions.Logging;
 
 using Newtonsoft.Json.Linq;
 
 namespace DisCatSharp.Entities
 {
 	public partial class DiscordGuild {
 		// TODO: Rework audit logs!
 		/// <summary>
 		/// Gets audit log entries for this guild.
 		/// </summary>
 		/// <param name="limit">Maximum number of entries to fetch.</param>
 		/// <param name="byMember">Filter by member responsible.</param>
 		/// <param name="actionType">Filter by action type.</param>
 		/// <returns>A collection of requested audit log entries.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ViewAuditLog"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<IReadOnlyList<DiscordAuditLogEntry>> GetAuditLogsAsync(int? limit = null, DiscordMember byMember = null, AuditLogActionType? actionType = null)
 		{
 			var alrs = new List<AuditLog>();
 			int ac = 1, tc = 0, rmn = 100;
 			var last = 0ul;
 			while (ac > 0)
 			{
 				rmn = limit != null ? limit.Value - tc : 100;
 				rmn = Math.Min(100, rmn);
 				if (rmn <= 0) break;
 
 				var alr = await this.Discord.ApiClient.GetAuditLogsAsync(this.Id, rmn, null, last == 0 ? null : (ulong?)last, byMember?.Id, (int?)actionType).ConfigureAwait(false);
 				ac = alr.Entries.Count();
 				tc += ac;
 				if (ac > 0)
 				{
 					last = alr.Entries.Last().Id;
 					alrs.Add(alr);
 				}
 			}
 
 			var amr = alrs.SelectMany(xa => xa.Users)
 				.GroupBy(xu => xu.Id)
 				.Select(xgu => xgu.First());
 
 			foreach (var xau in amr)
 			{
 				if (this.Discord.UserCache.ContainsKey(xau.Id))
 					continue;
 
 				var xtu = new TransportUser
 				{
 					Id = xau.Id,
 					Username = xau.Username,
 					Discriminator = xau.Discriminator,
 					AvatarHash = xau.AvatarHash
 				};
 				var xu = new DiscordUser(xtu) { Discord = this.Discord };
 				xu = this.Discord.UserCache.AddOrUpdate(xu.Id, xu, (id, old) =>
 				{
 					old.Username = xu.Username;
 					old.Discriminator = xu.Discriminator;
 					old.AvatarHash = xu.AvatarHash;
 					return old;
 				});
 			}
 
 			var atgse = alrs.SelectMany(xa => xa.ScheduledEvents)
 				.GroupBy(xse => xse.Id)
 				.Select(xgse => xgse.First());
 
 			var ath = alrs.SelectMany(xa => xa.Threads)
 				.GroupBy(xt => xt.Id)
 				.Select(xgt => xgt.First());
 
 			var aig = alrs.SelectMany(xa => xa.Integrations)
 				.GroupBy(xi => xi.Id)
 				.Select(xgi => xgi.First());
 
 			var ahr = alrs.SelectMany(xa => xa.Webhooks)
 				.GroupBy(xh => xh.Id)
 				.Select(xgh => xgh.First());
 
 			var ams = amr.Select(xau => this.MembersInternal != null && this.MembersInternal.TryGetValue(xau.Id, out var member) ? member : new DiscordMember { Discord = this.Discord, Id = xau.Id, GuildId = this.Id });
 			var amd = ams.ToDictionary(xm => xm.Id, xm => xm);
 
 #pragma warning disable CS0219
 			Dictionary<ulong, DiscordThreadChannel> dtc = null;
 			Dictionary<ulong, DiscordIntegration> di = null;
 			Dictionary<ulong, DiscordScheduledEvent> dse = null;
 #pragma warning restore
 
 			Dictionary<ulong, DiscordWebhook> ahd = null;
 			if (ahr.Any())
 			{
 				var whr = await this.GetWebhooksAsync().ConfigureAwait(false);
 				var whs = whr.ToDictionary(xh => xh.Id, xh => xh);
 
 				var amh = ahr.Select(xah => whs.TryGetValue(xah.Id, out var webhook) ? webhook : new DiscordWebhook { Discord = this.Discord, Name = xah.Name, Id = xah.Id, AvatarHash = xah.AvatarHash, ChannelId = xah.ChannelId, GuildId = xah.GuildId, Token = xah.Token });
 				ahd = amh.ToDictionary(xh => xh.Id, xh => xh);
 			}
 
-			var acs = alrs.SelectMany(xa => xa.Entries).OrderByDescending(xa => xa.Id);
 			var entries = new List<DiscordAuditLogEntry>();
-			foreach (var xac in acs)
+			foreach (var xac in alrs.SelectMany(xa => xa.Entries).OrderByDescending(xa => xa.Id))
 			{
 				DiscordAuditLogEntry entry = null;
 				ulong t1, t2;
 				int t3, t4;
 				long t5, t6;
 				bool p1, p2;
 				switch (xac.ActionType)
 				{
 					case AuditLogActionType.Invalid:
 						break;
 
 					case AuditLogActionType.GuildUpdate:
 						entry = new DiscordAuditLogGuildEntry
 						{
 							Target = this
 						};
 
 						var entrygld = entry as DiscordAuditLogGuildEntry;
 						foreach (var xc in xac.Changes)
 						{
 							PropertyChange<DiscordChannel> GetChannelChange()
 							{
 								ulong.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
 								ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
 
 								return new PropertyChange<DiscordChannel>
 								{
 									Before = this.GetChannel(t1) ?? new DiscordChannel { Id = t1, Discord = this.Discord, GuildId = this.Id },
 									After = this.GetChannel(t2) ?? new DiscordChannel { Id = t1, Discord = this.Discord, GuildId = this.Id }
 								};
 							}
 
 							switch (xc.Key.ToLowerInvariant())
 							{
 								case "name":
 									entrygld.NameChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 
 								case "owner_id":
 									entrygld.OwnerChange = new PropertyChange<DiscordMember>
 									{
 										Before = this.MembersInternal != null && this.MembersInternal.TryGetValue(xc.OldValueUlong, out var oldMember) ? oldMember : await this.GetMemberAsync(xc.OldValueUlong).ConfigureAwait(false),
 										After = this.MembersInternal != null && this.MembersInternal.TryGetValue(xc.NewValueUlong, out var newMember) ? newMember : await this.GetMemberAsync(xc.NewValueUlong).ConfigureAwait(false)
 									};
 									break;
 
 								case "icon_hash":
 									entrygld.IconChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString != null ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.ICONS}/{this.Id}/{xc.OldValueString}.webp" : null,
 										After = xc.OldValueString != null ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.ICONS}/{this.Id}/{xc.NewValueString}.webp" : null
 									};
 									break;
 
 								case "verification_level":
 									entrygld.VerificationLevelChange = new PropertyChange<VerificationLevel>
 									{
 										Before = (VerificationLevel)(long)xc.OldValue,
 										After = (VerificationLevel)(long)xc.NewValue
 									};
 									break;
 
 								case "afk_channel_id":
 									entrygld.AfkChannelChange = GetChannelChange();
 									break;
 
 								case "system_channel_flags":
 									entrygld.SystemChannelFlagsChange = new PropertyChange<SystemChannelFlags>()
 									{
 										Before = (SystemChannelFlags)(long)xc.OldValue,
 										After = (SystemChannelFlags)(long)xc.NewValue
 									};
 									break;
 
 								case "widget_channel_id":
 									entrygld.WidgetChannelChange = GetChannelChange();
 									break;
 
 								case "rules_channel_id":
 									entrygld.RulesChannelChange = GetChannelChange();
 									break;
 
 								case "public_updates_channel_id":
 									entrygld.PublicUpdatesChannelChange = GetChannelChange();
 									break;
 
 								case "splash_hash":
 									entrygld.SplashChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString != null ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.SPLASHES}/{this.Id}/{xc.OldValueString}.webp?size=2048" : null,
 										After = xc.NewValueString != null ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.SPLASHES}/{this.Id}/{xc.NewValueString}.webp?size=2048" : null
 									};
 									break;
 
 								case "default_message_notifications":
 									entrygld.NotificationSettingsChange = new PropertyChange<DefaultMessageNotifications>
 									{
 										Before = (DefaultMessageNotifications)(long)xc.OldValue,
 										After = (DefaultMessageNotifications)(long)xc.NewValue
 									};
 									break;
 
 								case "system_channel_id":
 									entrygld.SystemChannelChange = GetChannelChange();
 									break;
 
 								case "explicit_content_filter":
 									entrygld.ExplicitContentFilterChange = new PropertyChange<ExplicitContentFilter>
 									{
 										Before = (ExplicitContentFilter)(long)xc.OldValue,
 										After = (ExplicitContentFilter)(long)xc.NewValue
 									};
 									break;
 
 								case "mfa_level":
 									entrygld.MfaLevelChange = new PropertyChange<MfaLevel>
 									{
 										Before = (MfaLevel)(long)xc.OldValue,
 										After = (MfaLevel)(long)xc.NewValue
 									};
 									break;
 
 								case "region":
 									entrygld.RegionChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 
 								case "vanity_url_code":
 									entrygld.VanityUrlCodeChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 
 								case "premium_progress_bar_enabled":
 									entrygld.PremiumProgressBarChange = new PropertyChange<bool>
 									{
 										Before = (bool)xc.OldValue,
 										After = (bool)xc.NewValue
 									};
 									break;
 
 								default:
 									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in guild update: {0} - this should be reported to library developers", xc.Key);
 									break;
 							}
 						}
 						break;
 
 					case AuditLogActionType.ChannelCreate:
 					case AuditLogActionType.ChannelDelete:
 					case AuditLogActionType.ChannelUpdate:
 						entry = new DiscordAuditLogChannelEntry
 						{
 							Target = this.GetChannel(xac.TargetId.Value) ?? new DiscordChannel { Id = xac.TargetId.Value, Discord = this.Discord, GuildId = this.Id }
 						};
 
 						var entrychn = entry as DiscordAuditLogChannelEntry;
 						foreach (var xc in xac.Changes)
 						{
 							switch (xc.Key.ToLowerInvariant())
 							{
 								case "name":
 									entrychn.NameChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 
 								case "type":
 									p1 = ulong.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
 									p2 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
 
 									entrychn.TypeChange = new PropertyChange<ChannelType?>
 									{
 										Before = p1 ? (ChannelType?)t1 : null,
 										After = p2 ? (ChannelType?)t2 : null
 									};
 									break;
 
 								case "permission_overwrites":
 									var olds = xc.OldValues?.OfType<JObject>()
 										?.Select(xjo => xjo.ToObject<DiscordOverwrite>())
 										?.Select(xo => { xo.Discord = this.Discord; return xo; });
 
 									var news = xc.NewValues?.OfType<JObject>()
 										?.Select(xjo => xjo.ToObject<DiscordOverwrite>())
 										?.Select(xo => { xo.Discord = this.Discord; return xo; });
 
 									entrychn.OverwriteChange = new PropertyChange<IReadOnlyList<DiscordOverwrite>>
 									{
-										Before = olds != null ? new ReadOnlyCollection<DiscordOverwrite>(new List<DiscordOverwrite>(olds)) : null,
-										After = news != null ? new ReadOnlyCollection<DiscordOverwrite>(new List<DiscordOverwrite>(news)) : null
+										Before = olds?.ToArray(),
+										After = news?.ToArray()
 									};
 									break;
 
 								case "topic":
 									entrychn.TopicChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 
 								case "nsfw":
 									entrychn.NsfwChange = new PropertyChange<bool?>
 									{
 										Before = (bool?)xc.OldValue,
 										After = (bool?)xc.NewValue
 									};
 									break;
 
 								case "rtc_region":
 									entrychn.RtcRegionIdChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 
 								case "bitrate":
 									entrychn.BitrateChange = new PropertyChange<int?>
 									{
 										Before = (int?)(long?)xc.OldValue,
 										After = (int?)(long?)xc.NewValue
 									};
 									break;
 
 								case "user_limit":
 									entrychn.UserLimitChange = new PropertyChange<int?>
 									{
 										Before = (int?)(long?)xc.OldValue,
 										After = (int?)(long?)xc.NewValue
 									};
 									break;
 
 								case "rate_limit_per_user":
 									entrychn.PerUserRateLimitChange = new PropertyChange<int?>
 									{
 										Before = (int?)(long?)xc.OldValue,
 										After = (int?)(long?)xc.NewValue
 									};
 									break;
 
 								case "default_auto_archive_duration":
 									entrychn.DefaultAutoArchiveDurationChange = new PropertyChange<ThreadAutoArchiveDuration?>
 									{
 										Before = (ThreadAutoArchiveDuration?)(long?)xc.OldValue,
 										After = (ThreadAutoArchiveDuration?)(long?)xc.NewValue
 									};
 									break;
 
 								default:
 									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in channel update: {0} - this should be reported to library developers", xc.Key);
 									break;
 							}
 						}
 						break;
 
 					case AuditLogActionType.OverwriteCreate:
 					case AuditLogActionType.OverwriteDelete:
 					case AuditLogActionType.OverwriteUpdate:
 						entry = new DiscordAuditLogOverwriteEntry
 						{
 							Target = this.GetChannel(xac.TargetId.Value)?.PermissionOverwrites.FirstOrDefault(xo => xo.Id == xac.Options.Id),
 							Channel = this.GetChannel(xac.TargetId.Value)
 						};
 
 						var entryovr = entry as DiscordAuditLogOverwriteEntry;
 						foreach (var xc in xac.Changes)
 						{
 							switch (xc.Key.ToLowerInvariant())
 							{
 								case "deny":
 									p1 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
 									p2 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
 
 									entryovr.DenyChange = new PropertyChange<Permissions?>
 									{
 										Before = p1 ? (Permissions?)t1 : null,
 										After = p2 ? (Permissions?)t2 : null
 									};
 									break;
 
 								case "allow":
 									p1 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
 									p2 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
 
 									entryovr.AllowChange = new PropertyChange<Permissions?>
 									{
 										Before = p1 ? (Permissions?)t1 : null,
 										After = p2 ? (Permissions?)t2 : null
 									};
 									break;
 
 								case "type":
 									entryovr.TypeChange = new PropertyChange<OverwriteType?>
 									{
 										Before = xc.OldValue != null ? (OverwriteType)(long)xc.OldValue : null,
 										After = xc.NewValue != null ? (OverwriteType)(long)xc.NewValue : null
 									};
 									break;
 
 								case "id":
 									p1 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
 									p2 = ulong.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
 
 									entryovr.TargetIdChange = new PropertyChange<ulong?>
 									{
 										Before = p1 ? (ulong?)t1 : null,
 										After = p2 ? (ulong?)t2 : null
 									};
 									break;
 
 								default:
 									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in overwrite update: {0} - this should be reported to library developers", xc.Key);
 									break;
 							}
 						}
 						break;
 
 					case AuditLogActionType.Kick:
 						entry = new DiscordAuditLogKickEntry
 						{
 							Target = amd.TryGetValue(xac.TargetId.Value, out var kickMember) ? kickMember : new DiscordMember { Id = xac.TargetId.Value, Discord = this.Discord, GuildId = this.Id }
 						};
 						break;
 
 					case AuditLogActionType.Prune:
 						entry = new DiscordAuditLogPruneEntry
 						{
 							Days = xac.Options.DeleteMemberDays,
 							Toll = xac.Options.MembersRemoved
 						};
 						break;
 
 					case AuditLogActionType.Ban:
 					case AuditLogActionType.Unban:
 						entry = new DiscordAuditLogBanEntry
 						{
 							Target = amd.TryGetValue(xac.TargetId.Value, out var unbanMember) ? unbanMember : new DiscordMember { Id = xac.TargetId.Value, Discord = this.Discord, GuildId = this.Id }
 						};
 						break;
 
 					case AuditLogActionType.MemberUpdate:
 					case AuditLogActionType.MemberRoleUpdate:
 						entry = new DiscordAuditLogMemberUpdateEntry
 						{
 							Target = amd.TryGetValue(xac.TargetId.Value, out var roleUpdMember) ? roleUpdMember : new DiscordMember { Id = xac.TargetId.Value, Discord = this.Discord, GuildId = this.Id }
 						};
 
 						var entrymbu = entry as DiscordAuditLogMemberUpdateEntry;
 						foreach (var xc in xac.Changes)
 						{
 							switch (xc.Key.ToLowerInvariant())
 							{
 								case "nick":
 									entrymbu.NicknameChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 
 								case "deaf":
 									entrymbu.DeafenChange = new PropertyChange<bool?>
 									{
 										Before = (bool?)xc.OldValue,
 										After = (bool?)xc.NewValue
 									};
 									break;
 
 								case "mute":
 									entrymbu.MuteChange = new PropertyChange<bool?>
 									{
 										Before = (bool?)xc.OldValue,
 										After = (bool?)xc.NewValue
 									};
 									break;
 								case "communication_disabled_until":
 									entrymbu.CommunicationDisabledUntilChange = new PropertyChange<DateTime?>
 									{
 										Before = (DateTime?)xc.OldValue,
 										After = (DateTime?)xc.NewValue
 									};
 									break;
 
 								case "$add":
-									entrymbu.AddedRoles = new ReadOnlyCollection<DiscordRole>(xc.NewValues.Select(xo => (ulong)xo["id"]).Select(this.GetRole).ToList());
+									entrymbu.AddedRoles = xc.NewValues.Select(xo => (ulong)xo["id"]).Select(this.GetRole).ToArray();
 									break;
 
 								case "$remove":
-									entrymbu.RemovedRoles = new ReadOnlyCollection<DiscordRole>(xc.NewValues.Select(xo => (ulong)xo["id"]).Select(this.GetRole).ToList());
+									entrymbu.RemovedRoles = xc.NewValues.Select(xo => (ulong)xo["id"]).Select(this.GetRole).ToArray();
 									break;
 
 								default:
 									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in member update: {0} - this should be reported to library developers", xc.Key);
 									break;
 							}
 						}
 						break;
 
 					case AuditLogActionType.RoleCreate:
 					case AuditLogActionType.RoleDelete:
 					case AuditLogActionType.RoleUpdate:
 						entry = new DiscordAuditLogRoleUpdateEntry
 						{
 							Target = this.GetRole(xac.TargetId.Value) ?? new DiscordRole { Id = xac.TargetId.Value, Discord = this.Discord }
 						};
 
 						var entryrol = entry as DiscordAuditLogRoleUpdateEntry;
 						foreach (var xc in xac.Changes)
 						{
 							switch (xc.Key.ToLowerInvariant())
 							{
 								case "name":
 									entryrol.NameChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 
 								case "color":
 									p1 = int.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t3);
 									p2 = int.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t4);
 
 									entryrol.ColorChange = new PropertyChange<int?>
 									{
 										Before = p1 ? (int?)t3 : null,
 										After = p2 ? (int?)t4 : null
 									};
 									break;
 
 								case "permissions":
 									entryrol.PermissionChange = new PropertyChange<Permissions?>
 									{
 										Before = xc.OldValue != null ? (Permissions?)long.Parse((string)xc.OldValue) : null,
 										After = xc.NewValue != null ? (Permissions?)long.Parse((string)xc.NewValue) : null
 									};
 									break;
 
 								case "position":
 									entryrol.PositionChange = new PropertyChange<int?>
 									{
 										Before = xc.OldValue != null ? (int?)(long)xc.OldValue : null,
 										After = xc.NewValue != null ? (int?)(long)xc.NewValue : null,
 									};
 									break;
 
 								case "mentionable":
 									entryrol.MentionableChange = new PropertyChange<bool?>
 									{
 										Before = xc.OldValue != null ? (bool?)xc.OldValue : null,
 										After = xc.NewValue != null ? (bool?)xc.NewValue : null
 									};
 									break;
 
 								case "hoist":
 									entryrol.HoistChange = new PropertyChange<bool?>
 									{
 										Before = (bool?)xc.OldValue,
 										After = (bool?)xc.NewValue
 									};
 									break;
 
 								case "icon_hash":
 									entryrol.IconHashChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 
 								default:
 									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in role update: {0} - this should be reported to library developers", xc.Key);
 									break;
 							}
 						}
 						break;
 
 					case AuditLogActionType.InviteCreate:
 					case AuditLogActionType.InviteDelete:
 					case AuditLogActionType.InviteUpdate:
 						entry = new DiscordAuditLogInviteEntry();
 
 						var inv = new DiscordInvite
 						{
 							Discord = this.Discord,
 							Guild = new DiscordInviteGuild
 							{
 								Discord = this.Discord,
 								Id = this.Id,
 								Name = this.Name,
 								SplashHash = this.SplashHash
 							}
 						};
 
 						var entryinv = entry as DiscordAuditLogInviteEntry;
 						foreach (var xc in xac.Changes)
 						{
 							switch (xc.Key.ToLowerInvariant())
 							{
 								case "max_age":
 									p1 = int.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t3);
 									p2 = int.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t4);
 
 									entryinv.MaxAgeChange = new PropertyChange<int?>
 									{
 										Before = p1 ? (int?)t3 : null,
 										After = p2 ? (int?)t4 : null
 									};
 									break;
 
 								case "code":
 									inv.Code = xc.OldValueString ?? xc.NewValueString;
 
 									entryinv.CodeChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 
 								case "temporary":
 									entryinv.TemporaryChange = new PropertyChange<bool?>
 									{
 										Before = xc.OldValue != null ? (bool?)xc.OldValue : null,
 										After = xc.NewValue != null ? (bool?)xc.NewValue : null
 									};
 									break;
 
 								case "inviter_id":
 									p1 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
 									p2 = ulong.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
 
 									entryinv.InviterChange = new PropertyChange<DiscordMember>
 									{
 										Before = amd.TryGetValue(t1, out var propBeforeMember) ? propBeforeMember : new DiscordMember { Id = t1, Discord = this.Discord, GuildId = this.Id },
 										After = amd.TryGetValue(t2, out var propAfterMember) ? propAfterMember : new DiscordMember { Id = t1, Discord = this.Discord, GuildId = this.Id },
 									};
 									break;
 
 								case "channel_id":
 									p1 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
 									p2 = ulong.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
 
 									entryinv.ChannelChange = new PropertyChange<DiscordChannel>
 									{
 										Before = p1 ? this.GetChannel(t1) ?? new DiscordChannel { Id = t1, Discord = this.Discord, GuildId = this.Id } : null,
 										After = p2 ? this.GetChannel(t2) ?? new DiscordChannel { Id = t1, Discord = this.Discord, GuildId = this.Id } : null
 									};
 
 									var ch = entryinv.ChannelChange.Before ?? entryinv.ChannelChange.After;
 									var cht = ch?.Type;
 									inv.Channel = new DiscordInviteChannel
 									{
 										Discord = this.Discord,
 										Id = p1 ? t1 : t2,
 										Name = ch?.Name,
 										Type = cht != null ? cht.Value : ChannelType.Unknown
 									};
 									break;
 
 								case "uses":
 									p1 = int.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t3);
 									p2 = int.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t4);
 
 									entryinv.UsesChange = new PropertyChange<int?>
 									{
 										Before = p1 ? (int?)t3 : null,
 										After = p2 ? (int?)t4 : null
 									};
 									break;
 
 								case "max_uses":
 									p1 = int.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t3);
 									p2 = int.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t4);
 
 									entryinv.MaxUsesChange = new PropertyChange<int?>
 									{
 										Before = p1 ? (int?)t3 : null,
 										After = p2 ? (int?)t4 : null
 									};
 									break;
 
 								// TODO: Add changes for target application
 
 								default:
 									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in invite update: {0} - this should be reported to library developers", xc.Key);
 									break;
 							}
 						}
 
 						entryinv.Target = inv;
 						break;
 
 					case AuditLogActionType.WebhookCreate:
 					case AuditLogActionType.WebhookDelete:
 					case AuditLogActionType.WebhookUpdate:
 						entry = new DiscordAuditLogWebhookEntry
 						{
 							Target = ahd.TryGetValue(xac.TargetId.Value, out var webhook) ? webhook : new DiscordWebhook { Id = xac.TargetId.Value, Discord = this.Discord }
 						};
 
 						var entrywhk = entry as DiscordAuditLogWebhookEntry;
 						foreach (var xc in xac.Changes)
 						{
 							switch (xc.Key.ToLowerInvariant())
 							{
 								case "application_id": // ???
 									p1 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
 									p2 = ulong.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
 
 									entrywhk.IdChange = new PropertyChange<ulong?>
 									{
 										Before = p1 ? t1 : null,
 										After = p2 ? t2 : null
 									};
 									break;
 
 								case "name":
 									entrywhk.NameChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 
 								case "channel_id":
 									p1 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
 									p2 = ulong.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
 
 									entrywhk.ChannelChange = new PropertyChange<DiscordChannel>
 									{
 										Before = p1 ? this.GetChannel(t1) ?? new DiscordChannel { Id = t1, Discord = this.Discord, GuildId = this.Id } : null,
 										After = p2 ? this.GetChannel(t2) ?? new DiscordChannel { Id = t1, Discord = this.Discord, GuildId = this.Id } : null
 									};
 									break;
 
 								case "type": // ???
 									p1 = int.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t3);
 									p2 = int.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t4);
 
 									entrywhk.TypeChange = new PropertyChange<int?>
 									{
 										Before = p1 ? (int?)t3 : null,
 										After = p2 ? (int?)t4 : null
 									};
 									break;
 
 								case "avatar_hash":
 									entrywhk.AvatarHashChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 
 								default:
 									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in webhook update: {0} - this should be reported to library developers", xc.Key);
 									break;
 							}
 						}
 						break;
 
 					case AuditLogActionType.EmojiCreate:
 					case AuditLogActionType.EmojiDelete:
 					case AuditLogActionType.EmojiUpdate:
 						entry = new DiscordAuditLogEmojiEntry
 						{
 							Target = this.EmojisInternal.TryGetValue(xac.TargetId.Value, out var target) ? target : new DiscordEmoji { Id = xac.TargetId.Value, Discord = this.Discord }
 						};
 
 						var entryemo = entry as DiscordAuditLogEmojiEntry;
 						foreach (var xc in xac.Changes)
 						{
 							switch (xc.Key.ToLowerInvariant())
 							{
 								case "name":
 									entryemo.NameChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 
 								default:
 									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in emote update: {0} - this should be reported to library developers", xc.Key);
 									break;
 							}
 						}
 						break;
 
 					case AuditLogActionType.StageInstanceCreate:
 					case AuditLogActionType.StageInstanceDelete:
 					case AuditLogActionType.StageInstanceUpdate:
 						entry = new DiscordAuditLogStageEntry
 						{
 							Target = this.StageInstancesInternal.TryGetValue(xac.TargetId.Value, out var stage) ? stage : new DiscordStageInstance { Id = xac.TargetId.Value, Discord = this.Discord }
 						};
 
 						var entrysta = entry as DiscordAuditLogStageEntry;
 						foreach (var xc in xac.Changes)
 						{
 							switch (xc.Key.ToLowerInvariant())
 							{
 								case "topic":
 									entrysta.TopicChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 								case "privacy_level":
 									entrysta.PrivacyLevelChange = new PropertyChange<StagePrivacyLevel?>
 									{
 										Before = long.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t5) ? (StagePrivacyLevel?)t5 : null,
 										After = long.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t6) ? (StagePrivacyLevel?)t6 : null,
 									};
 									break;
 
 								default:
 									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in stage instance update: {0} - this should be reported to library developers", xc.Key);
 									break;
 							}
 						}
 						break;
 
 					case AuditLogActionType.StickerCreate:
 					case AuditLogActionType.StickerDelete:
 					case AuditLogActionType.StickerUpdate:
 						entry = new DiscordAuditLogStickerEntry
 						{
 							Target = this.StickersInternal.TryGetValue(xac.TargetId.Value, out var sticker) ? sticker : new DiscordSticker { Id = xac.TargetId.Value, Discord = this.Discord }
 						};
 
 						var entrysti = entry as DiscordAuditLogStickerEntry;
 						foreach (var xc in xac.Changes)
 						{
 							switch (xc.Key.ToLowerInvariant())
 							{
 								case "name":
 									entrysti.NameChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 								case "description":
 									entrysti.DescriptionChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 								case "tags":
 									entrysti.TagsChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 								case "guild_id":
 									entrysti.GuildIdChange = new PropertyChange<ulong?>
 									{
 										Before = ulong.TryParse(xc.OldValueString, out var ogid) ? ogid : null,
 										After = ulong.TryParse(xc.NewValueString, out var ngid) ? ngid : null
 									};
 									break;
 								case "available":
 									entrysti.AvailabilityChange = new PropertyChange<bool?>
 									{
 										Before = (bool?)xc.OldValue,
 										After = (bool?)xc.NewValue,
 									};
 									break;
 								case "asset":
 									entrysti.AssetChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 								case "id":
 									entrysti.IdChange = new PropertyChange<ulong?>
 									{
 										Before = ulong.TryParse(xc.OldValueString, out var oid) ? oid : null,
 										After = ulong.TryParse(xc.NewValueString, out var nid) ? nid : null
 									};
 									break;
 								case "type":
 									p1 = long.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t5);
 									p2 = long.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t6);
 									entrysti.TypeChange = new PropertyChange<StickerType?>
 									{
 										Before = p1 ? (StickerType?)t5 : null,
 										After = p2 ? (StickerType?)t6 : null
 									};
 									break;
 								case "format_type":
 									p1 = long.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t5);
 									p2 = long.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t6);
 									entrysti.FormatChange = new PropertyChange<StickerFormat?>
 									{
 										Before = p1 ? (StickerFormat?)t5 : null,
 										After = p2 ? (StickerFormat?)t6 : null
 									};
 									break;
 
 								default:
 									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in sticker update: {0} - this should be reported to library developers", xc.Key);
 									break;
 							}
 						}
 						break;
 
 
 
 					case AuditLogActionType.MessageDelete:
 					case AuditLogActionType.MessageBulkDelete:
 					{
 						entry = new DiscordAuditLogMessageEntry();
 
 						var entrymsg = entry as DiscordAuditLogMessageEntry;
 
 						if (xac.Options != null)
 						{
 							entrymsg.Channel = this.GetChannel(xac.Options.ChannelId) ?? new DiscordChannel { Id = xac.Options.ChannelId, Discord = this.Discord, GuildId = this.Id };
 							entrymsg.MessageCount = xac.Options.Count;
 						}
 
 						if (entrymsg.Channel != null)
 						{
 							entrymsg.Target = this.Discord is DiscordClient dc
 								&& dc.MessageCache != null
 								&& dc.MessageCache.TryGet(xm => xm.Id == xac.TargetId.Value && xm.ChannelId == entrymsg.Channel.Id, out var msg)
 								? msg
 								: new DiscordMessage { Discord = this.Discord, Id = xac.TargetId.Value };
 						}
 						break;
 					}
 
 					case AuditLogActionType.MessagePin:
 					case AuditLogActionType.MessageUnpin:
 					{
 						entry = new DiscordAuditLogMessagePinEntry();
 
 						var entrypin = entry as DiscordAuditLogMessagePinEntry;
 
 						if (this.Discord is not DiscordClient dc)
 						{
 							break;
 						}
 
 						if (xac.Options != null)
 						{
 							DiscordMessage message = default;
 							dc.MessageCache?.TryGet(x => x.Id == xac.Options.MessageId && x.ChannelId == xac.Options.ChannelId, out message);
 
 							entrypin.Channel = this.GetChannel(xac.Options.ChannelId) ?? new DiscordChannel { Id = xac.Options.ChannelId, Discord = this.Discord, GuildId = this.Id };
 							entrypin.Message = message ?? new DiscordMessage { Id = xac.Options.MessageId, Discord = this.Discord };
 						}
 
 						if (xac.TargetId.HasValue)
 						{
 							dc.UserCache.TryGetValue(xac.TargetId.Value, out var user);
 							entrypin.Target = user ?? new DiscordUser { Id = user.Id, Discord = this.Discord };
 						}
 
 						break;
 					}
 
 					case AuditLogActionType.BotAdd:
 					{
 						entry = new DiscordAuditLogBotAddEntry();
 
 						if (!(this.Discord is DiscordClient dc && xac.TargetId.HasValue))
 						{
 							break;
 						}
 
 						dc.UserCache.TryGetValue(xac.TargetId.Value, out var bot);
 						(entry as DiscordAuditLogBotAddEntry).TargetBot = bot ?? new DiscordUser { Id = xac.TargetId.Value, Discord = this.Discord };
 
 						break;
 					}
 
 					case AuditLogActionType.MemberMove:
 						entry = new DiscordAuditLogMemberMoveEntry();
 
 						if (xac.Options == null)
 						{
 							break;
 						}
 
 						var moveentry = entry as DiscordAuditLogMemberMoveEntry;
 
 						moveentry.UserCount = xac.Options.Count;
 						moveentry.Channel = this.GetChannel(xac.Options.ChannelId) ?? new DiscordChannel { Id = xac.Options.ChannelId, Discord = this.Discord, GuildId = this.Id };
 						break;
 
 					case AuditLogActionType.MemberDisconnect:
 						entry = new DiscordAuditLogMemberDisconnectEntry
 						{
 							UserCount = xac.Options?.Count ?? 0
 						};
 						break;
 
 					case AuditLogActionType.IntegrationCreate:
 					case AuditLogActionType.IntegrationDelete:
 					case AuditLogActionType.IntegrationUpdate:
 						entry = new DiscordAuditLogIntegrationEntry();
 
 						var integentry = entry as DiscordAuditLogIntegrationEntry;
 						foreach (var xc in xac.Changes)
 						{
 							switch (xc.Key.ToLowerInvariant())
 							{
 								case "type":
 									integentry.Type = new PropertyChange<string>()
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 								case "enable_emoticons":
 									integentry.EnableEmoticons = new PropertyChange<bool?>
 									{
 										Before = (bool?)xc.OldValue,
 										After = (bool?)xc.NewValue
 									};
 									break;
 								case "expire_behavior":
 									integentry.ExpireBehavior = new PropertyChange<int?>
 									{
 										Before = (int?)xc.OldValue,
 										After = (int?)xc.NewValue
 									};
 									break;
 								case "expire_grace_period":
 									integentry.ExpireBehavior = new PropertyChange<int?>
 									{
 										Before = (int?)xc.OldValue,
 										After = (int?)xc.NewValue
 									};
 									break;
 
 								default:
 									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in integration update: {0} - this should be reported to library developers", xc.Key);
 									break;
 							}
 						}
 						break;
 
 					case AuditLogActionType.ThreadCreate:
 					case AuditLogActionType.ThreadDelete:
 					case AuditLogActionType.ThreadUpdate:
 						entry = new DiscordAuditLogThreadEntry
 						{
 							Target = this.ThreadsInternal.TryGetValue(xac.TargetId.Value, out var thread) ? thread : new DiscordThreadChannel { Id = xac.TargetId.Value, Discord = this.Discord }
 						};
 
 						var entrythr = entry as DiscordAuditLogThreadEntry;
 						foreach (var xc in xac.Changes)
 						{
 							switch (xc.Key.ToLowerInvariant())
 							{
 								case "name":
 									entrythr.NameChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 
 								case "type":
 									p1 = ulong.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t1);
 									p2 = ulong.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t2);
 
 									entrythr.TypeChange = new PropertyChange<ChannelType?>
 									{
 										Before = p1 ? (ChannelType?)t1 : null,
 										After = p2 ? (ChannelType?)t2 : null
 									};
 									break;
 
 								case "archived":
 									entrythr.ArchivedChange = new PropertyChange<bool?>
 									{
 										Before = xc.OldValue != null ? (bool?)xc.OldValue : null,
 										After = xc.NewValue != null ? (bool?)xc.NewValue : null
 									};
 									break;
 
 								case "locked":
 									entrythr.LockedChange = new PropertyChange<bool?>
 									{
 										Before = xc.OldValue != null ? (bool?)xc.OldValue : null,
 										After = xc.NewValue != null ? (bool?)xc.NewValue : null
 									};
 									break;
 
 								case "invitable":
 									entrythr.InvitableChange = new PropertyChange<bool?>
 									{
 										Before = xc.OldValue != null ? (bool?)xc.OldValue : null,
 										After = xc.NewValue != null ? (bool?)xc.NewValue : null
 									};
 									break;
 
 								case "auto_archive_duration":
 									p1 = long.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t5);
 									p2 = long.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t6);
 
 									entrythr.AutoArchiveDurationChange = new PropertyChange<ThreadAutoArchiveDuration?>
 									{
 										Before = p1 ? (ThreadAutoArchiveDuration?)t5 : null,
 										After = p2 ? (ThreadAutoArchiveDuration?)t6 : null
 									};
 									break;
 
 								case "rate_limit_per_user":
 									entrythr.PerUserRateLimitChange = new PropertyChange<int?>
 									{
 										Before = (int?)(long?)xc.OldValue,
 										After = (int?)(long?)xc.NewValue
 									};
 									break;
 
 								default:
 									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in thread update: {0} - this should be reported to library developers", xc.Key);
 									break;
 							}
 						}
 						break;
 
 
 					case AuditLogActionType.GuildScheduledEventCreate:
 					case AuditLogActionType.GuildScheduledEventDelete:
 					case AuditLogActionType.GuildScheduledEventUpdate:
 						entry = new DiscordAuditLogGuildScheduledEventEntry
 						{
 							Target = this.ScheduledEventsInternal.TryGetValue(xac.TargetId.Value, out var scheduledEvent) ? scheduledEvent : new DiscordScheduledEvent { Id = xac.TargetId.Value, Discord = this.Discord }
 						};
 
 						var entryse = entry as DiscordAuditLogGuildScheduledEventEntry;
 						foreach (var xc in xac.Changes)
 						{
 							switch (xc.Key.ToLowerInvariant())
 							{
 								case "channel_id":
 									entryse.ChannelIdChange = new PropertyChange<ulong?>
 									{
 										Before = ulong.TryParse(xc.OldValueString, out var ogid) ? ogid : null,
 										After = ulong.TryParse(xc.NewValueString, out var ngid) ? ngid : null
 									};
 									break;
 
 								case "name":
 									entryse.NameChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 
 								case "description":
 									entryse.DescriptionChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 
 								case "location":
 									entryse.LocationChange = new PropertyChange<string>
 									{
 										Before = xc.OldValueString,
 										After = xc.NewValueString
 									};
 									break;
 
 								case "privacy_level":
 									p1 = long.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t5);
 									p2 = long.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t6);
 
 									entryse.PrivacyLevelChange = new PropertyChange<ScheduledEventPrivacyLevel?>
 									{
 										Before = p1 ? (ScheduledEventPrivacyLevel?)t5 : null,
 										After = p2 ? (ScheduledEventPrivacyLevel?)t6 : null
 									};
 									break;
 
 								case "entity_type":
 									p1 = long.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t5);
 									p2 = long.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t6);
 
 									entryse.EntityTypeChange = new PropertyChange<ScheduledEventEntityType?>
 									{
 										Before = p1 ? (ScheduledEventEntityType?)t5 : null,
 										After = p2 ? (ScheduledEventEntityType?)t6 : null
 									};
 									break;
 
 								case "status":
 									p1 = long.TryParse(xc.OldValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t5);
 									p2 = long.TryParse(xc.NewValue as string, NumberStyles.Integer, CultureInfo.InvariantCulture, out t6);
 
 									entryse.StatusChange = new PropertyChange<ScheduledEventStatus?>
 									{
 										Before = p1 ? (ScheduledEventStatus?)t5 : null,
 										After = p2 ? (ScheduledEventStatus?)t6 : null
 									};
 									break;
 
 								default:
 									this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown key in scheduled event update: {0} - this should be reported to library developers", xc.Key);
 									break;
 							}
 						}
 						break;
 
 					default:
 						this.Discord.Logger.LogWarning(LoggerEvents.AuditLog, "Unknown audit log action type: {0} - this should be reported to library developers", (int)xac.ActionType);
 						break;
 				}
 
 				if (entry == null)
 					continue;
 
 				entry.ActionCategory = xac.ActionType switch
 				{
 					AuditLogActionType.ChannelCreate or AuditLogActionType.EmojiCreate or AuditLogActionType.InviteCreate or AuditLogActionType.OverwriteCreate or AuditLogActionType.RoleCreate or AuditLogActionType.WebhookCreate or AuditLogActionType.IntegrationCreate or AuditLogActionType.StickerCreate or AuditLogActionType.StageInstanceCreate or AuditLogActionType.ThreadCreate or AuditLogActionType.GuildScheduledEventCreate => AuditLogActionCategory.Create,
 					AuditLogActionType.ChannelDelete or AuditLogActionType.EmojiDelete or AuditLogActionType.InviteDelete or AuditLogActionType.MessageDelete or AuditLogActionType.MessageBulkDelete or AuditLogActionType.OverwriteDelete or AuditLogActionType.RoleDelete or AuditLogActionType.WebhookDelete or AuditLogActionType.IntegrationDelete or AuditLogActionType.StickerDelete or AuditLogActionType.StageInstanceDelete or AuditLogActionType.ThreadDelete or AuditLogActionType.GuildScheduledEventDelete => AuditLogActionCategory.Delete,
 					AuditLogActionType.ChannelUpdate or AuditLogActionType.EmojiUpdate or AuditLogActionType.InviteUpdate or AuditLogActionType.MemberRoleUpdate or AuditLogActionType.MemberUpdate or AuditLogActionType.OverwriteUpdate or AuditLogActionType.RoleUpdate or AuditLogActionType.WebhookUpdate or AuditLogActionType.IntegrationUpdate or AuditLogActionType.StickerUpdate or AuditLogActionType.StageInstanceUpdate or AuditLogActionType.ThreadUpdate or AuditLogActionType.GuildScheduledEventUpdate => AuditLogActionCategory.Update,
 					_ => AuditLogActionCategory.Other,
 				};
 				entry.Discord = this.Discord;
 				entry.ActionType = xac.ActionType;
 				entry.Id = xac.Id;
 				entry.Reason = xac.Reason;
 				entry.UserResponsible = amd[xac.UserId];
 				entries.Add(entry);
 			}
 
-			return new ReadOnlyCollection<DiscordAuditLogEntry>(entries);
+			return entries;
 		}
 	}
 }
diff --git a/DisCatSharp/Entities/Guild/DiscordGuild.cs b/DisCatSharp/Entities/Guild/DiscordGuild.cs
index 012549622..bdb53b98e 100644
--- a/DisCatSharp/Entities/Guild/DiscordGuild.cs
+++ b/DisCatSharp/Entities/Guild/DiscordGuild.cs
@@ -1,2065 +1,2030 @@
 // 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 System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
 using DisCatSharp.Enums;
 using DisCatSharp.Net;
 using DisCatSharp.Net.Abstractions;
 using DisCatSharp.Net.Models;
 using DisCatSharp.Net.Serialization;
 
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Entities
 {
 	/// <summary>
 	/// Represents a Discord guild.
 	/// </summary>
 	public partial class DiscordGuild : SnowflakeObject, IEquatable<DiscordGuild>
 	{
 		/// <summary>
 		/// Gets the guild's name.
 		/// </summary>
 		[JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
 		public string Name { get; internal set; }
 
 		/// <summary>
 		/// Gets the guild icon's hash.
 		/// </summary>
 		[JsonProperty("icon", NullValueHandling = NullValueHandling.Ignore)]
 		public string IconHash { get; internal set; }
 
 		/// <summary>
 		/// Gets the guild icon's url.
 		/// </summary>
 		[JsonIgnore]
 		public string IconUrl
 			=> !string.IsNullOrWhiteSpace(this.IconHash) ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.ICONS}/{this.Id.ToString(CultureInfo.InvariantCulture)}/{this.IconHash}.{(this.IconHash.StartsWith("a_") ? "gif" : "png")}?size=1024" : null;
 
 		/// <summary>
 		/// Gets the guild splash's hash.
 		/// </summary>
 		[JsonProperty("splash", NullValueHandling = NullValueHandling.Ignore)]
 		public string SplashHash { get; internal set; }
 
 		/// <summary>
 		/// Gets the guild splash's url.
 		/// </summary>
 		[JsonIgnore]
 		public string SplashUrl
 		 => !string.IsNullOrWhiteSpace(this.SplashHash) ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.SPLASHES}/{this.Id.ToString(CultureInfo.InvariantCulture)}/{this.SplashHash}.png?size=1024" : null;
 
 		/// <summary>
 		/// Gets the guild discovery splash's hash.
 		/// </summary>
 		[JsonProperty("discovery_splash", NullValueHandling = NullValueHandling.Ignore)]
 		public string DiscoverySplashHash { get; internal set; }
 
 		/// <summary>
 		/// Gets the guild discovery splash's url.
 		/// </summary>
 		[JsonIgnore]
 		public string DiscoverySplashUrl
 			=> !string.IsNullOrWhiteSpace(this.DiscoverySplashHash) ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.GUILD_DISCOVERY_SPLASHES}/{this.Id.ToString(CultureInfo.InvariantCulture)}/{this.DiscoverySplashHash}.png?size=1024" : null;
 
 		/// <summary>
 		/// Gets the preferred locale of this guild.
 		/// <para>This is used for server discovery, interactions and notices from Discord. Defaults to en-US.</para>
 		/// </summary>
 		[JsonProperty("preferred_locale", NullValueHandling = NullValueHandling.Ignore)]
 		public string PreferredLocale { get; internal set; }
 
 		/// <summary>
 		/// Gets the ID of the guild's owner.
 		/// </summary>
 		[JsonProperty("owner_id", NullValueHandling = NullValueHandling.Ignore)]
 		public ulong OwnerId { get; internal set; }
 
 		/// <summary>
 		/// Gets the guild's owner.
 		/// </summary>
 		[JsonIgnore]
 		public DiscordMember Owner
 			=> this.Members.TryGetValue(this.OwnerId, out var owner)
 				? owner
 				: this.Discord.ApiClient.GetGuildMemberAsync(this.Id, this.OwnerId).ConfigureAwait(false).GetAwaiter().GetResult();
 
 		/// <summary>
 		/// Gets permissions for the user in the guild (does not include channel overrides)
 		/// </summary>
 		[JsonProperty("permissions", NullValueHandling = NullValueHandling.Ignore)]
 		public Permissions? Permissions { get; set; }
 
 		/// <summary>
 		/// Gets the guild's voice region ID.
 		/// </summary>
 		[JsonProperty("region", NullValueHandling = NullValueHandling.Ignore)]
 		internal string VoiceRegionId { get; set; }
 
 		/// <summary>
 		/// Gets the guild's voice region.
 		/// </summary>
 		[JsonIgnore]
 		public DiscordVoiceRegion VoiceRegion
 			=> this.Discord.VoiceRegions[this.VoiceRegionId];
 
 		/// <summary>
 		/// Gets the guild's AFK voice channel ID.
 		/// </summary>
 		[JsonProperty("afk_channel_id", NullValueHandling = NullValueHandling.Ignore)]
 		internal ulong AfkChannelId { get; set; }
 
 		/// <summary>
 		/// Gets the guild's AFK voice channel.
 		/// </summary>
 		[JsonIgnore]
 		public DiscordChannel AfkChannel
 			=> this.GetChannel(this.AfkChannelId);
 
 		/// <summary>
 		/// List of <see cref="DisCatSharp.Entities.DiscordApplicationCommand"/>.
 		/// Null if DisCatSharp.ApplicationCommands is not used or no guild commands are registered.
 		/// </summary>
 		[JsonIgnore]
 		public ReadOnlyCollection<DiscordApplicationCommand> RegisteredApplicationCommands
 			=> new(this.InternalRegisteredApplicationCommands);
 		[JsonIgnore]
 		internal List<DiscordApplicationCommand> InternalRegisteredApplicationCommands { get; set; } = null;
 
 		/// <summary>
 		/// Gets the guild's AFK timeout.
 		/// </summary>
 		[JsonProperty("afk_timeout", NullValueHandling = NullValueHandling.Ignore)]
 		public int AfkTimeout { get; internal set; }
 
 		/// <summary>
 		/// Gets the guild's verification level.
 		/// </summary>
 		[JsonProperty("verification_level", NullValueHandling = NullValueHandling.Ignore)]
 		public VerificationLevel VerificationLevel { get; internal set; }
 
 		/// <summary>
 		/// Gets the guild's default notification settings.
 		/// </summary>
 		[JsonProperty("default_message_notifications", NullValueHandling = NullValueHandling.Ignore)]
 		public DefaultMessageNotifications DefaultMessageNotifications { get; internal set; }
 
 		/// <summary>
 		/// Gets the guild's explicit content filter settings.
 		/// </summary>
 		[JsonProperty("explicit_content_filter")]
 		public ExplicitContentFilter ExplicitContentFilter { get; internal set; }
 
 		/// <summary>
 		/// Gets the guild's nsfw level.
 		/// </summary>
 		[JsonProperty("nsfw_level")]
 		public NsfwLevel NsfwLevel { get; internal set; }
 
 		/// <summary>
 		/// Gets the system channel id.
 		/// </summary>
 		[JsonProperty("system_channel_id", NullValueHandling = NullValueHandling.Include)]
 		internal ulong? SystemChannelId { get; set; }
 
 		/// <summary>
 		/// Gets the channel where system messages (such as boost and welcome messages) are sent.
 		/// </summary>
 		[JsonIgnore]
 		public DiscordChannel SystemChannel => this.SystemChannelId.HasValue
 			? this.GetChannel(this.SystemChannelId.Value)
 			: null;
 
 		/// <summary>
 		/// Gets the settings for this guild's system channel.
 		/// </summary>
 		[JsonProperty("system_channel_flags")]
 		public SystemChannelFlags SystemChannelFlags { get; internal set; }
 
 		/// <summary>
 		/// Gets whether this guild's widget is enabled.
 		/// </summary>
 		[JsonProperty("widget_enabled", NullValueHandling = NullValueHandling.Ignore)]
 		public bool? WidgetEnabled { get; internal set; }
 
 		/// <summary>
 		/// Gets the widget channel id.
 		/// </summary>
 		[JsonProperty("widget_channel_id", NullValueHandling = NullValueHandling.Ignore)]
 		internal ulong? WidgetChannelId { get; set; }
 
 		/// <summary>
 		/// Gets the widget channel for this guild.
 		/// </summary>
 		[JsonIgnore]
 		public DiscordChannel WidgetChannel => this.WidgetChannelId.HasValue
 			? this.GetChannel(this.WidgetChannelId.Value)
 			: null;
 
 		/// <summary>
 		/// Gets the rules channel id.
 		/// </summary>
 		[JsonProperty("rules_channel_id")]
 		internal ulong? RulesChannelId { get; set; }
 
 		/// <summary>
 		/// Gets the rules channel for this guild.
 		/// <para>This is only available if the guild is considered "discoverable".</para>
 		/// </summary>
 		[JsonIgnore]
 		public DiscordChannel RulesChannel => this.RulesChannelId.HasValue
 			? this.GetChannel(this.RulesChannelId.Value)
 			: null;
 
 		/// <summary>
 		/// Gets the public updates channel id.
 		/// </summary>
 		[JsonProperty("public_updates_channel_id")]
 		internal ulong? PublicUpdatesChannelId { get; set; }
 
 		/// <summary>
 		/// Gets the public updates channel (where admins and moderators receive messages from Discord) for this guild.
 		/// <para>This is only available if the guild is considered "discoverable".</para>
 		/// </summary>
 		[JsonIgnore]
 		public DiscordChannel PublicUpdatesChannel => this.PublicUpdatesChannelId.HasValue
 			? this.GetChannel(this.PublicUpdatesChannelId.Value)
 			: null;
 
 		/// <summary>
 		/// Gets the application id of this guild if it is bot created.
 		/// </summary>
 		[JsonProperty("application_id")]
 		public ulong? ApplicationId { get; internal set; }
 
 		/// <summary>
 		/// Gets a collection of this guild's roles.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyDictionary<ulong, DiscordRole> Roles => new ReadOnlyConcurrentDictionary<ulong, DiscordRole>(this.RolesInternal);
 
 		[JsonProperty("roles", NullValueHandling = NullValueHandling.Ignore)]
 		[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 		internal ConcurrentDictionary<ulong, DiscordRole> RolesInternal;
 
 		/// <summary>
 		/// Gets a collection of this guild's stickers.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyDictionary<ulong, DiscordSticker> Stickers => new ReadOnlyConcurrentDictionary<ulong, DiscordSticker>(this.StickersInternal);
 
 		[JsonProperty("stickers", NullValueHandling = NullValueHandling.Ignore)]
 		[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 		internal ConcurrentDictionary<ulong, DiscordSticker> StickersInternal;
 
 		/// <summary>
 		/// Gets a collection of this guild's emojis.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyDictionary<ulong, DiscordEmoji> Emojis => new ReadOnlyConcurrentDictionary<ulong, DiscordEmoji>(this.EmojisInternal);
 
 		[JsonProperty("emojis", NullValueHandling = NullValueHandling.Ignore)]
 		[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 		internal ConcurrentDictionary<ulong, DiscordEmoji> EmojisInternal;
 
 		/// <summary>
 		/// Gets a collection of this guild's features.
 		/// </summary>
 		[JsonProperty("features", NullValueHandling = NullValueHandling.Ignore)]
 		public IReadOnlyList<string> RawFeatures { get; internal set; }
 
 		/// <summary>
 		/// Gets the guild's features.
 		/// </summary>
 		[JsonIgnore]
 		public GuildFeatures Features => new(this);
 
 		/// <summary>
 		/// Gets the required multi-factor authentication level for this guild.
 		/// </summary>
 		[JsonProperty("mfa_level", NullValueHandling = NullValueHandling.Ignore)]
 		public MfaLevel MfaLevel { get; internal set; }
 
 		/// <summary>
 		/// Gets this guild's join date.
 		/// </summary>
 		[JsonProperty("joined_at", NullValueHandling = NullValueHandling.Ignore)]
 		public DateTimeOffset JoinedAt { get; internal set; }
 
 		/// <summary>
 		/// Gets whether this guild is considered to be a large guild.
 		/// </summary>
 		[JsonProperty("large", NullValueHandling = NullValueHandling.Ignore)]
 		public bool IsLarge { get; internal set; }
 
 		/// <summary>
 		/// Gets whether this guild is unavailable.
 		/// </summary>
 		[JsonProperty("unavailable", NullValueHandling = NullValueHandling.Ignore)]
 		public bool IsUnavailable { get; internal set; }
 
 		/// <summary>
 		/// Gets the total number of members in this guild.
 		/// </summary>
 		[JsonProperty("member_count", NullValueHandling = NullValueHandling.Ignore)]
 		public int MemberCount { get; internal set; }
 
 		/// <summary>
 		/// Gets the maximum amount of members allowed for this guild.
 		/// </summary>
 		[JsonProperty("max_members")]
 		public int? MaxMembers { get; internal set; }
 
 		/// <summary>
 		/// Gets the maximum amount of presences allowed for this guild.
 		/// </summary>
 		[JsonProperty("max_presences")]
 		public int? MaxPresences { get; internal set; }
 
 		/// <summary>
 		/// Gets the approximate number of members in this guild, when using <see cref="DiscordClient.GetGuildAsync(ulong, bool?)"/> and having withCounts set to true.
 		/// </summary>
 		[JsonProperty("approximate_member_count", NullValueHandling = NullValueHandling.Ignore)]
 		public int? ApproximateMemberCount { get; internal set; }
 
 		/// <summary>
 		/// Gets the approximate number of presences in this guild, when using <see cref="DiscordClient.GetGuildAsync(ulong, bool?)"/> and having withCounts set to true.
 		/// </summary>
 		[JsonProperty("approximate_presence_count", NullValueHandling = NullValueHandling.Ignore)]
 		public int? ApproximatePresenceCount { get; internal set; }
 
 		/// <summary>
 		/// Gets the maximum amount of users allowed per video channel.
 		/// </summary>
 		[JsonProperty("max_video_channel_users", NullValueHandling = NullValueHandling.Ignore)]
 		public int? MaxVideoChannelUsers { get; internal set; }
 
 		/// <summary>
 		/// Gets a dictionary of all the voice states for this guilds. The key for this dictionary is the ID of the user
 		/// the voice state corresponds to.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyDictionary<ulong, DiscordVoiceState> VoiceStates => new ReadOnlyConcurrentDictionary<ulong, DiscordVoiceState>(this.VoiceStatesInternal);
 
 		[JsonProperty("voice_states", NullValueHandling = NullValueHandling.Ignore)]
 		[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 		internal ConcurrentDictionary<ulong, DiscordVoiceState> VoiceStatesInternal;
 
 		/// <summary>
 		/// Gets a dictionary of all the members that belong to this guild. The dictionary's key is the member ID.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyDictionary<ulong, DiscordMember> Members => new ReadOnlyConcurrentDictionary<ulong, DiscordMember>(this.MembersInternal);
 
 		[JsonProperty("members", NullValueHandling = NullValueHandling.Ignore)]
 		[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 		internal ConcurrentDictionary<ulong, DiscordMember> MembersInternal;
 
 		/// <summary>
 		/// Gets a dictionary of all the channels associated with this guild. The dictionary's key is the channel ID.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyDictionary<ulong, DiscordChannel> Channels => new ReadOnlyConcurrentDictionary<ulong, DiscordChannel>(this.ChannelsInternal);
 
 		[JsonProperty("channels", NullValueHandling = NullValueHandling.Ignore)]
 		[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 		internal ConcurrentDictionary<ulong, DiscordChannel> ChannelsInternal;
 
 		internal ConcurrentDictionary<string, DiscordInvite> Invites;
 
 		/// <summary>
 		/// Gets a dictionary of all the active threads associated with this guild the user has permission to view. The dictionary's key is the channel ID.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyDictionary<ulong, DiscordThreadChannel> Threads { get; internal set; }
 
 		[JsonProperty("threads", NullValueHandling = NullValueHandling.Ignore)]
 		[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 		internal ConcurrentDictionary<ulong, DiscordThreadChannel> ThreadsInternal = new();
 
 		/// <summary>
 		/// Gets a dictionary of all active stage instances. The dictionary's key is the stage ID.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyDictionary<ulong, DiscordStageInstance> StageInstances { get; internal set; }
 
 		[JsonProperty("stage_instances", NullValueHandling = NullValueHandling.Ignore)]
 		[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 		internal ConcurrentDictionary<ulong, DiscordStageInstance> StageInstancesInternal = new();
 
 		/// <summary>
 		/// Gets a dictionary of all scheduled events.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyDictionary<ulong, DiscordScheduledEvent> ScheduledEvents { get; internal set; }
 
 		[JsonProperty("guild_scheduled_events", NullValueHandling = NullValueHandling.Ignore)]
 		[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 		internal ConcurrentDictionary<ulong, DiscordScheduledEvent> ScheduledEventsInternal = new();
 
 		/// <summary>
 		/// Gets the guild member for current user.
 		/// </summary>
 		[JsonIgnore]
 		public DiscordMember CurrentMember
 			=> this._currentMemberLazy.Value;
 
 		[JsonIgnore]
 		private readonly Lazy<DiscordMember> _currentMemberLazy;
 
 		/// <summary>
 		/// Gets the @everyone role for this guild.
 		/// </summary>
 		[JsonIgnore]
 		public DiscordRole EveryoneRole
 			=> this.GetRole(this.Id);
 
 		[JsonIgnore]
 		internal bool IsOwnerInternal;
 
 		/// <summary>
 		/// Gets whether the current user is the guild's owner.
 		/// </summary>
 		[JsonProperty("owner", NullValueHandling = NullValueHandling.Ignore)]
 		public bool IsOwner
 		{
 			get => this.IsOwnerInternal || this.OwnerId == this.Discord.CurrentUser.Id;
 			internal set => this.IsOwnerInternal = value;
 		}
 
 		/// <summary>
 		/// Gets the vanity URL code for this guild, when applicable.
 		/// </summary>
 		[JsonProperty("vanity_url_code")]
 		public string VanityUrlCode { get; internal set; }
 
 		/// <summary>
 		/// Gets the guild description, when applicable.
 		/// </summary>
 		[JsonProperty("description")]
 		public string Description { get; internal set; }
 
 		/// <summary>
 		/// Gets this guild's banner hash, when applicable.
 		/// </summary>
 		[JsonProperty("banner")]
 		public string BannerHash { get; internal set; }
 
 		/// <summary>
 		/// Gets this guild's banner in url form.
 		/// </summary>
 		[JsonIgnore]
 		public string BannerUrl
 			=> !string.IsNullOrWhiteSpace(this.BannerHash) ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Uri}{Endpoints.BANNERS}/{this.Id.ToString(CultureInfo.InvariantCulture)}/{this.BannerHash}.{(this.BannerHash.StartsWith("a_") ? "gif" : "png")}" : null;
 
 		/// <summary>
 		/// Whether this guild has the community feature enabled.
 		/// </summary>
 		[JsonIgnore]
 		public bool IsCommunity => this.Features.HasCommunityEnabled;
 
 		/// <summary>
 		/// Whether this guild has enabled the welcome screen.
 		/// </summary>
 		[JsonIgnore]
 		public bool HasWelcomeScreen => this.Features.HasWelcomeScreenEnabled;
 
 		/// <summary>
 		/// Whether this guild has enabled membership screening.
 		/// </summary>
 		[JsonIgnore]
 		public bool HasMemberVerificationGate => this.Features.HasMembershipScreeningEnabled;
 
 		/// <summary>
 		/// Gets this guild's premium tier (Nitro boosting).
 		/// </summary>
 		[JsonProperty("premium_tier")]
 		public PremiumTier PremiumTier { get; internal set; }
 
 		/// <summary>
 		/// Gets the amount of members that boosted this guild.
 		/// </summary>
 		[JsonProperty("premium_subscription_count", NullValueHandling = NullValueHandling.Ignore)]
 		public int? PremiumSubscriptionCount { get; internal set; }
 
 		/// <summary>
 		/// Whether the premium progress bar is enabled.
 		/// </summary>
 		[JsonProperty("premium_progress_bar_enabled", NullValueHandling = NullValueHandling.Ignore)]
 		public bool PremiumProgressBarEnabled { get; internal set; }
 
 		/// <summary>
 		/// Gets whether this guild is designated as NSFW.
 		/// </summary>
 		[JsonProperty("nsfw", NullValueHandling = NullValueHandling.Ignore)]
 		public bool IsNsfw { get; internal set; }
 
 		/// <summary>
 		/// Gets this guild's hub type, if applicable.
 		/// </summary>
 		[JsonProperty("hub_type", NullValueHandling = NullValueHandling.Ignore)]
 		public HubType HubType { get; internal set; }
 
 		/// <summary>
 		/// Gets a dictionary of all by position ordered channels associated with this guild. The dictionary's key is the channel ID.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyDictionary<ulong, DiscordChannel> OrderedChannels => new ReadOnlyDictionary<ulong, DiscordChannel>(this.InternalSortChannels());
 
 		/// <summary>
 		/// Sorts the channels.
 		/// </summary>
 		private Dictionary<ulong, DiscordChannel> InternalSortChannels()
 		{
 			Dictionary<ulong, DiscordChannel> keyValuePairs = new();
 			var ochannels = this.GetOrderedChannels();
 			foreach (var ochan in ochannels)
 			{
 				if (ochan.Key != 0)
 					keyValuePairs.Add(ochan.Key, this.GetChannel(ochan.Key));
 				foreach (var chan in ochan.Value)
 					keyValuePairs.Add(chan.Id, chan);
 			}
 			return keyValuePairs;
 		}
 
-		/// <summary>
-		/// Gets an ordered <see cref="DiscordChannel"/> list out of the channel cache.
-		/// Returns a Dictionary where the key is an ulong and can be mapped to <see cref="ChannelType.Category"/> <see cref="DiscordChannel"/>s.
-		/// Ignore the 0 key here, because that indicates that this is the "has no category" list.
-		/// Each value contains a ordered list of text/news and voice/stage channels as <see cref="DiscordChannel"/>.
-		/// </summary>
-		/// <returns>A ordered list of categories with its channels</returns>
-		public Dictionary<ulong, List<DiscordChannel>> GetOrderedChannels()
+		private Dictionary<ulong, List<DiscordChannel>> GetOrderedChannelsInternal(IEnumerable<DiscordChannel> channels)
 		{
-			IReadOnlyList<DiscordChannel> rawChannels = this.ChannelsInternal.Values.ToList();
+			var ordered = channels.OrderBy(c => c.Position).ToArray();
 
 			Dictionary<ulong, List<DiscordChannel>> orderedChannels = new()
 			{
 				{ 0, new List<DiscordChannel>() }
 			};
 
-			foreach (var channel in rawChannels.Where(c => c.Type == ChannelType.Category).OrderBy(c => c.Position))
+			foreach (var channel in ordered.Where(c => c.Type == ChannelType.Category))
 			{
 				orderedChannels.Add(channel.Id, new List<DiscordChannel>());
 			}
 
-			foreach (var channel in rawChannels.Where(c => c.ParentId.HasValue && (c.Type == ChannelType.Text || c.Type == ChannelType.News)).OrderBy(c => c.Position))
+			foreach (var channel in ordered.Where(c => c.ParentId.HasValue && (c.Type == ChannelType.Text || c.Type == ChannelType.News)))
 			{
 				orderedChannels[channel.ParentId.Value].Add(channel);
 			}
-			foreach (var channel in rawChannels.Where(c => c.ParentId.HasValue && (c.Type == ChannelType.Voice || c.Type == ChannelType.Stage)).OrderBy(c => c.Position))
+			foreach (var channel in ordered.Where(c => c.ParentId.HasValue && (c.Type == ChannelType.Voice || c.Type == ChannelType.Stage)))
 			{
 				orderedChannels[channel.ParentId.Value].Add(channel);
 			}
 
-			foreach (var channel in rawChannels.Where(c => !c.ParentId.HasValue && c.Type != ChannelType.Category && (c.Type == ChannelType.Text || c.Type == ChannelType.News)).OrderBy(c => c.Position))
+			foreach (var channel in ordered.Where(c => !c.ParentId.HasValue && c.Type != ChannelType.Category && (c.Type == ChannelType.Text || c.Type == ChannelType.News)))
 			{
 				orderedChannels[0].Add(channel);
 			}
-			foreach (var channel in rawChannels.Where(c => !c.ParentId.HasValue && c.Type != ChannelType.Category && (c.Type == ChannelType.Voice || c.Type == ChannelType.Stage)).OrderBy(c => c.Position))
+			foreach (var channel in ordered.Where(c => !c.ParentId.HasValue && c.Type != ChannelType.Category && (c.Type == ChannelType.Voice || c.Type == ChannelType.Stage)))
 			{
 				orderedChannels[0].Add(channel);
 			}
 
 			return orderedChannels;
 		}
 
+		/// <summary>
+		/// Gets an ordered <see cref="DiscordChannel"/> list out of the channel cache.
+		/// Returns a Dictionary where the key is an ulong and can be mapped to <see cref="ChannelType.Category"/> <see cref="DiscordChannel"/>s.
+		/// Ignore the 0 key here, because that indicates that this is the "has no category" list.
+		/// Each value contains a ordered list of text/news and voice/stage channels as <see cref="DiscordChannel"/>.
+		/// </summary>
+		/// <returns>A ordered list of categories with its channels</returns>
+		public Dictionary<ulong, List<DiscordChannel>> GetOrderedChannels()
+			=> this.GetOrderedChannelsInternal(this.ChannelsInternal.Values);
+
 		/// <summary>
 		/// Gets an ordered <see cref="DiscordChannel"/> list.
 		/// Returns a Dictionary where the key is an ulong and can be mapped to <see cref="ChannelType.Category"/> <see cref="DiscordChannel"/>s.
 		/// Ignore the 0 key here, because that indicates that this is the "has no category" list.
 		/// Each value contains a ordered list of text/news and voice/stage channels as <see cref="DiscordChannel"/>.
 		/// </summary>
 		/// <returns>A ordered list of categories with its channels</returns>
 		public async Task<Dictionary<ulong, List<DiscordChannel>>> GetOrderedChannelsAsync()
-		{
-			var rawChannels = await this.Discord.ApiClient.GetGuildChannelsAsync(this.Id);
-
-			Dictionary<ulong, List<DiscordChannel>> orderedChannels = new()
-			{
-				{ 0, new List<DiscordChannel>() }
-			};
-
-			foreach (var channel in rawChannels.Where(c => c.Type == ChannelType.Category).OrderBy(c => c.Position))
-			{
-				orderedChannels.Add(channel.Id, new List<DiscordChannel>());
-			}
-
-			foreach (var channel in rawChannels.Where(c => c.ParentId.HasValue && (c.Type == ChannelType.Text || c.Type == ChannelType.News)).OrderBy(c => c.Position))
-			{
-				orderedChannels[channel.ParentId.Value].Add(channel);
-			}
-			foreach (var channel in rawChannels.Where(c => c.ParentId.HasValue && (c.Type == ChannelType.Voice || c.Type == ChannelType.Stage)).OrderBy(c => c.Position))
-			{
-				orderedChannels[channel.ParentId.Value].Add(channel);
-			}
-
-			foreach (var channel in rawChannels.Where(c => !c.ParentId.HasValue && c.Type != ChannelType.Category && (c.Type == ChannelType.Text || c.Type == ChannelType.News)).OrderBy(c => c.Position))
-			{
-				orderedChannels[0].Add(channel);
-			}
-			foreach (var channel in rawChannels.Where(c => !c.ParentId.HasValue && c.Type != ChannelType.Category && (c.Type == ChannelType.Voice || c.Type == ChannelType.Stage)).OrderBy(c => c.Position))
-			{
-				orderedChannels[0].Add(channel);
-			}
-
-			return orderedChannels;
-		}
+			=> this.GetOrderedChannelsInternal(await this.GetChannelsAsync());
 
 		/// <summary>
 		/// Whether it is synced.
 		/// </summary>
 		[JsonIgnore]
 		internal bool IsSynced { get; set; }
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordGuild"/> class.
 		/// </summary>
 		internal DiscordGuild()
 		{
 			this._currentMemberLazy = new Lazy<DiscordMember>(() => this.MembersInternal != null && this.MembersInternal.TryGetValue(this.Discord.CurrentUser.Id, out var member) ? member : null);
 			this.Invites = new ConcurrentDictionary<string, DiscordInvite>();
 			this.Threads = new ReadOnlyConcurrentDictionary<ulong, DiscordThreadChannel>(this.ThreadsInternal);
 			this.StageInstances = new ReadOnlyConcurrentDictionary<ulong, DiscordStageInstance>(this.StageInstancesInternal);
 			this.ScheduledEvents = new ReadOnlyConcurrentDictionary<ulong, DiscordScheduledEvent>(this.ScheduledEventsInternal);
 		}
 
 		#region Guild Methods
 
 		/// <summary>
 		/// Searches the current guild for members who's display name start with the specified name.
 		/// </summary>
 		/// <param name="name">The name to search for.</param>
 		/// <param name="limit">The maximum amount of members to return. Max 1000. Defaults to 1.</param>
 		/// <returns>The members found, if any.</returns>
 		public Task<IReadOnlyList<DiscordMember>> SearchMembersAsync(string name, int? limit = 1)
 			=> this.Discord.ApiClient.SearchMembersAsync(this.Id, name, limit);
 
 		/// <summary>
 		/// Adds a new member to this guild
 		/// </summary>
 		/// <param name="user">User to add</param>
 		/// <param name="accessToken">User's access token (OAuth2)</param>
 		/// <param name="nickname">new nickname</param>
 		/// <param name="roles">new roles</param>
 		/// <param name="muted">whether this user has to be muted</param>
 		/// <param name="deaf">whether this user has to be deafened</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.CreateInstantInvite" /> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the <paramref name="user"/> or <paramref name="accessToken"/> is not found.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task AddMemberAsync(DiscordUser user, string accessToken, string nickname = null, IEnumerable<DiscordRole> roles = null,
 			bool muted = false, bool deaf = false)
 			=> this.Discord.ApiClient.AddGuildMemberAsync(this.Id, user.Id, accessToken, nickname, roles, muted, deaf);
 
 		/// <summary>
 		/// Deletes this guild. Requires the caller to be the owner of the guild.
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client is not the owner of the guild.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task DeleteAsync()
 			=> this.Discord.ApiClient.DeleteGuildAsync(this.Id);
 
 		/// <summary>
 		/// Modifies this guild.
 		/// </summary>
 		/// <param name="action">Action to perform on this guild..</param>
 		/// <returns>The modified guild object.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageGuild"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordGuild> ModifyAsync(Action<GuildEditModel> action)
 		{
 			var mdl = new GuildEditModel();
 			action(mdl);
 
 			var afkChannelId = mdl.PublicUpdatesChannel
 				.MapOrNull<ulong?>(c => c.Type != ChannelType.Voice
 					? throw new ArgumentException("AFK channel needs to be a text channel.")
 					: c.Id);
 
 			static Optional<ulong?> ChannelToId(Optional<DiscordChannel> ch, string name)
 				=> ch.MapOrNull<ulong?>(c => c.Type != ChannelType.Text && c.Type != ChannelType.News
 					? throw new ArgumentException($"{name} channel needs to be a text channel.")
 					: c.Id);
 
 			var rulesChannelId = ChannelToId(mdl.RulesChannel, "Rules");
 			var publicUpdatesChannelId = ChannelToId(mdl.PublicUpdatesChannel, "Public updates");
 			var systemChannelId = ChannelToId(mdl.SystemChannel, "System");
 
 			var iconb64 = ImageTool.Base64FromStream(mdl.Icon);
 			var splashb64 = ImageTool.Base64FromStream(mdl.Splash);
 			var bannerb64 = ImageTool.Base64FromStream(mdl.Banner);
 			var discoverySplash64 = ImageTool.Base64FromStream(mdl.DiscoverySplash);
 
 			return await this.Discord.ApiClient.ModifyGuildAsync(this.Id, mdl.Name,
 				mdl.VerificationLevel, mdl.DefaultMessageNotifications, mdl.MfaLevel, mdl.ExplicitContentFilter,
 				afkChannelId, mdl.AfkTimeout, iconb64, mdl.Owner.Map(e => e.Id), splashb64,
 				systemChannelId, mdl.SystemChannelFlags, publicUpdatesChannelId, rulesChannelId,
 				mdl.Description, bannerb64, discoverySplash64, mdl.PreferredLocale, mdl.PremiumProgressBarEnabled, mdl.AuditLogReason).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Modifies the community settings async.
 		/// This sets <see cref="VerificationLevel.High"/> if not highest and <see cref="ExplicitContentFilter.AllMembers"/>.
 		/// </summary>
 		/// <param name="enabled">If true, enable <see cref="GuildFeatures.HasCommunityEnabled"/>.</param>
 		/// <param name="rulesChannel">The rules channel.</param>
 		/// <param name="publicUpdatesChannel">The public updates channel.</param>
 		/// <param name="preferredLocale">The preferred locale. Defaults to en-US.</param>
 		/// <param name="description">The description.</param>
 		/// <param name="defaultMessageNotifications">The default message notifications. Defaults to <see cref="DefaultMessageNotifications.MentionsOnly"/></param>
 		/// <param name="reason">The auditlog reason.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageGuild"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordGuild> ModifyCommunitySettingsAsync(bool enabled, DiscordChannel rulesChannel = null, DiscordChannel publicUpdatesChannel = null, string preferredLocale = "en-US", string description = null, DefaultMessageNotifications defaultMessageNotifications = DefaultMessageNotifications.MentionsOnly, string reason = null)
 		{
 			var verificationLevel = this.VerificationLevel;
 			if (this.VerificationLevel != VerificationLevel.Highest)
 			{
 				verificationLevel = VerificationLevel.High;
 			}
 
 			var explicitContentFilter = ExplicitContentFilter.AllMembers;
 
 			static Optional<ulong?> ChannelToId(DiscordChannel ch, string name)
 				=> ch == null ? null :
 					ch.Type != ChannelType.Text && ch.Type != ChannelType.News
 						? throw new ArgumentException($"{name} channel needs to be a text channel.")
 						: ch.Id;
 
 			var rulesChannelId = ChannelToId(rulesChannel, "Rules");
 			var publicUpdatesChannelId = ChannelToId(publicUpdatesChannel, "Public updates");
 
-			List<string> features = new();
-			var rfeatures = this.RawFeatures.ToList();
-			if (this.RawFeatures.Contains("COMMUNITY") && enabled)
+			var features = this.RawFeatures.ToList();
+			if (enabled)
 			{
-				features = rfeatures;
-			}
-			else if (!this.RawFeatures.Contains("COMMUNITY") && enabled)
-			{
-				rfeatures.Add("COMMUNITY");
-				features = rfeatures;
-			}
-			else if (this.RawFeatures.Contains("COMMUNITY") && !enabled)
-			{
-				rfeatures.Remove("COMMUNITY");
-				features = rfeatures;
+				if (!features.Contains("COMMUNITY"))
+				{
+					features.Add("COMMUNITY");
+				}
 			}
-			else if (!this.RawFeatures.Contains("COMMUNITY") && !enabled)
+			else
 			{
-				features = rfeatures;
+				features.Remove("COMMUNITY");
 			}
 
 			return await this.Discord.ApiClient.ModifyGuildCommunitySettingsAsync(this.Id, features, rulesChannelId, publicUpdatesChannelId, preferredLocale, description, defaultMessageNotifications, explicitContentFilter, verificationLevel, reason).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Timeout a specified member in this guild.
 		/// </summary>
 		/// <param name="memberId">Member to timeout.</param>
 		/// <param name="until">The datetime offset to time out the user. Up to 28 days.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ModerateMembers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task TimeoutAsync(ulong memberId, DateTimeOffset until, string reason = null)
 			=> until.Subtract(DateTimeOffset.UtcNow).Days > 28
 				? throw new ArgumentException("Timeout can not be longer than 28 days")
 				: this.Discord.ApiClient.ModifyTimeoutAsync(this.Id, memberId, until, reason);
 
 		/// <summary>
 		/// Timeout a specified member in this guild.
 		/// </summary>
 		/// <param name="memberId">Member to timeout.</param>
 		/// <param name="until">The timespan to time out the user. Up to 28 days.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ModerateMembers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task TimeoutAsync(ulong memberId, TimeSpan until, string reason = null)
 			=> this.TimeoutAsync(memberId, DateTimeOffset.UtcNow + until, reason);
 
 		/// <summary>
 		/// Timeout a specified member in this guild.
 		/// </summary>
 		/// <param name="memberId">Member to timeout.</param>
 		/// <param name="until">The datetime to time out the user. Up to 28 days.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ModerateMembers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task TimeoutAsync(ulong memberId, DateTime until, string reason = null)
 			=> this.TimeoutAsync(memberId, until.ToUniversalTime() - DateTime.UtcNow, reason);
 
 		/// <summary>
 		/// Removes the timeout from a specified member in this guild.
 		/// </summary>
 		/// <param name="memberId">Member to remove the timeout from.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ModerateMembers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task RemoveTimeoutAsync(ulong memberId, string reason = null)
 			=> this.Discord.ApiClient.ModifyTimeoutAsync(this.Id, memberId, null, reason);
 
 		/// <summary>
 		/// Bans a specified member from this guild.
 		/// </summary>
 		/// <param name="member">Member to ban.</param>
 		/// <param name="deleteMessageDays">How many days to remove messages from.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.BanMembers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task BanMemberAsync(DiscordMember member, int deleteMessageDays = 0, string reason = null)
 			=> this.Discord.ApiClient.CreateGuildBanAsync(this.Id, member.Id, deleteMessageDays, reason);
 
 		/// <summary>
 		/// Bans a specified user by ID. This doesn't require the user to be in this guild.
 		/// </summary>
 		/// <param name="userId">ID of the user to ban.</param>
 		/// <param name="deleteMessageDays">How many days to remove messages from.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.BanMembers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task BanMemberAsync(ulong userId, int deleteMessageDays = 0, string reason = null)
 			=> this.Discord.ApiClient.CreateGuildBanAsync(this.Id, userId, deleteMessageDays, reason);
 
 		/// <summary>
 		/// Unbans a user from this guild.
 		/// </summary>
 		/// <param name="user">User to unban.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.BanMembers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the user does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task UnbanMemberAsync(DiscordUser user, string reason = null)
 			=> this.Discord.ApiClient.RemoveGuildBanAsync(this.Id, user.Id, reason);
 
 		/// <summary>
 		/// Unbans a user by ID.
 		/// </summary>
 		/// <param name="userId">ID of the user to unban.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.BanMembers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the user does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task UnbanMemberAsync(ulong userId, string reason = null)
 			=> this.Discord.ApiClient.RemoveGuildBanAsync(this.Id, userId, reason);
 
 		/// <summary>
 		/// Leaves this guild.
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task LeaveAsync()
 			=> this.Discord.ApiClient.LeaveGuildAsync(this.Id);
 
 		/// <summary>
 		/// Gets the bans for this guild, allowing for pagination.
 		/// </summary>
 		/// <param name="limit">Maximum number of bans to fetch. Max 1000. Defaults to 1000.</param>
 		/// <param name="before">The Id of the user before which to fetch the bans. Overrides <paramref name="after"/> if both are present.</param>
 		/// <param name="after">The Id of the user after which to fetch the bans.</param>
 		/// <returns>Collection of bans in this guild in ascending order by user id.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.BanMembers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<IReadOnlyList<DiscordBan>> GetBansAsync(int? limit = null, ulong? before = null, ulong? after = null)
 			=> this.Discord.ApiClient.GetGuildBansAsync(this.Id, limit, before, after);
 
 		/// <summary>
 		/// Gets a ban for a specific user.
 		/// </summary>
 		/// <param name="userId">The Id of the user to get the ban for.</param>
 		/// <returns>The requested ban object.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the specified user is not banned.</exception>
 		public Task<DiscordBan> GetBanAsync(ulong userId)
 			=> this.Discord.ApiClient.GetGuildBanAsync(this.Id, userId);
 
 		/// <summary>
 		/// Gets a ban for a specific user.
 		/// </summary>
 		/// <param name="user">The user to get the ban for.</param>
 		/// <returns>The requested ban object.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the specified user is not banned.</exception>
 		public Task<DiscordBan> GetBanAsync(DiscordUser user)
 			=> this.GetBanAsync(user.Id);
 
 		#region Sheduled Events
 
 		/// <summary>
 		/// Creates a scheduled event.
 		/// </summary>
 		/// <param name="name">The name.</param>
 		/// <param name="scheduledStartTime">The scheduled start time.</param>
 		/// <param name="scheduledEndTime">The scheduled end time.</param>
 		/// <param name="channel">The channel.</param>
 		/// <param name="metadata">The metadata.</param>
 		/// <param name="description">The description.</param>
 		/// <param name="type">The type.</param>
 		/// <param name="coverImage">The cover image.</param>
 		/// <param name="reason">The reason.</param>
 		/// <returns>A scheduled event.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordScheduledEvent> CreateScheduledEventAsync(string name, DateTimeOffset scheduledStartTime, DateTimeOffset? scheduledEndTime = null, DiscordChannel channel = null, DiscordScheduledEventEntityMetadata metadata = null, string description = null, ScheduledEventEntityType type = ScheduledEventEntityType.StageInstance, Optional<Stream> coverImage = default, string reason = null)
 		{
 			var coverb64 = ImageTool.Base64FromStream(coverImage);
 			return await this.Discord.ApiClient.CreateGuildScheduledEventAsync(this.Id, type == ScheduledEventEntityType.External ? null : channel?.Id, type == ScheduledEventEntityType.External ? metadata : null, name, scheduledStartTime, scheduledEndTime.HasValue && type == ScheduledEventEntityType.External ? scheduledEndTime.Value : null, description, type, coverb64, reason);
 		}
 
 		/// <summary>
 		/// Creates a scheduled event with type <see cref="ScheduledEventEntityType.External"/>.
 		/// </summary>
 		/// <param name="name">The name.</param>
 		/// <param name="scheduledStartTime">The scheduled start time.</param>
 		/// <param name="scheduledEndTime">The scheduled end time.</param>
 		/// <param name="location">The location of the external event.</param>
 		/// <param name="description">The description.</param>
 		/// <param name="coverImage">The cover image.</param>
 		/// <param name="reason">The reason.</param>
 		/// <returns>A scheduled event.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordScheduledEvent> CreateExternalScheduledEventAsync(string name, DateTimeOffset scheduledStartTime, DateTimeOffset scheduledEndTime, string location, string description = null, Optional<Stream> coverImage = default, string reason = null)
 		{
 			var coverb64 = ImageTool.Base64FromStream(coverImage);
 			return await this.Discord.ApiClient.CreateGuildScheduledEventAsync(this.Id, null, new DiscordScheduledEventEntityMetadata(location), name, scheduledStartTime, scheduledEndTime, description, ScheduledEventEntityType.External, coverb64, reason);
 		}
 
 
 		/// <summary>
 		/// Gets a specific scheduled events.
 		/// </summary>
 		/// <param name="scheduledEventId">The Id of the event to get.</param>
 		/// <param name="withUserCount">Whether to include user count.</param>
 		/// <returns>A scheduled event.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordScheduledEvent> GetScheduledEventAsync(ulong scheduledEventId, bool? withUserCount = null)
 			=> this.ScheduledEventsInternal.TryGetValue(scheduledEventId, out var ev) ? ev : await this.Discord.ApiClient.GetGuildScheduledEventAsync(this.Id, scheduledEventId, withUserCount);
 
 		/// <summary>
 		/// Gets a specific scheduled events.
 		/// </summary>
 		/// <param name="scheduledEvent">The event to get.</param>
 		/// <param name="withUserCount">Whether to include user count.</param>
 		/// <returns>A sheduled event.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordScheduledEvent> GetScheduledEventAsync(DiscordScheduledEvent scheduledEvent, bool? withUserCount = null)
 			=> await this.GetScheduledEventAsync(scheduledEvent.Id, withUserCount);
 
 		/// <summary>
 		/// Gets the guilds scheduled events.
 		/// </summary>
 		/// <param name="withUserCount">Whether to include user count.</param>
 		/// <returns>A list of the guilds scheduled events.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<IReadOnlyDictionary<ulong, DiscordScheduledEvent>> GetScheduledEventsAsync(bool? withUserCount = null)
 			=> await this.Discord.ApiClient.ListGuildScheduledEventsAsync(this.Id, withUserCount);
 		#endregion
 
 		/// <summary>
 		/// Creates a new text channel in this guild.
 		/// </summary>
 		/// <param name="name">Name of the new channel.</param>
 		/// <param name="parent">Category to put this channel in.</param>
 		/// <param name="topic">Topic of the channel.</param>
 		/// <param name="overwrites">Permission overwrites for this channel.</param>
 		/// <param name="nsfw">Whether the channel is to be flagged as not safe for work.</param>
 		/// <param name="perUserRateLimit">Slow mode timeout for users.</param>
 		/// <param name="defaultAutoArchiveDuration">The default auto archive duration for new threads.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <returns>The newly-created channel.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordChannel> CreateTextChannelAsync(string name, DiscordChannel parent = null, Optional<string> topic = default, IEnumerable<DiscordOverwriteBuilder> overwrites = null, bool? nsfw = null, Optional<int?> perUserRateLimit = default, ThreadAutoArchiveDuration defaultAutoArchiveDuration = ThreadAutoArchiveDuration.OneDay, string reason = null)
 			=> this.CreateChannelAsync(name, ChannelType.Text, parent, topic, null, null, overwrites, nsfw, perUserRateLimit, null, defaultAutoArchiveDuration, reason);
 
 		/// <summary>
 		/// Creates a new channel category in this guild.
 		/// </summary>
 		/// <param name="name">Name of the new category.</param>
 		/// <param name="overwrites">Permission overwrites for this category.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <returns>The newly-created channel category.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordChannel> CreateChannelCategoryAsync(string name, IEnumerable<DiscordOverwriteBuilder> overwrites = null, string reason = null)
 			=> this.CreateChannelAsync(name, ChannelType.Category, null, Optional.None, null, null, overwrites, null, Optional.None, null, null, reason);
 
 		/// <summary>
 		/// Creates a new stage channel in this guild.
 		/// </summary>
 		/// <param name="name">Name of the new stage channel.</param>
 		/// <param name="overwrites">Permission overwrites for this stage channel.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <returns>The newly-created stage channel.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/>.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		/// <exception cref="System.NotSupportedException">Thrown when the guilds has not enabled community.</exception>
 		public Task<DiscordChannel> CreateStageChannelAsync(string name, IEnumerable<DiscordOverwriteBuilder> overwrites = null, string reason = null)
 			=> this.Features.HasCommunityEnabled ? this.CreateChannelAsync(name, ChannelType.Stage, null, Optional.None, null, null, overwrites, null, Optional.None, null, null, reason) : throw new NotSupportedException("Guild has not enabled community. Can not create a stage channel.");
 
 		/// <summary>
 		/// Creates a new news channel in this guild.
 		/// </summary>
 		/// <param name="name">Name of the new news channel.</param>
 		/// <param name="overwrites">Permission overwrites for this news channel.</param>
 		/// <param name="defaultAutoArchiveDuration">The default auto archive duration for new threads.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <returns>The newly-created news channel.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/>.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		/// <exception cref="System.NotSupportedException">Thrown when the guilds has not enabled community.</exception>
 		public Task<DiscordChannel> CreateNewsChannelAsync(string name, IEnumerable<DiscordOverwriteBuilder> overwrites = null, string reason = null, ThreadAutoArchiveDuration defaultAutoArchiveDuration = ThreadAutoArchiveDuration.OneDay)
 			=> this.Features.HasCommunityEnabled ? this.CreateChannelAsync(name, ChannelType.News, null, Optional.None, null, null, overwrites, null, Optional.None, null, defaultAutoArchiveDuration, reason) : throw new NotSupportedException("Guild has not enabled community. Can not create a news channel.");
 
 		/// <summary>
 		/// Creates a new voice channel in this guild.
 		/// </summary>
 		/// <param name="name">Name of the new channel.</param>
 		/// <param name="parent">Category to put this channel in.</param>
 		/// <param name="bitrate">Bitrate of the channel.</param>
 		/// <param name="userLimit">Maximum number of users in the channel.</param>
 		/// <param name="overwrites">Permission overwrites for this channel.</param>
 		/// <param name="qualityMode">Video quality mode of the channel.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <returns>The newly-created channel.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordChannel> CreateVoiceChannelAsync(string name, DiscordChannel parent = null, int? bitrate = null, int? userLimit = null, IEnumerable<DiscordOverwriteBuilder> overwrites = null, VideoQualityMode? qualityMode = null, string reason = null)
 			=> this.CreateChannelAsync(name, ChannelType.Voice, parent, Optional.None, bitrate, userLimit, overwrites, null, Optional.None, qualityMode, null, reason);
 
 		/// <summary>
 		/// Creates a new channel in this guild.
 		/// </summary>
 		/// <param name="name">Name of the new channel.</param>
 		/// <param name="type">Type of the new channel.</param>
 		/// <param name="parent">Category to put this channel in.</param>
 		/// <param name="topic">Topic of the channel.</param>
 		/// <param name="bitrate">Bitrate of the channel. Applies to voice only.</param>
 		/// <param name="userLimit">Maximum number of users in the channel. Applies to voice only.</param>
 		/// <param name="overwrites">Permission overwrites for this channel.</param>
 		/// <param name="nsfw">Whether the channel is to be flagged as not safe for work. Applies to text only.</param>
 		/// <param name="perUserRateLimit">Slow mode timeout for users.</param>
 		/// <param name="qualityMode">Video quality mode of the channel. Applies to voice only.</param>
 		/// <param name="defaultAutoArchiveDuration">The default auto archive duration for new threads.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <returns>The newly-created channel.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordChannel> CreateChannelAsync(string name, ChannelType type, DiscordChannel parent = null, Optional<string> topic = default, int? bitrate = null, int? userLimit = null, IEnumerable<DiscordOverwriteBuilder> overwrites = null, bool? nsfw = null, Optional<int?> perUserRateLimit = default, VideoQualityMode? qualityMode = null, ThreadAutoArchiveDuration? defaultAutoArchiveDuration = null, string reason = null) =>
 			// technically you can create news/store channels but not always
 			type != ChannelType.Text && type != ChannelType.Voice && type != ChannelType.Category && type != ChannelType.News && type != ChannelType.Store && type != ChannelType.Stage
 				? throw new ArgumentException("Channel type must be text, voice, stage, or category.", nameof(type))
 				: type == ChannelType.Category && parent != null
 					? throw new ArgumentException("Cannot specify parent of a channel category.", nameof(parent))
 					: this.Discord.ApiClient.CreateGuildChannelAsync(this.Id, name, type, parent?.Id, topic, bitrate, userLimit, overwrites, nsfw, perUserRateLimit, qualityMode, defaultAutoArchiveDuration, reason);
 
 		/// <summary>
 		/// Gets active threads. Can contain more threads.
 		/// If the result's value 'HasMore' is true, you need to recall this function to get older threads.
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordThreadResult> GetActiveThreadsAsync()
 			=> this.Discord.ApiClient.GetActiveThreadsAsync(this.Id);
 
 		/// <summary>
 		/// <para>Deletes all channels in this guild.</para>
 		/// <para>Note that this is irreversible. Use carefully!</para>
 		/// </summary>
 		/// <returns></returns>
 		public Task DeleteAllChannelsAsync()
 		{
 			var tasks = this.Channels.Values.Select(xc => xc.DeleteAsync());
 			return Task.WhenAll(tasks);
 		}
 
 		/// <summary>
 		/// Estimates the number of users to be pruned.
 		/// </summary>
 		/// <param name="days">Minimum number of inactivity days required for users to be pruned. Defaults to 7.</param>
 		/// <param name="includedRoles">The roles to be included in the prune.</param>
 		/// <returns>Number of users that will be pruned.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.KickMembers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<int> GetPruneCountAsync(int days = 7, IEnumerable<DiscordRole> includedRoles = null)
 		{
 			if (includedRoles != null)
 			{
 				includedRoles = includedRoles.Where(r => r != null);
 				var rawRoleIds = includedRoles
 					.Where(x => this.RolesInternal.ContainsKey(x.Id))
 					.Select(x => x.Id);
 
 				return this.Discord.ApiClient.GetGuildPruneCountAsync(this.Id, days, rawRoleIds);
 			}
 
 			return this.Discord.ApiClient.GetGuildPruneCountAsync(this.Id, days, null);
 		}
 
 		/// <summary>
 		/// Prunes inactive users from this guild.
 		/// </summary>
 		/// <param name="days">Minimum number of inactivity days required for users to be pruned. Defaults to 7.</param>
 		/// <param name="computePruneCount">Whether to return the prune count after this method completes. This is discouraged for larger guilds.</param>
 		/// <param name="includedRoles">The roles to be included in the prune.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <returns>Number of users pruned.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageChannels"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<int?> PruneAsync(int days = 7, bool computePruneCount = true, IEnumerable<DiscordRole> includedRoles = null, string reason = null)
 		{
 			if (includedRoles != null)
 			{
 				includedRoles = includedRoles.Where(r => r != null);
 				var rawRoleIds = includedRoles
 					.Where(x => this.RolesInternal.ContainsKey(x.Id))
 					.Select(x => x.Id);
 
 				return this.Discord.ApiClient.BeginGuildPruneAsync(this.Id, days, computePruneCount, rawRoleIds, reason);
 			}
 
 			return this.Discord.ApiClient.BeginGuildPruneAsync(this.Id, days, computePruneCount, null, reason);
 		}
 
 		/// <summary>
 		/// Gets integrations attached to this guild.
 		/// </summary>
 		/// <returns>Collection of integrations attached to this guild.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageGuild"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<IReadOnlyList<DiscordIntegration>> GetIntegrationsAsync()
 			=> this.Discord.ApiClient.GetGuildIntegrationsAsync(this.Id);
 
 		/// <summary>
 		/// Attaches an integration from current user to this guild.
 		/// </summary>
 		/// <param name="integration">Integration to attach.</param>
 		/// <returns>The integration after being attached to the guild.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageGuild"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordIntegration> AttachUserIntegrationAsync(DiscordIntegration integration)
 			=> this.Discord.ApiClient.CreateGuildIntegrationAsync(this.Id, integration.Type, integration.Id);
 
 		/// <summary>
 		/// Modifies an integration in this guild.
 		/// </summary>
 		/// <param name="integration">Integration to modify.</param>
 		/// <param name="expireBehaviour">Number of days after which the integration expires.</param>
 		/// <param name="expireGracePeriod">Length of grace period which allows for renewing the integration.</param>
 		/// <param name="enableEmoticons">Whether emotes should be synced from this integration.</param>
 		/// <returns>The modified integration.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageGuild"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordIntegration> ModifyIntegrationAsync(DiscordIntegration integration, int expireBehaviour, int expireGracePeriod, bool enableEmoticons)
 			=> this.Discord.ApiClient.ModifyGuildIntegrationAsync(this.Id, integration.Id, expireBehaviour, expireGracePeriod, enableEmoticons);
 
 		/// <summary>
 		/// Removes an integration from this guild.
 		/// </summary>
 		/// <param name="integration">Integration to remove.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageGuild"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task DeleteIntegrationAsync(DiscordIntegration integration)
 			=> this.Discord.ApiClient.DeleteGuildIntegrationAsync(this.Id, integration);
 
 		/// <summary>
 		/// Forces re-synchronization of an integration for this guild.
 		/// </summary>
 		/// <param name="integration">Integration to synchronize.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageGuild"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the guild does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task SyncIntegrationAsync(DiscordIntegration integration)
 			=> this.Discord.ApiClient.SyncGuildIntegrationAsync(this.Id, integration.Id);
 
 		/// <summary>
 		/// Gets the voice regions for this guild.
 		/// </summary>
 		/// <returns>Voice regions available for this guild.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<IReadOnlyList<DiscordVoiceRegion>> ListVoiceRegionsAsync()
 		{
 			var vrs = await this.Discord.ApiClient.GetGuildVoiceRegionsAsync(this.Id).ConfigureAwait(false);
 			foreach (var xvr in vrs)
 				this.Discord.InternalVoiceRegions.TryAdd(xvr.Id, xvr);
 
 			return vrs;
 		}
 
 		/// <summary>
 		/// Gets an invite from this guild from an invite code.
 		/// </summary>
 		/// <param name="code">The invite code</param>
 		/// <returns>An invite, or null if not in cache.</returns>
 		public DiscordInvite GetInvite(string code)
 			=> this.Invites.TryGetValue(code, out var invite) ? invite : null;
 
 		/// <summary>
 		/// Gets all the invites created for all the channels in this guild.
 		/// </summary>
 		/// <returns>A collection of invites.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<IReadOnlyList<DiscordInvite>> GetInvitesAsync()
 		{
 			var res = await this.Discord.ApiClient.GetGuildInvitesAsync(this.Id).ConfigureAwait(false);
 
 			var intents = this.Discord.Configuration.Intents;
 
 			if (!intents.HasIntent(DiscordIntents.GuildInvites))
 			{
 				foreach (var r in res)
 					this.Invites[r.Code] = r;
 			}
 
 			return res;
 		}
 
 		/// <summary>
 		/// Gets the vanity invite for this guild.
 		/// </summary>
 		/// <returns>A partial vanity invite.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageGuild"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordInvite> GetVanityInviteAsync()
 			=> this.Discord.ApiClient.GetGuildVanityUrlAsync(this.Id);
 
 		/// <summary>
 		/// Gets all the webhooks created for all the channels in this guild.
 		/// </summary>
 		/// <returns>A collection of webhooks this guild has.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageWebhooks"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<IReadOnlyList<DiscordWebhook>> GetWebhooksAsync()
 			=> this.Discord.ApiClient.GetGuildWebhooksAsync(this.Id);
 
 		/// <summary>
 		/// Gets this guild's widget image.
 		/// </summary>
 		/// <param name="bannerType">The format of the widget.</param>
 		/// <returns>The URL of the widget image.</returns>
 		public string GetWidgetImage(WidgetType bannerType = WidgetType.Shield)
 		{
 			var param = bannerType switch
 			{
 				WidgetType.Banner1 => "banner1",
 				WidgetType.Banner2 => "banner2",
 				WidgetType.Banner3 => "banner3",
 				WidgetType.Banner4 => "banner4",
 				_ => "shield",
 			};
 			return $"{Endpoints.BASE_URI}{Endpoints.GUILDS}/{this.Id}{Endpoints.WIDGET_PNG}?style={param}";
 		}
 
 		/// <summary>
 		/// Gets a member of this guild by their user ID.
 		/// </summary>
 		/// <param name="userId">ID of the member to get.</param>
 		/// <returns>The requested member.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordMember> GetMemberAsync(ulong userId)
 		{
 			if (this.MembersInternal != null && this.MembersInternal.TryGetValue(userId, out var mbr))
 				return mbr;
 
 			mbr = await this.Discord.ApiClient.GetGuildMemberAsync(this.Id, userId).ConfigureAwait(false);
 
 			var intents = this.Discord.Configuration.Intents;
 
 			if (intents.HasIntent(DiscordIntents.GuildMembers))
 			{
 				if (this.MembersInternal != null)
 				{
 					this.MembersInternal[userId] = mbr;
 				}
 			}
 
 			return mbr;
 		}
 
 		/// <summary>
 		/// Retrieves a full list of members from Discord. This method will bypass cache.
 		/// </summary>
 		/// <returns>A collection of all members in this guild.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<IReadOnlyCollection<DiscordMember>> GetAllMembersAsync()
 		{
 			var recmbr = new HashSet<DiscordMember>();
 
 			var recd = 1000;
 			var last = 0ul;
 			while (recd > 0)
 			{
 				var tms = await this.Discord.ApiClient.ListGuildMembersAsync(this.Id, 1000, last == 0 ? null : (ulong?)last).ConfigureAwait(false);
 				recd = tms.Count;
 
 				foreach (var xtm in tms)
 				{
 					var usr = new DiscordUser(xtm.User) { Discord = this.Discord };
 
 					usr = this.Discord.UserCache.AddOrUpdate(xtm.User.Id, usr, (id, old) =>
 					{
 						old.Username = usr.Username;
 						old.Discord = usr.Discord;
 						old.AvatarHash = usr.AvatarHash;
 
 						return old;
 					});
 
 					recmbr.Add(new DiscordMember(xtm) { Discord = this.Discord, GuildId = this.Id });
 				}
 
 				var tm = tms.LastOrDefault();
 				last = tm?.User.Id ?? 0;
 			}
 
 			return new ReadOnlySet<DiscordMember>(recmbr);
 		}
 
 		/// <summary>
 		/// Requests that Discord send a list of guild members based on the specified arguments. This method will fire the <see cref="DiscordClient.GuildMembersChunked"/> event.
 		/// <para>If no arguments aside from <paramref name="presences"/> and <paramref name="nonce"/> are specified, this will request all guild members.</para>
 		/// </summary>
 		/// <param name="query">Filters the returned members based on what the username starts with. Either this or <paramref name="userIds"/> must not be null.
 		/// The <paramref name="limit"/> must also be greater than 0 if this is specified.</param>
 		/// <param name="limit">Total number of members to request. This must be greater than 0 if <paramref name="query"/> is specified.</param>
 		/// <param name="presences">Whether to include the <see cref="DisCatSharp.EventArgs.GuildMembersChunkEventArgs.Presences"/> associated with the fetched members.</param>
 		/// <param name="userIds">Whether to limit the request to the specified user ids. Either this or <paramref name="query"/> must not be null.</param>
 		/// <param name="nonce">The unique string to identify the response.</param>
 		public async Task RequestMembersAsync(string query = "", int limit = 0, bool? presences = null, IEnumerable<ulong> userIds = null, string nonce = null)
 		{
 			if (this.Discord is not DiscordClient client)
 				throw new InvalidOperationException("This operation is only valid for regular Discord clients.");
 
 			if (query == null && userIds == null)
 				throw new ArgumentException("The query and user IDs cannot both be null.");
 
 			if (query != null && userIds != null)
 				query = null;
 
 			var grgm = new GatewayRequestGuildMembers(this)
 			{
 				Query = query,
 				Limit = limit >= 0 ? limit : 0,
 				Presences = presences,
 				UserIds = userIds,
 				Nonce = nonce
 			};
 
 			var payload = new GatewayPayload
 			{
 				OpCode = GatewayOpCode.RequestGuildMembers,
 				Data = grgm
 			};
 
 			var payloadStr = JsonConvert.SerializeObject(payload, Formatting.None);
 			await client.WsSendAsync(payloadStr).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Gets all the channels this guild has.
 		/// </summary>
 		/// <returns>A collection of this guild's channels.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<IReadOnlyList<DiscordChannel>> GetChannelsAsync()
 			=> this.Discord.ApiClient.GetGuildChannelsAsync(this.Id);
 
 		/// <summary>
 		/// Creates a new role in this guild.
 		/// </summary>
 		/// <param name="name">Name of the role.</param>
 		/// <param name="permissions">Permissions for the role.</param>
 		/// <param name="color">Color for the role.</param>
 		/// <param name="hoist">Whether the role is to be hoisted.</param>
 		/// <param name="mentionable">Whether the role is to be mentionable.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <returns>The newly-created role.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageRoles"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordRole> CreateRoleAsync(string name = null, Permissions? permissions = null, DiscordColor? color = null, bool? hoist = null, bool? mentionable = null, string reason = null)
 			=> this.Discord.ApiClient.CreateGuildRoleAsync(this.Id, name, permissions, color?.Value, hoist, mentionable, reason);
 
 		/// <summary>
 		/// Gets a role from this guild by its ID.
 		/// </summary>
 		/// <param name="id">ID of the role to get.</param>
 		/// <returns>Requested role.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public DiscordRole GetRole(ulong id)
 			=> this.RolesInternal.TryGetValue(id, out var role) ? role : null;
 
 		/// <summary>
 		/// Gets a channel from this guild by its ID.
 		/// </summary>
 		/// <param name="id">ID of the channel to get.</param>
 		/// <returns>Requested channel.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public DiscordChannel GetChannel(ulong id)
 			=> this.ChannelsInternal != null && this.ChannelsInternal.TryGetValue(id, out var channel) ? channel : null;
 
 		/// <summary>
 		/// Gets a thread from this guild by its ID.
 		/// </summary>
 		/// <param name="id">ID of the thread to get.</param>
 		/// <returns>Requested thread.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public DiscordThreadChannel GetThread(ulong id)
 			=> this.ThreadsInternal != null && this.ThreadsInternal.TryGetValue(id, out var thread) ? thread : null;
 
 		/// <summary>
 		/// Gets all of this guild's custom emojis.
 		/// </summary>
 		/// <returns>All of this guild's custom emojis.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<IReadOnlyList<DiscordGuildEmoji>> GetEmojisAsync()
 			=> this.Discord.ApiClient.GetGuildEmojisAsync(this.Id);
 
 		/// <summary>
 		/// Gets this guild's specified custom emoji.
 		/// </summary>
 		/// <param name="id">ID of the emoji to get.</param>
 		/// <returns>The requested custom emoji.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordGuildEmoji> GetEmojiAsync(ulong id)
 			=> this.Discord.ApiClient.GetGuildEmojiAsync(this.Id, id);
 
 		/// <summary>
 		/// Creates a new custom emoji for this guild.
 		/// </summary>
 		/// <param name="name">Name of the new emoji.</param>
 		/// <param name="image">Image to use as the emoji.</param>
 		/// <param name="roles">Roles for which the emoji will be available. This works only if your application is whitelisted as integration.</param>
 		/// <param name="reason">Reason for audit log.</param>
 		/// <returns>The newly-created emoji.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageEmojisAndStickers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordGuildEmoji> CreateEmojiAsync(string name, Stream image, IEnumerable<DiscordRole> roles = null, string reason = null)
 		{
 			if (string.IsNullOrWhiteSpace(name))
 				throw new ArgumentNullException(nameof(name));
 
 			name = name.Trim();
 			if (name.Length < 2 || name.Length > 50)
 				throw new ArgumentException("Emoji name needs to be between 2 and 50 characters long.");
 
 			if (image == null)
 				throw new ArgumentNullException(nameof(image));
 
 			var image64 = ImageTool.Base64FromStream(image);
 
 			return this.Discord.ApiClient.CreateGuildEmojiAsync(this.Id, name, image64, roles?.Select(xr => xr.Id), reason);
 		}
 
 		/// <summary>
 		/// Modifies a this guild's custom emoji.
 		/// </summary>
 		/// <param name="emoji">Emoji to modify.</param>
 		/// <param name="name">New name for the emoji.</param>
 		/// <param name="roles">Roles for which the emoji will be available. This works only if your application is whitelisted as integration.</param>
 		/// <param name="reason">Reason for audit log.</param>
 		/// <returns>The modified emoji.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageEmojisAndStickers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordGuildEmoji> ModifyEmojiAsync(DiscordGuildEmoji emoji, string name, IEnumerable<DiscordRole> roles = null, string reason = null)
 		{
 			if (emoji == null)
 				throw new ArgumentNullException(nameof(emoji));
 
 			if (emoji.Guild.Id != this.Id)
 				throw new ArgumentException("This emoji does not belong to this guild.");
 
 			if (string.IsNullOrWhiteSpace(name))
 				throw new ArgumentNullException(nameof(name));
 
 			name = name.Trim();
 			return name.Length < 2 || name.Length > 50
 				? throw new ArgumentException("Emoji name needs to be between 2 and 50 characters long.")
 				: this.Discord.ApiClient.ModifyGuildEmojiAsync(this.Id, emoji.Id, name, roles?.Select(xr => xr.Id), reason);
 		}
 
 		/// <summary>
 		/// Deletes this guild's custom emoji.
 		/// </summary>
 		/// <param name="emoji">Emoji to delete.</param>
 		/// <param name="reason">Reason for audit log.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageEmojisAndStickers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task DeleteEmojiAsync(DiscordGuildEmoji emoji, string reason = null) =>
 			emoji == null
 				? throw new ArgumentNullException(nameof(emoji))
 				: emoji.Guild.Id != this.Id
 					? throw new ArgumentException("This emoji does not belong to this guild.")
 					: this.Discord.ApiClient.DeleteGuildEmojiAsync(this.Id, emoji.Id, reason);
 
 		/// <summary>
 		/// Gets all of this guild's custom stickers.
 		/// </summary>
 		/// <returns>All of this guild's custom stickers.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<IReadOnlyList<DiscordSticker>> GetStickersAsync()
 		{
 			var stickers = await this.Discord.ApiClient.GetGuildStickersAsync(this.Id);
 
 			foreach (var xstr in stickers)
 			{
 				this.StickersInternal.AddOrUpdate(xstr.Id, xstr, (id, old) =>
 				{
 					old.Name = xstr.Name;
 					old.Description = xstr.Description;
 					old.InternalTags = xstr.InternalTags;
 					return old;
 				});
 			}
 
 			return stickers;
 		}
 
 		/// <summary>
 		/// Gets a sticker
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the sticker could not be found.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageEmojisAndStickers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		/// <exception cref="System.ArgumentException">Sticker does not belong to a guild.</exception>
 		public Task<DiscordSticker> GetStickerAsync(ulong stickerId)
 			=> this.Discord.ApiClient.GetGuildStickerAsync(this.Id, stickerId);
 
 		/// <summary>
 		/// Creates a sticker
 		/// </summary>
 		/// <param name="name">The name of the sticker.</param>
 		/// <param name="description">The optional description of the sticker.</param>
 		/// <param name="emoji">The emoji to associate the sticker with.</param>
 		/// <param name="format">The file format the sticker is written in.</param>
 		/// <param name="file">The sticker.</param>
 		/// <param name="reason">Audit log reason</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageEmojisAndStickers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordSticker> CreateStickerAsync(string name, string description, DiscordEmoji emoji, Stream file, StickerFormat format, string reason = null)
 		{
 			var fileExt = format switch
 			{
 				StickerFormat.Png => "png",
 				StickerFormat.Apng => "png",
 				StickerFormat.Lottie => "json",
 				_ => throw new InvalidOperationException("This format is not supported.")
 			};
 
 			var contentType = format switch
 			{
 				StickerFormat.Png => "image/png",
 				StickerFormat.Apng => "image/png",
 				StickerFormat.Lottie => "application/json",
 				_ => throw new InvalidOperationException("This format is not supported.")
 			};
 
 			return emoji.Id is not 0
 				? throw new InvalidOperationException("Only unicode emoji can be used for stickers.")
 				: name.Length < 2 || name.Length > 30
 				? throw new ArgumentOutOfRangeException(nameof(name), "Sticker name needs to be between 2 and 30 characters long.")
 				: description.Length < 1 || description.Length > 100
 				? throw new ArgumentOutOfRangeException(nameof(description), "Sticker description needs to be between 1 and 100 characters long.")
 				: this.Discord.ApiClient.CreateGuildStickerAsync(this.Id, name, description, emoji.GetDiscordName().Replace(":", ""), new DiscordMessageFile("sticker", file, null, fileExt, contentType), reason);
 		}
 
 		/// <summary>
 		/// Modifies a sticker
 		/// </summary>
 		/// <param name="sticker">The id of the sticker to modify</param>
 		/// <param name="name">The name of the sticker</param>
 		/// <param name="description">The description of the sticker</param>
 		/// <param name="emoji">The emoji to associate with this sticker.</param>
 		/// <param name="reason">Audit log reason</param>
 		/// <returns>A sticker object</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the sticker could not be found.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageEmojisAndStickers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		/// <exception cref="System.ArgumentException">Sticker does not belong to a guild.</exception>
 		public async Task<DiscordSticker> ModifyStickerAsync(ulong sticker, Optional<string> name, Optional<string> description, Optional<DiscordEmoji> emoji, string reason = null)
 		{
 			if (!this.StickersInternal.TryGetValue(sticker, out var stickerobj) || stickerobj.Guild.Id != this.Id)
 				throw new ArgumentException("This sticker does not belong to this guild.");
 			if (name.HasValue && (name.Value.Length < 2 || name.Value.Length > 30))
 				throw new ArgumentException("Sticker name needs to be between 2 and 30 characters long.");
 			if (description.HasValue && (description.Value.Length < 1 || description.Value.Length > 100))
 				throw new ArgumentException("Sticker description needs to be between 1 and 100 characters long.");
 			if (emoji.HasValue && emoji.Value.Id > 0)
 				throw new ArgumentException("Only unicode emojis can be used with stickers.");
 
 			string uemoji = null;
 			if (emoji.HasValue)
 				uemoji = emoji.Value.GetDiscordName().Replace(":", "");
 
 			var usticker = await this.Discord.ApiClient.ModifyGuildStickerAsync(this.Id, sticker, name, description, uemoji, reason).ConfigureAwait(false);
 
 
 			if (this.StickersInternal.TryGetValue(usticker.Id, out var old))
 				this.StickersInternal.TryUpdate(usticker.Id, usticker, old);
 
 			return usticker;
 		}
 
 		/// <summary>
 		/// Modifies a sticker
 		/// </summary>
 		/// <param name="sticker">The sticker to modify</param>
 		/// <param name="name">The name of the sticker</param>
 		/// <param name="description">The description of the sticker</param>
 		/// <param name="emoji">The emoji to associate with this sticker.</param>
 		/// <param name="reason">Audit log reason</param>
 		/// <returns>A sticker object</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the sticker could not be found.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageEmojisAndStickers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		/// <exception cref="System.ArgumentException">Sticker does not belong to a guild.</exception>
 		public Task<DiscordSticker> ModifyStickerAsync(DiscordSticker sticker, Optional<string> name, Optional<string> description, Optional<DiscordEmoji> emoji, string reason = null)
 			=> this.ModifyStickerAsync(sticker.Id, name, description, emoji, reason);
 
 		/// <summary>
 		/// Deletes a sticker
 		/// </summary>
 		/// <param name="sticker">Id of sticker to delete</param>
 		/// <param name="reason">Audit log reason</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the sticker could not be found.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageEmojisAndStickers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		/// <exception cref="System.ArgumentException">Sticker does not belong to a guild.</exception>
 		public Task DeleteStickerAsync(ulong sticker, string reason = null) =>
 			!this.StickersInternal.TryGetValue(sticker, out var stickerobj)
 				? throw new ArgumentNullException(nameof(sticker))
 				: stickerobj.Guild.Id != this.Id
 					? throw new ArgumentException("This sticker does not belong to this guild.")
 					: this.Discord.ApiClient.DeleteGuildStickerAsync(this.Id, sticker, reason);
 
 		/// <summary>
 		/// Deletes a sticker
 		/// </summary>
 		/// <param name="sticker">Sticker to delete</param>
 		/// <param name="reason">Audit log reason</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the sticker could not be found.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageEmojisAndStickers"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		/// <exception cref="System.ArgumentException">Sticker does not belong to a guild.</exception>
 		public Task DeleteStickerAsync(DiscordSticker sticker, string reason = null)
 			=> this.DeleteStickerAsync(sticker.Id, reason);
 
 		/// <summary>
 		/// <para>Gets the default channel for this guild.</para>
 		/// <para>Default channel is the first channel current member can see.</para>
 		/// </summary>
 		/// <returns>This member's default guild.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public DiscordChannel GetDefaultChannel() =>
 			this.ChannelsInternal?.Values.Where(xc => xc.Type == ChannelType.Text)
-				.OrderBy(xc => xc.Position)
-				.FirstOrDefault(xc => (xc.PermissionsFor(this.CurrentMember) & DisCatSharp.Permissions.AccessChannels) == DisCatSharp.Permissions.AccessChannels);
+				.Where(xc =>
+					(xc.PermissionsFor(this.CurrentMember) & DisCatSharp.Permissions.AccessChannels) ==
+					DisCatSharp.Permissions.AccessChannels)
+				.MinBy(xc => xc.Position);
 
 		/// <summary>
 		/// Gets the guild's widget
 		/// </summary>
 		/// <returns>The guild's widget</returns>
 		public Task<DiscordWidget> GetWidgetAsync()
 			=> this.Discord.ApiClient.GetGuildWidgetAsync(this.Id);
 
 		/// <summary>
 		/// Gets the guild's widget settings
 		/// </summary>
 		/// <returns>The guild's widget settings</returns>
 		public Task<DiscordWidgetSettings> GetWidgetSettingsAsync()
 			=> this.Discord.ApiClient.GetGuildWidgetSettingsAsync(this.Id);
 
 		/// <summary>
 		/// Modifies the guild's widget settings
 		/// </summary>
 		/// <param name="isEnabled">If the widget is enabled or not</param>
 		/// <param name="channel">Widget channel</param>
 		/// <param name="reason">Reason the widget settings were modified</param>
 		/// <returns>The newly modified widget settings</returns>
 		public Task<DiscordWidgetSettings> ModifyWidgetSettingsAsync(bool? isEnabled = null, DiscordChannel channel = null, string reason = null)
 			=> this.Discord.ApiClient.ModifyGuildWidgetSettingsAsync(this.Id, isEnabled, channel?.Id, reason);
 
 		/// <summary>
 		/// Gets all of this guild's templates.
 		/// </summary>
 		/// <returns>All of the guild's templates.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Throws when the client does not have the <see cref="Permissions.ManageGuild"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<IReadOnlyList<DiscordGuildTemplate>> GetTemplatesAsync()
 			=> this.Discord.ApiClient.GetGuildTemplatesAsync(this.Id);
 
 		/// <summary>
 		/// Creates a guild template.
 		/// </summary>
 		/// <param name="name">Name of the template.</param>
 		/// <param name="description">Description of the template.</param>
 		/// <returns>The template created.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Throws when a template already exists for the guild or a null parameter is provided for the name.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Throws when the client does not have the <see cref="Permissions.ManageGuild"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordGuildTemplate> CreateTemplateAsync(string name, string description = null)
 			=> this.Discord.ApiClient.CreateGuildTemplateAsync(this.Id, name, description);
 
 		/// <summary>
 		/// Syncs the template to the current guild's state.
 		/// </summary>
 		/// <param name="code">The code of the template to sync.</param>
 		/// <returns>The template synced.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Throws when the template for the code cannot be found</exception>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Throws when the client does not have the <see cref="Permissions.ManageGuild"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordGuildTemplate> SyncTemplateAsync(string code)
 			=> this.Discord.ApiClient.SyncGuildTemplateAsync(this.Id, code);
 
 		/// <summary>
 		/// Modifies the template's metadata.
 		/// </summary>
 		/// <param name="code">The template's code.</param>
 		/// <param name="name">Name of the template.</param>
 		/// <param name="description">Description of the template.</param>
 		/// <returns>The template modified.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Throws when the template for the code cannot be found</exception>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Throws when the client does not have the <see cref="Permissions.ManageGuild"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordGuildTemplate> ModifyTemplateAsync(string code, string name = null, string description = null)
 			=> this.Discord.ApiClient.ModifyGuildTemplateAsync(this.Id, code, name, description);
 
 		/// <summary>
 		/// Deletes the template.
 		/// </summary>
 		/// <param name="code">The code of the template to delete.</param>
 		/// <returns>The deleted template.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Throws when the template for the code cannot be found</exception>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Throws when the client does not have the <see cref="Permissions.ManageGuild"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordGuildTemplate> DeleteTemplateAsync(string code)
 			=> this.Discord.ApiClient.DeleteGuildTemplateAsync(this.Id, code);
 
 		/// <summary>
 		/// Gets this guild's membership screening form.
 		/// </summary>
 		/// <returns>This guild's membership screening form.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordGuildMembershipScreening> GetMembershipScreeningFormAsync()
 			=> this.Discord.ApiClient.GetGuildMembershipScreeningFormAsync(this.Id);
 
 		/// <summary>
 		/// Modifies this guild's membership screening form.
 		/// </summary>
 		/// <param name="action">Action to perform</param>
 		/// <returns>The modified screening form.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client doesn't have the <see cref="Permissions.ManageGuild"/> permission, or community is not enabled on this guild.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordGuildMembershipScreening> ModifyMembershipScreeningFormAsync(Action<MembershipScreeningEditModel> action)
 		{
 			var mdl = new MembershipScreeningEditModel();
 			action(mdl);
 			return await this.Discord.ApiClient.ModifyGuildMembershipScreeningFormAsync(this.Id, mdl.Enabled, mdl.Fields, mdl.Description);
 		}
 
 		/// <summary>
 		/// Gets all the application commands in this guild.
 		/// </summary>
 		/// <returns>A list of application commands in this guild.</returns>
 		public Task<IReadOnlyList<DiscordApplicationCommand>> GetApplicationCommandsAsync() =>
 			this.Discord.ApiClient.GetGuildApplicationCommandsAsync(this.Discord.CurrentApplication.Id, this.Id);
 
 		/// <summary>
 		/// Overwrites the existing application commands in this guild. New commands are automatically created and missing commands are automatically delete
 		/// </summary>
 		/// <param name="commands">The list of commands to overwrite with.</param>
 		/// <returns>The list of guild commands</returns>
 		public Task<IReadOnlyList<DiscordApplicationCommand>> BulkOverwriteApplicationCommandsAsync(IEnumerable<DiscordApplicationCommand> commands) =>
 			this.Discord.ApiClient.BulkOverwriteGuildApplicationCommandsAsync(this.Discord.CurrentApplication.Id, this.Id, commands);
 
 		/// <summary>
 		/// Creates or overwrites a application command in this guild.
 		/// </summary>
 		/// <param name="command">The command to create.</param>
 		/// <returns>The created command.</returns>
 		public Task<DiscordApplicationCommand> CreateApplicationCommandAsync(DiscordApplicationCommand command) =>
 			this.Discord.ApiClient.CreateGuildApplicationCommandAsync(this.Discord.CurrentApplication.Id, this.Id, command);
 
 		/// <summary>
 		/// Edits a application command in this guild.
 		/// </summary>
 		/// <param name="commandId">The id of the command to edit.</param>
 		/// <param name="action">Action to perform.</param>
 		/// <returns>The edit command.</returns>
 		public async Task<DiscordApplicationCommand> EditApplicationCommandAsync(ulong commandId, Action<ApplicationCommandEditModel> action)
 		{
 			var mdl = new ApplicationCommandEditModel();
 			action(mdl);
 			return await this.Discord.ApiClient.EditGuildApplicationCommandAsync(this.Discord.CurrentApplication.Id, this.Id, commandId, mdl.Name, mdl.Description, mdl.Options, mdl.NameLocalizations, mdl.DescriptionLocalizations, mdl.DefaultMemberPermissions, mdl.DmPermission).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Gets this guild's welcome screen.
 		/// </summary>
 		/// <returns>This guild's welcome screen object.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordGuildWelcomeScreen> GetWelcomeScreenAsync() =>
 			this.Discord.ApiClient.GetGuildWelcomeScreenAsync(this.Id);
 
 		/// <summary>
 		/// Modifies this guild's welcome screen.
 		/// </summary>
 		/// <param name="action">Action to perform.</param>
 		/// <returns>The modified welcome screen.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client doesn't have the <see cref="Permissions.ManageGuild"/> permission, or community is not enabled on this guild.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordGuildWelcomeScreen> ModifyWelcomeScreenAsync(Action<WelcomeScreenEditModel> action)
 		{
 			var mdl = new WelcomeScreenEditModel();
 			action(mdl);
 			return await this.Discord.ApiClient.ModifyGuildWelcomeScreenAsync(this.Id, mdl.Enabled, mdl.WelcomeChannels, mdl.Description).ConfigureAwait(false);
 		}
 		#endregion
 
 		/// <summary>
 		/// Returns a string representation of this guild.
 		/// </summary>
 		/// <returns>String representation of this guild.</returns>
 		public override string ToString()
 			=> $"Guild {this.Id}; {this.Name}";
 
 		/// <summary>
 		/// Checks whether this <see cref="DiscordGuild"/> is equal to another object.
 		/// </summary>
 		/// <param name="obj">Object to compare to.</param>
 		/// <returns>Whether the object is equal to this <see cref="DiscordGuild"/>.</returns>
 		public override bool Equals(object obj)
 			=> this.Equals(obj as DiscordGuild);
 
 		/// <summary>
 		/// Checks whether this <see cref="DiscordGuild"/> is equal to another <see cref="DiscordGuild"/>.
 		/// </summary>
 		/// <param name="e"><see cref="DiscordGuild"/> to compare to.</param>
 		/// <returns>Whether the <see cref="DiscordGuild"/> is equal to this <see cref="DiscordGuild"/>.</returns>
 		public bool Equals(DiscordGuild e)
 			=> e is not null && (ReferenceEquals(this, e) || this.Id == e.Id);
 
 		/// <summary>
 		/// Gets the hash code for this <see cref="DiscordGuild"/>.
 		/// </summary>
 		/// <returns>The hash code for this <see cref="DiscordGuild"/>.</returns>
 		public override int GetHashCode()
 			=> this.Id.GetHashCode();
 
 		/// <summary>
 		/// Gets whether the two <see cref="DiscordGuild"/> objects are equal.
 		/// </summary>
 		/// <param name="e1">First guild to compare.</param>
 		/// <param name="e2">Second guild to compare.</param>
 		/// <returns>Whether the two guilds are equal.</returns>
 		public static bool operator ==(DiscordGuild e1, DiscordGuild e2)
 		{
 			var o1 = e1 as object;
 			var o2 = e2 as object;
 
 			return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || e1.Id == e2.Id);
 		}
 
 		/// <summary>
 		/// Gets whether the two <see cref="DiscordGuild"/> objects are not equal.
 		/// </summary>
 		/// <param name="e1">First guild to compare.</param>
 		/// <param name="e2">Second guild to compare.</param>
 		/// <returns>Whether the two guilds are not equal.</returns>
 		public static bool operator !=(DiscordGuild e1, DiscordGuild e2)
 			=> !(e1 == e2);
 
 	}
 
 	/// <summary>
 	/// Represents guild verification level.
 	/// </summary>
 	public enum VerificationLevel : int
 	{
 		/// <summary>
 		/// No verification. Anyone can join and chat right away.
 		/// </summary>
 		None = 0,
 
 		/// <summary>
 		/// Low verification level. Users are required to have a verified email attached to their account in order to be able to chat.
 		/// </summary>
 		Low = 1,
 
 		/// <summary>
 		/// Medium verification level. Users are required to have a verified email attached to their account, and account age need to be at least 5 minutes in order to be able to chat.
 		/// </summary>
 		Medium = 2,
 
 		/// <summary>
 		/// High verification level. Users are required to have a verified email attached to their account, account age need to be at least 5 minutes, and they need to be in the server for at least 10 minutes in order to be able to chat.
 		/// </summary>
 		High = 3,
 
 		/// <summary>
 		/// Highest verification level. Users are required to have a verified phone number attached to their account.
 		/// </summary>
 		Highest = 4
 	}
 
 	/// <summary>
 	/// Represents default notification level for a guild.
 	/// </summary>
 	public enum DefaultMessageNotifications : int
 	{
 		/// <summary>
 		/// All messages will trigger push notifications.
 		/// </summary>
 		AllMessages = 0,
 
 		/// <summary>
 		/// Only messages that mention the user (or a role he's in) will trigger push notifications.
 		/// </summary>
 		MentionsOnly = 1
 	}
 
 	/// <summary>
 	/// Represents multi-factor authentication level required by a guild to use administrator functionality.
 	/// </summary>
 	public enum MfaLevel : int
 	{
 		/// <summary>
 		/// Multi-factor authentication is not required to use administrator functionality.
 		/// </summary>
 		Disabled = 0,
 
 		/// <summary>
 		/// Multi-factor authentication is required to use administrator functionality.
 		/// </summary>
 		Enabled = 1
 	}
 
 	/// <summary>
 	/// Represents the value of explicit content filter in a guild.
 	/// </summary>
 	public enum ExplicitContentFilter : int
 	{
 		/// <summary>
 		/// Explicit content filter is disabled.
 		/// </summary>
 		Disabled = 0,
 
 		/// <summary>
 		/// Only messages from members without any roles are scanned.
 		/// </summary>
 		MembersWithoutRoles = 1,
 
 		/// <summary>
 		/// Messages from all members are scanned.
 		/// </summary>
 		AllMembers = 2
 	}
 
 	/// <summary>
 	/// Represents the formats for a guild widget.
 	/// </summary>
 	public enum WidgetType : int
 	{
 		/// <summary>
 		/// The widget is represented in shield format.
 		/// <para>This is the default widget type.</para>
 		/// </summary>
 		Shield = 0,
 
 		/// <summary>
 		/// The widget is represented as the first banner type.
 		/// </summary>
 		Banner1 = 1,
 
 		/// <summary>
 		/// The widget is represented as the second banner type.
 		/// </summary>
 		Banner2 = 2,
 
 		/// <summary>
 		/// The widget is represented as the third banner type.
 		/// </summary>
 		Banner3 = 3,
 
 		/// <summary>
 		/// The widget is represented in the fourth banner type.
 		/// </summary>
 		Banner4 = 4
 	}
 }
diff --git a/DisCatSharp/Entities/Guild/DiscordGuildMembershipScreeningField.cs b/DisCatSharp/Entities/Guild/DiscordGuildMembershipScreeningField.cs
index 00f743bc9..8de6c999b 100644
--- a/DisCatSharp/Entities/Guild/DiscordGuildMembershipScreeningField.cs
+++ b/DisCatSharp/Entities/Guild/DiscordGuildMembershipScreeningField.cs
@@ -1,79 +1,79 @@
 // 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.Collections.Generic;
 using System.Linq;
 
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Entities
 {
 	/// <summary>
 	/// Represents a field in a guild's membership screening form
 	/// </summary>
 	public class DiscordGuildMembershipScreeningField
 	{
 		/// <summary>
 		/// Gets the type of the field.
 		/// </summary>
 		[JsonProperty("field_type", NullValueHandling = NullValueHandling.Ignore)]
 		public MembershipScreeningFieldType Type { get; internal set; }
 
 		/// <summary>
 		/// Gets the title of the field.
 		/// </summary>
 		[JsonProperty("label", NullValueHandling = NullValueHandling.Ignore)]
 		public string Label { get; internal set; }
 
 		/// <summary>
 		/// Gets the list of rules
 		/// </summary>
 		[JsonProperty("values", NullValueHandling = NullValueHandling.Ignore)]
 		public IReadOnlyList<string> Values { get; internal set; }
 
 		/// <summary>
 		/// Gets whether the user has to fill out this field
 		/// </summary>
 		[JsonProperty("required", NullValueHandling = NullValueHandling.Ignore)]
 		public bool IsRequired { get; internal set; }
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordGuildMembershipScreeningField"/> class.
 		/// </summary>
 		/// <param name="type">The type.</param>
 		/// <param name="label">The label.</param>
 		/// <param name="values">The values.</param>
 		/// <param name="required">If true, required.</param>
 		public DiscordGuildMembershipScreeningField(MembershipScreeningFieldType type, string label, IEnumerable<string> values, bool required = true)
 		{
 			this.Type = type;
 			this.Label = label;
-			this.Values = values.ToList();
+			this.Values = values.ToArray();
 			this.IsRequired = required;
 		}
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordGuildMembershipScreeningField"/> class.
 		/// </summary>
 		internal DiscordGuildMembershipScreeningField() { }
 	}
 }
diff --git a/DisCatSharp/Entities/Guild/DiscordMember.cs b/DisCatSharp/Entities/Guild/DiscordMember.cs
index 6e5278253..26669286e 100644
--- a/DisCatSharp/Entities/Guild/DiscordMember.cs
+++ b/DisCatSharp/Entities/Guild/DiscordMember.cs
@@ -1,785 +1,785 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 
 using DisCatSharp.Enums;
 using DisCatSharp.Net;
 using DisCatSharp.Net.Abstractions;
 using DisCatSharp.Net.Models;
 
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Entities
 {
 	/// <summary>
 	/// Represents a Discord guild member.
 	/// </summary>
 	public class DiscordMember : DiscordUser, IEquatable<DiscordMember>
 	{
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordMember"/> class.
 		/// </summary>
 		internal DiscordMember()
 		{
-			this._roleIdsLazy = new Lazy<IReadOnlyList<ulong>>(() => new ReadOnlyCollection<ulong>(this.RoleIdsInternal));
+			this._roleIdsLazy = new Lazy<IReadOnlyList<ulong>>(() => this.RoleIdsInternal);
 		}
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordMember"/> class.
 		/// </summary>
 		/// <param name="user">The user.</param>
 		internal DiscordMember(DiscordUser user)
 		{
 			this.Discord = user.Discord;
 
 			this.Id = user.Id;
 
 			this.RoleIdsInternal = new List<ulong>();
-			this._roleIdsLazy = new Lazy<IReadOnlyList<ulong>>(() => new ReadOnlyCollection<ulong>(this.RoleIdsInternal));
+			this._roleIdsLazy = new Lazy<IReadOnlyList<ulong>>(() => this.RoleIdsInternal);
 		}
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordMember"/> class.
 		/// </summary>
 		/// <param name="mbr">The mbr.</param>
 		internal DiscordMember(TransportMember mbr)
 		{
 			this.Id = mbr.User.Id;
 			this.IsDeafened = mbr.IsDeafened;
 			this.IsMuted = mbr.IsMuted;
 			this.JoinedAt = mbr.JoinedAt;
 			this.Nickname = mbr.Nickname;
 			this.PremiumSince = mbr.PremiumSince;
 			this.IsPending = mbr.IsPending;
 			this.GuildAvatarHash = mbr.GuildAvatarHash;
 			this.GuildBannerHash = mbr.GuildBannerHash;
 			this.GuildBio = mbr.GuildBio;
 			this.CommunicationDisabledUntil = mbr.CommunicationDisabledUntil;
 			this.AvatarHashInternal = mbr.AvatarHash;
 			this.RoleIdsInternal = mbr.Roles ?? new List<ulong>();
-			this._roleIdsLazy = new Lazy<IReadOnlyList<ulong>>(() => new ReadOnlyCollection<ulong>(this.RoleIdsInternal));
+			this._roleIdsLazy = new Lazy<IReadOnlyList<ulong>>(() => this.RoleIdsInternal);
 			this.MemberFlags = mbr.MemberFlags;
 		}
 
 		/// <summary>
 		/// Gets the members avatar hash.
 		/// </summary>
 		[JsonProperty("avatar", NullValueHandling = NullValueHandling.Ignore)]
 		public virtual string GuildAvatarHash { get; internal set; }
 
 		/// <summary>
 		/// Gets the members avatar URL.
 		/// </summary>
 		[JsonIgnore]
 		public string GuildAvatarUrl
 			=> string.IsNullOrWhiteSpace(this.GuildAvatarHash) ? this.User.AvatarUrl : $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.GUILDS}/{this.GuildId.ToString(CultureInfo.InvariantCulture)}{Endpoints.USERS}/{this.Id.ToString(CultureInfo.InvariantCulture)}{Endpoints.AVATARS}/{this.GuildAvatarHash}.{(this.GuildAvatarHash.StartsWith("a_") ? "gif" : "png")}?size=1024";
 
 		/// <summary>
 		/// Gets the members banner hash.
 		/// </summary>
 		[JsonProperty("banner", NullValueHandling = NullValueHandling.Ignore)]
 		public virtual string GuildBannerHash { get; internal set; }
 
 		/// <summary>
 		/// Gets the members banner URL.
 		/// </summary>
 		[JsonIgnore]
 		public string GuildBannerUrl
 			=> string.IsNullOrWhiteSpace(this.GuildBannerHash) ? this.User.BannerUrl : $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.GUILDS}/{this.GuildId.ToString(CultureInfo.InvariantCulture)}{Endpoints.USERS}/{this.Id.ToString(CultureInfo.InvariantCulture)}{Endpoints.BANNERS}/{this.GuildBannerHash}.{(this.GuildBannerHash.StartsWith("a_") ? "gif" : "png")}?size=1024";
 
 		/// <summary>
 		/// The color of this member's banner. Mutually exclusive with <see cref="GuildBannerHash"/>.
 		/// </summary>
 		[JsonIgnore]
 		public override DiscordColor? BannerColor => this.User.BannerColor;
 
 		/// <summary>
 		/// Gets this member's nickname.
 		/// </summary>
 		[JsonProperty("nick", NullValueHandling = NullValueHandling.Ignore)]
 		public string Nickname { get; internal set; }
 
 		/// <summary>
 		/// Gets the members guild bio.
 		/// This is not available to bots tho.
 		/// </summary>
 		[JsonProperty("bio", NullValueHandling = NullValueHandling.Ignore)]
 		public string GuildBio { get; internal set; }
 
 		/// <summary>
 		/// Gets the members flags.
 		/// </summary>
 		[JsonProperty("flags", NullValueHandling = NullValueHandling.Ignore)]
 		public MemberFlags MemberFlags { get; internal set; }
 
 		[JsonIgnore]
 		internal string AvatarHashInternal;
 
 		/// <summary>
 		/// Gets this member's display name.
 		/// </summary>
 		[JsonIgnore]
 		public string DisplayName
 			=> this.Nickname ?? this.Username;
 
 		/// <summary>
 		/// List of role ids
 		/// </summary>
 		[JsonIgnore]
 		internal IReadOnlyList<ulong> RoleIds
 			=> this._roleIdsLazy.Value;
 
 		[JsonProperty("roles", NullValueHandling = NullValueHandling.Ignore)]
 		internal List<ulong> RoleIdsInternal;
 		[JsonIgnore]
 		private readonly Lazy<IReadOnlyList<ulong>> _roleIdsLazy;
 
 		/// <summary>
 		/// Gets the list of roles associated with this member.
 		/// </summary>
 		[JsonIgnore]
 		public IEnumerable<DiscordRole> Roles
 			=> this.RoleIds.Select(id => this.Guild.GetRole(id)).Where(x => x != null);
 
 		/// <summary>
 		/// Gets the color associated with this user's top color-giving role, otherwise 0 (no color).
 		/// </summary>
 		[JsonIgnore]
 		public DiscordColor Color
 		{
 			get
 			{
-				var role = this.Roles.OrderByDescending(xr => xr.Position).FirstOrDefault(xr => xr.Color.Value != 0);
+				var role = this.Roles.Where(xr => xr.Color.Value != 0).MaxBy(xr => xr.Position);
 				return role != null ? role.Color : new DiscordColor();
 			}
 		}
 
 		/// <summary>
 		/// Date the user joined the guild
 		/// </summary>
 		[JsonProperty("joined_at", NullValueHandling = NullValueHandling.Ignore)]
 		public DateTimeOffset JoinedAt { get; internal set; }
 
 		/// <summary>
 		/// Date the user started boosting this server
 		/// </summary>
 		[JsonProperty("premium_since", NullValueHandling = NullValueHandling.Ignore)]
 		public DateTimeOffset? PremiumSince { get; internal set; }
 
 		/// <summary>
 		/// Date until the can communicate again.
 		/// </summary>
 		[JsonProperty("communication_disabled_until", NullValueHandling = NullValueHandling.Include)]
 		public DateTime? CommunicationDisabledUntil { get; internal set; }
 
 		/// <summary>
 		/// If the user is deafened
 		/// </summary>
 		[JsonProperty("is_deafened", NullValueHandling = NullValueHandling.Ignore)]
 		public bool IsDeafened { get; internal set; }
 
 		/// <summary>
 		/// If the user is muted
 		/// </summary>
 		[JsonProperty("is_muted", NullValueHandling = NullValueHandling.Ignore)]
 		public bool IsMuted { get; internal set; }
 
 		/// <summary>
 		/// Whether the user has not passed the guild's Membership Screening requirements yet.
 		/// </summary>
 		[JsonProperty("pending", NullValueHandling = NullValueHandling.Ignore)]
 		public bool? IsPending { get; internal set; }
 
 		/// <summary>
 		/// Gets this member's voice state.
 		/// </summary>
 		[JsonIgnore]
 		public DiscordVoiceState VoiceState
 			=> this.Discord.Guilds[this.GuildId].VoiceStates.TryGetValue(this.Id, out var voiceState) ? voiceState : null;
 
 		[JsonIgnore]
 		internal ulong GuildId = 0;
 
 		/// <summary>
 		/// Gets the guild of which this member is a part of.
 		/// </summary>
 		[JsonIgnore]
 		public DiscordGuild Guild
 			=> this.Discord.Guilds[this.GuildId];
 
 		/// <summary>
 		/// Gets whether this member is the Guild owner.
 		/// </summary>
 		[JsonIgnore]
 		public bool IsOwner
 			=> this.Id == this.Guild.OwnerId;
 
 		/// <summary>
 		/// Gets the member's position in the role hierarchy, which is the member's highest role's position. Returns <see cref="int.MaxValue"/> for the guild's owner.
 		/// </summary>
 		[JsonIgnore]
 		public int Hierarchy
 			=> this.IsOwner ? int.MaxValue : this.RoleIds.Count == 0 ? 0 : this.Roles.Max(x => x.Position);
 
 		/// <summary>
 		/// Gets the permissions for the current member.
 		/// </summary>
 		[JsonIgnore]
 		public Permissions Permissions => this.GetPermissions();
 
 		#region Overridden user properties
 
 		/// <summary>
 		/// Gets the user.
 		/// </summary>
 		[JsonIgnore]
 		internal DiscordUser User
 			=> this.Discord.UserCache[this.Id];
 
 		/// <summary>
 		/// Gets this member's username.
 		/// </summary>
 		[JsonIgnore]
 		public override string Username
 		{
 			get => this.User.Username;
 			internal set => this.User.Username = value;
 		}
 
 		/// <summary>
 		/// Gets the member's 4-digit discriminator.
 		/// </summary>
 		[JsonIgnore]
 		public override string Discriminator
 		{
 			get => this.User.Discriminator;
 			internal set => this.User.Discriminator = value;
 		}
 
 		/// <summary>
 		/// Gets the member's avatar hash.
 		/// </summary>
 		[JsonIgnore]
 		public override string AvatarHash
 		{
 			get => this.User.AvatarHash;
 			internal set => this.User.AvatarHash = value;
 		}
 
 		/// <summary>
 		/// Gets the member's banner hash.
 		/// </summary>
 		[JsonIgnore]
 		public override string BannerHash
 		{
 			get => this.User.BannerHash;
 			internal set => this.User.BannerHash = value;
 		}
 
 		/// <summary>
 		/// Gets whether the member is a bot.
 		/// </summary>
 		[JsonIgnore]
 		public override bool IsBot
 		{
 			get => this.User.IsBot;
 			internal set => this.User.IsBot = value;
 		}
 
 		/// <summary>
 		/// Gets the member's email address.
 		/// <para>This is only present in OAuth.</para>
 		/// </summary>
 		[JsonIgnore]
 		public override string Email
 		{
 			get => this.User.Email;
 			internal set => this.User.Email = value;
 		}
 
 		/// <summary>
 		/// Gets whether the member has multi-factor authentication enabled.
 		/// </summary>
 		[JsonIgnore]
 		public override bool? MfaEnabled
 		{
 			get => this.User.MfaEnabled;
 			internal set => this.User.MfaEnabled = value;
 		}
 
 		/// <summary>
 		/// Gets whether the member is verified.
 		/// <para>This is only present in OAuth.</para>
 		/// </summary>
 		[JsonIgnore]
 		public override bool? Verified
 		{
 			get => this.User.Verified;
 			internal set => this.User.Verified = value;
 		}
 
 		/// <summary>
 		/// Gets the member's chosen language
 		/// </summary>
 		[JsonIgnore]
 		public override string Locale
 		{
 			get => this.User.Locale;
 			internal set => this.User.Locale = value;
 		}
 
 		/// <summary>
 		/// Gets the user's flags.
 		/// </summary>
 		[JsonIgnore]
 		public override UserFlags? OAuthFlags
 		{
 			get => this.User.OAuthFlags;
 			internal set => this.User.OAuthFlags = value;
 		}
 
 		/// <summary>
 		/// Gets the member's flags for OAuth.
 		/// </summary>
 		[JsonIgnore]
 		public override UserFlags? Flags
 		{
 			get => this.User.Flags;
 			internal set => this.User.Flags = value;
 		}
 
 		#endregion
 
 		/// <summary>
 		/// Creates a direct message channel to this member.
 		/// </summary>
 		/// <returns>Direct message channel to this member.</returns>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the member has the bot blocked, the member is no longer in the guild, or if the member has Allow DM from server members off.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordDmChannel> CreateDmChannelAsync()
 			=> this.Discord.ApiClient.CreateDmAsync(this.Id);
 
 		/// <summary>
 		/// Sends a direct message to this member. Creates a direct message channel if one does not exist already.
 		/// </summary>
 		/// <param name="content">Content of the message to send.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the member has the bot blocked, the member is no longer in the guild, or if the member has Allow DM from server members off.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordMessage> SendMessageAsync(string content)
 		{
 			if (this.IsBot && this.Discord.CurrentUser.IsBot)
 				throw new ArgumentException("Bots cannot DM each other.");
 
 			var chn = await this.CreateDmChannelAsync().ConfigureAwait(false);
 			return await chn.SendMessageAsync(content).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Sends a direct message to this member. Creates a direct message channel if one does not exist already.
 		/// </summary>
 		/// <param name="embed">Embed to attach to the message.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the member has the bot blocked, the member is no longer in the guild, or if the member has Allow DM from server members off.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordMessage> SendMessageAsync(DiscordEmbed embed)
 		{
 			if (this.IsBot && this.Discord.CurrentUser.IsBot)
 				throw new ArgumentException("Bots cannot DM each other.");
 
 			var chn = await this.CreateDmChannelAsync().ConfigureAwait(false);
 			return await chn.SendMessageAsync(embed).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Sends a direct message to this member. Creates a direct message channel if one does not exist already.
 		/// </summary>
 		/// <param name="content">Content of the message to send.</param>
 		/// <param name="embed">Embed to attach to the message.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the member has the bot blocked, the member is no longer in the guild, or if the member has Allow DM from server members off.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordMessage> SendMessageAsync(string content, DiscordEmbed embed)
 		{
 			if (this.IsBot && this.Discord.CurrentUser.IsBot)
 				throw new ArgumentException("Bots cannot DM each other.");
 
 			var chn = await this.CreateDmChannelAsync().ConfigureAwait(false);
 			return await chn.SendMessageAsync(content, embed).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Sends a direct message to this member. Creates a direct message channel if one does not exist already.
 		/// </summary>
 		/// <param name="message">Builder to with the message.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the member has the bot blocked, the member is no longer in the guild, or if the member has Allow DM from server members off.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordMessage> SendMessageAsync(DiscordMessageBuilder message)
 		{
 			if (this.IsBot && this.Discord.CurrentUser.IsBot)
 				throw new ArgumentException("Bots cannot DM each other.");
 
 			var chn = await this.CreateDmChannelAsync().ConfigureAwait(false);
 			return await chn.SendMessageAsync(message).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Sets this member's voice mute status.
 		/// </summary>
 		/// <param name="mute">Whether the member is to be muted.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.MuteMembers"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task SetMuteAsync(bool mute, string reason = null)
 			=> this.Discord.ApiClient.ModifyGuildMemberAsync(this.GuildId, this.Id, default, default, mute, default, default, reason);
 
 		/// <summary>
 		/// Sets this member's voice deaf status.
 		/// </summary>
 		/// <param name="deaf">Whether the member is to be deafened.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.DeafenMembers"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task SetDeafAsync(bool deaf, string reason = null)
 			=> this.Discord.ApiClient.ModifyGuildMemberAsync(this.GuildId, this.Id, default, default, default, deaf, default, reason);
 
 		/// <summary>
 		/// Modifies this member.
 		/// </summary>
 		/// <param name="action">Action to perform on this member.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageNicknames"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task ModifyAsync(Action<MemberEditModel> action)
 		{
 			var mdl = new MemberEditModel();
 			action(mdl);
 
 			if (mdl.VoiceChannel.HasValue && mdl.VoiceChannel.Value != null && mdl.VoiceChannel.Value.Type != ChannelType.Voice && mdl.VoiceChannel.Value.Type != ChannelType.Stage)
 				throw new ArgumentException("Given channel is not a voice or stage channel.", nameof(mdl.VoiceChannel));
 
 			if (mdl.Nickname.HasValue && this.Discord.CurrentUser.Id == this.Id)
 			{
 				await this.Discord.ApiClient.ModifyCurrentMemberNicknameAsync(this.Guild.Id, mdl.Nickname.Value,
 					mdl.AuditLogReason).ConfigureAwait(false);
 
 				await this.Discord.ApiClient.ModifyGuildMemberAsync(this.Guild.Id, this.Id, Optional.None,
 					mdl.Roles.Map(e => e.Select(xr => xr.Id)), mdl.Muted, mdl.Deafened,
 					mdl.VoiceChannel.Map(e => e?.Id), mdl.AuditLogReason).ConfigureAwait(false);
 			}
 			else
 			{
 				await this.Discord.ApiClient.ModifyGuildMemberAsync(this.Guild.Id, this.Id, mdl.Nickname,
 					mdl.Roles.Map(e => e.Select(xr => xr.Id)), mdl.Muted, mdl.Deafened,
 					mdl.VoiceChannel.Map(e => e?.Id), mdl.AuditLogReason).ConfigureAwait(false);
 			}
 		}
 
 		/// <summary>
 		/// Adds a timeout to a member.
 		/// </summary>
 		/// <param name="until">The datetime offset to time out the user. Up to 28 days.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ModerateMembers"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task TimeoutAsync(DateTimeOffset until, string reason = null)
 			=> until.Subtract(DateTimeOffset.UtcNow).Days > 28 ? throw new ArgumentException("Timeout can not be longer than 28 days") : this.Discord.ApiClient.ModifyTimeoutAsync(this.Guild.Id, this.Id, until, reason);
 
 		/// <summary>
 		/// Adds a timeout to a member.
 		/// </summary>
 		/// <param name="until">The timespan to time out the user. Up to 28 days.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ModerateMembers"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task TimeoutAsync(TimeSpan until, string reason = null)
 			=> this.TimeoutAsync(DateTimeOffset.UtcNow + until, reason);
 
 		/// <summary>
 		/// Adds a timeout to a member.
 		/// </summary>
 		/// <param name="until">The datetime to time out the user. Up to 28 days.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ModerateMembers"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task TimeoutAsync(DateTime until, string reason = null)
 			=> this.TimeoutAsync(until.ToUniversalTime() - DateTime.UtcNow, reason);
 
 		/// <summary>
 		/// Removes the timeout from a member.
 		/// </summary>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ModerateMembers"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task RemoveTimeoutAsync(string reason = null) => this.Discord.ApiClient.ModifyTimeoutAsync(this.Guild.Id, this.Id, null, reason);
 
 		/// <summary>
 		/// Grants a role to the member.
 		/// </summary>
 		/// <param name="role">Role to grant.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageRoles"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task GrantRoleAsync(DiscordRole role, string reason = null)
 			=> this.Discord.ApiClient.AddGuildMemberRoleAsync(this.Guild.Id, this.Id, role.Id, reason);
 
 		/// <summary>
 		/// Revokes a role from a member.
 		/// </summary>
 		/// <param name="role">Role to revoke.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageRoles"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task RevokeRoleAsync(DiscordRole role, string reason = null)
 			=> this.Discord.ApiClient.RemoveGuildMemberRoleAsync(this.Guild.Id, this.Id, role.Id, reason);
 
 		/// <summary>
 		/// Sets the member's roles to ones specified.
 		/// </summary>
 		/// <param name="roles">Roles to set.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageRoles"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task ReplaceRolesAsync(IEnumerable<DiscordRole> roles, string reason = null)
 			=> this.Discord.ApiClient.ModifyGuildMemberAsync(this.Guild.Id, this.Id, default,
 				Optional.Some(roles.Select(xr => xr.Id)), default, default, default, reason);
 
 		/// <summary>
 		/// Bans this member from their guild.
 		/// </summary>
 		/// <param name="deleteMessageDays">How many days to remove messages from.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.BanMembers"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task BanAsync(int deleteMessageDays = 0, string reason = null)
 			=> this.Guild.BanMemberAsync(this, deleteMessageDays, reason);
 
 		/// <summary>
 		/// Unbans this member from their guild.
 		/// </summary>
 		/// <exception cref = "Exceptions.UnauthorizedException" > Thrown when the client does not have the<see cref="Permissions.BanMembers"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task UnbanAsync(string reason = null) => this.Guild.UnbanMemberAsync(this, reason);
 
 		/// <summary>
 		/// Kicks this member from their guild.
 		/// </summary>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <returns></returns>
 		/// <remarks>[alias="KickAsync"]</remarks>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.KickMembers"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task RemoveAsync(string reason = null)
 			=> this.Discord.ApiClient.RemoveGuildMemberAsync(this.GuildId, this.Id, reason);
 
 		/// <summary>
 		/// Moves this member to the specified voice channel
 		/// </summary>
 		/// <param name="channel"></param>
 
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.MoveMembers"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task PlaceInAsync(DiscordChannel channel)
 			=> channel.PlaceMemberAsync(this);
 
 		/// <summary>
 		/// Updates the member's suppress state in a stage channel.
 		/// </summary>
 		/// <param name="channel">The channel the member is currently in.</param>
 		/// <param name="suppress">Toggles the member's suppress state.</param>
 		/// <exception cref="System.ArgumentException">Thrown when the channel in not a voice channel.</exception>
 		public async Task UpdateVoiceStateAsync(DiscordChannel channel, bool? suppress)
 		{
 			if (channel.Type != ChannelType.Stage)
 				throw new ArgumentException("Voice state can only be updated in a stage channel.");
 
 			await this.Discord.ApiClient.UpdateUserVoiceStateAsync(this.Guild.Id, this.Id, channel.Id, suppress).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Makes the user a speaker.
 		/// </summary>
 		/// <exception cref="System.ArgumentException">Thrown when the user is not inside an stage channel.</exception>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.MuteMembers"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task MakeSpeakerAsync()
 		{
 			var vs = this.VoiceState;
 			if (vs == null || vs.Channel.Type != ChannelType.Stage)
 				throw new ArgumentException("Voice state can only be updated when the user is inside an stage channel.");
 
 			await this.Discord.ApiClient.UpdateUserVoiceStateAsync(this.Guild.Id, this.Id, vs.Channel.Id, false).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Moves the user to audience.
 		/// </summary>
 		/// <exception cref="System.ArgumentException">Thrown when the user is not inside an stage channel.</exception>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.MuteMembers"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task MoveToAudienceAsync()
 		{
 			var vs = this.VoiceState;
 			if (vs == null || vs.Channel.Type != ChannelType.Stage)
 				throw new ArgumentException("Voice state can only be updated when the user is inside an stage channel.");
 
 			await this.Discord.ApiClient.UpdateUserVoiceStateAsync(this.Guild.Id, this.Id, vs.Channel.Id, true).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Calculates permissions in a given channel for this member.
 		/// </summary>
 		/// <param name="channel">Channel to calculate permissions for.</param>
 		/// <returns>Calculated permissions for this member in the channel.</returns>
 		public Permissions PermissionsIn(DiscordChannel channel)
 			=> channel.PermissionsFor(this);
 
 		/// <summary>
 		/// Get's the current member's roles based on the sum of the permissions of their given roles.
 		/// </summary>
 		private Permissions GetPermissions()
 		{
 			if (this.Guild.OwnerId == this.Id)
 				return PermissionMethods.FullPerms;
 
 			Permissions perms;
 
 			// assign @everyone permissions
 			var everyoneRole = this.Guild.EveryoneRole;
 			perms = everyoneRole.Permissions;
 
 			// assign permissions from member's roles (in order)
 			perms |= this.Roles.Aggregate(Permissions.None, (c, role) => c | role.Permissions);
 
 			// Administrator grants all permissions and cannot be overridden
 			return (perms & Permissions.Administrator) == Permissions.Administrator ? PermissionMethods.FullPerms : perms;
 		}
 
 		/// <summary>
 		/// Returns a string representation of this member.
 		/// </summary>
 		/// <returns>String representation of this member.</returns>
 		public override string ToString()
 			=> $"Member {this.Id}; {this.Username}#{this.Discriminator} ({this.DisplayName})";
 
 		/// <summary>
 		/// Checks whether this <see cref="DiscordMember"/> is equal to another object.
 		/// </summary>
 		/// <param name="obj">Object to compare to.</param>
 		/// <returns>Whether the object is equal to this <see cref="DiscordMember"/>.</returns>
 		public override bool Equals(object obj)
 			=> this.Equals(obj as DiscordMember);
 
 		/// <summary>
 		/// Checks whether this <see cref="DiscordMember"/> is equal to another <see cref="DiscordMember"/>.
 		/// </summary>
 		/// <param name="e"><see cref="DiscordMember"/> to compare to.</param>
 		/// <returns>Whether the <see cref="DiscordMember"/> is equal to this <see cref="DiscordMember"/>.</returns>
 		public bool Equals(DiscordMember e)
 			=> e is not null && (ReferenceEquals(this, e) || (this.Id == e.Id && this.GuildId == e.GuildId));
 
 		/// <summary>
 		/// Gets the hash code for this <see cref="DiscordMember"/>.
 		/// </summary>
 		/// <returns>The hash code for this <see cref="DiscordMember"/>.</returns>
 		public override int GetHashCode()
 		{
 			var hash = 13;
 
 			hash = (hash * 7) + this.Id.GetHashCode();
 			hash = (hash * 7) + this.GuildId.GetHashCode();
 
 			return hash;
 		}
 
 		/// <summary>
 		/// Gets whether the two <see cref="DiscordMember"/> objects are equal.
 		/// </summary>
 		/// <param name="e1">First member to compare.</param>
 		/// <param name="e2">Second member to compare.</param>
 		/// <returns>Whether the two members are equal.</returns>
 		public static bool operator ==(DiscordMember e1, DiscordMember e2)
 		{
 			var o1 = e1 as object;
 			var o2 = e2 as object;
 
 			return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || (e1.Id == e2.Id && e1.GuildId == e2.GuildId));
 		}
 
 		/// <summary>
 		/// Gets whether the two <see cref="DiscordMember"/> objects are not equal.
 		/// </summary>
 		/// <param name="e1">First member to compare.</param>
 		/// <param name="e2">Second member to compare.</param>
 		/// <returns>Whether the two members are not equal.</returns>
 		public static bool operator !=(DiscordMember e1, DiscordMember e2)
 			=> !(e1 == e2);
 	}
 }
diff --git a/DisCatSharp/Entities/Interaction/Components/DiscordActionRowComponent.cs b/DisCatSharp/Entities/Interaction/Components/DiscordActionRowComponent.cs
index 29ccd5ee5..30f1d3808 100644
--- a/DisCatSharp/Entities/Interaction/Components/DiscordActionRowComponent.cs
+++ b/DisCatSharp/Entities/Interaction/Components/DiscordActionRowComponent.cs
@@ -1,68 +1,68 @@
 // 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.Collections.Generic;
 using System.Linq;
 
 using DisCatSharp.Enums;
 
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Entities
 {
 	/// <summary>
 	/// Represents a row of components. Action rows can have up to five components.
 	/// </summary>
 	public sealed class DiscordActionRowComponent : DiscordComponent
 	{
 		/// <summary>
 		/// The components contained within the action row.
 		/// </summary>
 		[JsonIgnore]
-		public IReadOnlyCollection<DiscordComponent> Components
+		public IReadOnlyList<DiscordComponent> Components
 		{
 			get => this._components ?? new List<DiscordComponent>();
 			set => this._components = new List<DiscordComponent>(value);
 		}
 
 		[JsonProperty("components", NullValueHandling = NullValueHandling.Ignore)]
 		private List<DiscordComponent> _components;
 
 		/// <summary>
 		/// Constructs a new <see cref="DiscordActionRowComponent"/>.
 		/// </summary>
 		/// <param name="components">List of components</param>
 		public DiscordActionRowComponent(IEnumerable<DiscordComponent> components)
 			: this()
 		{
-			this.Components = components.ToList().AsReadOnly();
+			this.Components = components.ToArray();
 		}
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordActionRowComponent"/> class.
 		/// </summary>
 		internal DiscordActionRowComponent()
 		{
 			this.Type = ComponentType.ActionRow;
 		}
 	}
 }
diff --git a/DisCatSharp/Entities/Interaction/DiscordInteractionApplicationCommandCallbackData.cs b/DisCatSharp/Entities/Interaction/DiscordInteractionApplicationCommandCallbackData.cs
index 26b7d4cf7..207f4216a 100644
--- a/DisCatSharp/Entities/Interaction/DiscordInteractionApplicationCommandCallbackData.cs
+++ b/DisCatSharp/Entities/Interaction/DiscordInteractionApplicationCommandCallbackData.cs
@@ -1,106 +1,106 @@
 // 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.Collections.Generic;
 
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Entities
 {
 	/// <summary>
 	/// Represents a interactions application command callback data.
 	/// </summary>
 	internal class DiscordInteractionApplicationCommandCallbackData
 	{
 		/// <summary>
 		/// Whether this message is text to speech.
 		/// </summary>
 		[JsonProperty("tts", NullValueHandling = NullValueHandling.Ignore)]
 		public bool? IsTts { get; internal set; }
 
 		/// <summary>
 		/// Gets the content.
 		/// </summary>
 		[JsonProperty("content", NullValueHandling = NullValueHandling.Ignore)]
 		public string Content { get; internal set; }
 
 		/// <summary>
 		/// Gets the embeds.
 		/// </summary>
 		[JsonProperty("embeds", NullValueHandling = NullValueHandling.Ignore)]
 		public IEnumerable<DiscordEmbed> Embeds { get; internal set; }
 
 		/// <summary>
 		/// Gets the mentions.
 		/// </summary>
 		[JsonProperty("allowed_mentions", NullValueHandling = NullValueHandling.Ignore)]
 		public IEnumerable<IMention> Mentions { get; internal set; }
 
 		/// <summary>
 		/// Gets the flags.
 		/// </summary>
 		[JsonProperty("flags", NullValueHandling = NullValueHandling.Ignore)]
 		public MessageFlags? Flags { get; internal set; }
 
 		/// <summary>
 		/// Gets the components.
 		/// </summary>
 		[JsonProperty("components", NullValueHandling = NullValueHandling.Ignore)]
-		public IReadOnlyCollection<DiscordActionRowComponent> Components { get; internal set; }
+		public IReadOnlyList<DiscordActionRowComponent> Components { get; internal set; }
 
 		/// <summary>
 		/// Gets the autocomplete choices.
 		/// </summary>
 		[JsonProperty("choices", NullValueHandling = NullValueHandling.Ignore)]
-		public IReadOnlyCollection<DiscordApplicationCommandAutocompleteChoice> Choices { get; internal set; }
+		public IReadOnlyList<DiscordApplicationCommandAutocompleteChoice> Choices { get; internal set; }
 
 		/// <summary>
 		/// Gets the attachments.
 		/// </summary>
 		[JsonProperty("attachments", NullValueHandling = NullValueHandling.Ignore)]
 		public List<DiscordAttachment> Attachments { get; set; }
 	}
 
 	/// <summary>
 	/// Represents a interactions application command callback data.
 	/// </summary>
 	internal class DiscordInteractionApplicationCommandModalCallbackData
 	{
 		/// <summary>
 		/// Gets the custom id.
 		/// </summary>
 		[JsonProperty("custom_id", NullValueHandling = NullValueHandling.Ignore)]
 		public string CustomId { get; internal set; }
 
 		/// <summary>
 		/// Gets the content.
 		/// </summary>
 		[JsonProperty("title", NullValueHandling = NullValueHandling.Ignore)]
 		public string Title { get; internal set; }
 
 		/// <summary>
 		/// Gets the components.
 		/// </summary>
 		[JsonProperty("components", NullValueHandling = NullValueHandling.Ignore)]
-		public IReadOnlyCollection<DiscordComponent> ModalComponents { get; internal set; }
+		public IReadOnlyList<DiscordComponent> ModalComponents { get; internal set; }
 	}
 }
diff --git a/DisCatSharp/Entities/Message/DiscordMessage.cs b/DisCatSharp/Entities/Message/DiscordMessage.cs
index e35894f49..5ccabe000 100644
--- a/DisCatSharp/Entities/Message/DiscordMessage.cs
+++ b/DisCatSharp/Entities/Message/DiscordMessage.cs
@@ -1,877 +1,877 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Entities
 {
 	/// <summary>
 	/// Represents a Discord text message.
 	/// </summary>
 	public class DiscordMessage : SnowflakeObject, IEquatable<DiscordMessage>
 	{
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordMessage"/> class.
 		/// </summary>
 		internal DiscordMessage()
 		{
-			this._attachmentsLazy = new Lazy<IReadOnlyList<DiscordAttachment>>(() => new ReadOnlyCollection<DiscordAttachment>(this.AttachmentsInternal));
-			this._embedsLazy = new Lazy<IReadOnlyList<DiscordEmbed>>(() => new ReadOnlyCollection<DiscordEmbed>(this.EmbedsInternal));
-			this._mentionedChannelsLazy = new Lazy<IReadOnlyList<DiscordChannel>>(() => this.MentionedChannelsInternal != null
-					? new ReadOnlyCollection<DiscordChannel>(this.MentionedChannelsInternal)
-					: Array.Empty<DiscordChannel>());
-			this._mentionedRolesLazy = new Lazy<IReadOnlyList<DiscordRole>>(() => this.MentionedRolesInternal != null ? new ReadOnlyCollection<DiscordRole>(this.MentionedRolesInternal) : Array.Empty<DiscordRole>());
-			this.MentionedUsersLazy = new Lazy<IReadOnlyList<DiscordUser>>(() => new ReadOnlyCollection<DiscordUser>(this.MentionedUsersInternal));
-			this._reactionsLazy = new Lazy<IReadOnlyList<DiscordReaction>>(() => new ReadOnlyCollection<DiscordReaction>(this.ReactionsInternal));
-			this._stickersLazy = new Lazy<IReadOnlyList<DiscordSticker>>(() => new ReadOnlyCollection<DiscordSticker>(this.StickersInternal));
+			this._attachmentsLazy = new Lazy<IReadOnlyList<DiscordAttachment>>(() => this.AttachmentsInternal);
+			this._embedsLazy = new Lazy<IReadOnlyList<DiscordEmbed>>(() => this.EmbedsInternal);
+			this._mentionedChannelsLazy = new Lazy<IReadOnlyList<DiscordChannel>>(() =>
+					(IReadOnlyList<DiscordChannel>)this.MentionedChannelsInternal
+					?? Array.Empty<DiscordChannel>());
+			this._mentionedRolesLazy = new Lazy<IReadOnlyList<DiscordRole>>(() => (IReadOnlyList<DiscordRole>)this.MentionedRolesInternal ?? Array.Empty<DiscordRole>());
+			this.MentionedUsersLazy = new Lazy<IReadOnlyList<DiscordUser>>(() => this.MentionedUsersInternal);
+			this._reactionsLazy = new Lazy<IReadOnlyList<DiscordReaction>>(() => this.ReactionsInternal);
+			this._stickersLazy = new Lazy<IReadOnlyList<DiscordSticker>>(() => this.StickersInternal);
 			this._jumpLink = new Lazy<Uri>(() =>
 			{
 				string gid = null;
 				if (this.Channel != null)
 					gid = this.Channel is DiscordDmChannel
 						? "@me"
 						: this.Channel is DiscordThreadChannel
 						? this.INTERNAL_THREAD.GuildId.Value.ToString(CultureInfo.InvariantCulture)
 						: this.Channel.GuildId.Value.ToString(CultureInfo.InvariantCulture);
 
 				var cid = this.ChannelId.ToString(CultureInfo.InvariantCulture);
 				var mid = this.Id.ToString(CultureInfo.InvariantCulture);
 
 				return new Uri($"https://{(this.Discord.Configuration.UseCanary ? "canary.discord.com" : this.Discord.Configuration.UsePtb ? "ptb.discord.com" : "discord.com")}/channels/{gid}/{cid}/{mid}");
 			});
 		}
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordMessage"/> class.
 		/// </summary>
 		/// <param name="other">The other message.</param>
 		internal DiscordMessage(DiscordMessage other)
 			: this()
 		{
 			this.Discord = other.Discord;
 
 			this.AttachmentsInternal = other.AttachmentsInternal; // the attachments cannot change, thus no need to copy and reallocate.
 			this.EmbedsInternal = new List<DiscordEmbed>(other.EmbedsInternal);
 
 			if (other.MentionedChannelsInternal != null)
 				this.MentionedChannelsInternal = new List<DiscordChannel>(other.MentionedChannelsInternal);
 			if (other.MentionedRolesInternal != null)
 				this.MentionedRolesInternal = new List<DiscordRole>(other.MentionedRolesInternal);
 			if (other.MentionedRoleIds != null)
 				this.MentionedRoleIds = new List<ulong>(other.MentionedRoleIds);
 			this.MentionedUsersInternal = new List<DiscordUser>(other.MentionedUsersInternal);
 			this.ReactionsInternal = new List<DiscordReaction>(other.ReactionsInternal);
 			this.StickersInternal = new List<DiscordSticker>(other.StickersInternal);
 
 			this.Author = other.Author;
 			this.ChannelId = other.ChannelId;
 			this.Content = other.Content;
 			this.EditedTimestampRaw = other.EditedTimestampRaw;
 			this.Id = other.Id;
 			this.IsTts = other.IsTts;
 			this.MessageType = other.MessageType;
 			this.Pinned = other.Pinned;
 			this.TimestampRaw = other.TimestampRaw;
 			this.WebhookId = other.WebhookId;
 		}
 
 		/// <summary>
 		/// Gets the channel in which the message was sent.
 		/// </summary>
 		[JsonIgnore]
 		public DiscordChannel Channel
 		{
 			get => (this.Discord as DiscordClient)?.InternalGetCachedChannel(this.ChannelId) ?? this._channel;
 			internal set => this._channel = value;
 		}
 
 		private DiscordChannel _channel;
 
 		/// <summary>
 		/// Gets the thread in which the message was sent.
 		/// </summary>
 		[JsonIgnore]
 		private DiscordThreadChannel INTERNAL_THREAD
 		{
 			get => (this.Discord as DiscordClient)?.InternalGetCachedThread(this.ChannelId) ?? this._thread;
 			set => this._thread = value;
 		}
 
 		private DiscordThreadChannel _thread;
 
 		/// <summary>
 		/// Gets the ID of the channel in which the message was sent.
 		/// </summary>
 		[JsonProperty("channel_id", NullValueHandling = NullValueHandling.Ignore)]
 		public ulong ChannelId { get; internal set; }
 
 		/// <summary>
 		/// Gets the components this message was sent with.
 		/// </summary>
 		[JsonProperty("components", NullValueHandling = NullValueHandling.Ignore)]
-		public IReadOnlyCollection<DiscordActionRowComponent> Components { get; internal set; }
+		public IReadOnlyList<DiscordActionRowComponent> Components { get; internal set; }
 
 		/// <summary>
 		/// Gets the user or member that sent the message.
 		/// </summary>
 		[JsonProperty("author", NullValueHandling = NullValueHandling.Ignore)]
 		public DiscordUser Author { get; internal set; }
 
 		/// <summary>
 		/// Gets the message's content.
 		/// </summary>
 		[JsonProperty("content", NullValueHandling = NullValueHandling.Ignore)]
 		public string Content { get; internal set; }
 
 		/// <summary>
 		/// Gets the message's creation timestamp.
 		/// </summary>
 		[JsonIgnore]
 		public DateTimeOffset Timestamp
 			=> !string.IsNullOrWhiteSpace(this.TimestampRaw) && DateTimeOffset.TryParse(this.TimestampRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ?
 				dto : this.CreationTimestamp;
 
 		/// <summary>
 		/// Gets the message's creation timestamp as raw string.
 		/// </summary>
 		[JsonProperty("timestamp", NullValueHandling = NullValueHandling.Ignore)]
 		internal string TimestampRaw { get; set; }
 
 		/// <summary>
 		/// Gets the message's edit timestamp. Will be null if the message was not edited.
 		/// </summary>
 		[JsonIgnore]
 		public DateTimeOffset? EditedTimestamp
 			=> !string.IsNullOrWhiteSpace(this.EditedTimestampRaw) && DateTimeOffset.TryParse(this.EditedTimestampRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ?
 				(DateTimeOffset?)dto : null;
 
 		/// <summary>
 		/// Gets the message's edit timestamp as raw string. Will be null if the message was not edited.
 		/// </summary>
 		[JsonProperty("edited_timestamp", NullValueHandling = NullValueHandling.Ignore)]
 		internal string EditedTimestampRaw { get; set; }
 
 		/// <summary>
 		/// Gets whether this message was edited.
 		/// </summary>
 		[JsonIgnore]
 		public bool IsEdited
 			=> !string.IsNullOrWhiteSpace(this.EditedTimestampRaw);
 
 		/// <summary>
 		/// Gets whether the message is a text-to-speech message.
 		/// </summary>
 		[JsonProperty("tts", NullValueHandling = NullValueHandling.Ignore)]
 		public bool IsTts { get; internal set; }
 
 		/// <summary>
 		/// Gets whether the message mentions everyone.
 		/// </summary>
 		[JsonProperty("mention_everyone", NullValueHandling = NullValueHandling.Ignore)]
 		public bool MentionEveryone { get; internal set; }
 
 		/// <summary>
 		/// Gets users or members mentioned by this message.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyList<DiscordUser> MentionedUsers
 			=> this.MentionedUsersLazy.Value;
 
 		[JsonProperty("mentions", NullValueHandling = NullValueHandling.Ignore)]
 		internal List<DiscordUser> MentionedUsersInternal;
 		[JsonIgnore]
 		internal readonly Lazy<IReadOnlyList<DiscordUser>> MentionedUsersLazy;
 
 		// TODO: this will probably throw an exception in DMs since it tries to wrap around a null List...
 		// this is probably low priority but need to find out a clean way to solve it...
 		/// <summary>
 		/// Gets roles mentioned by this message.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyList<DiscordRole> MentionedRoles
 			=> this._mentionedRolesLazy.Value;
 
 		[JsonIgnore]
 		internal List<DiscordRole> MentionedRolesInternal;
 
 		[JsonProperty("mention_roles")]
 		internal List<ulong> MentionedRoleIds;
 
 		[JsonIgnore]
 		private readonly Lazy<IReadOnlyList<DiscordRole>> _mentionedRolesLazy;
 
 		/// <summary>
 		/// Gets channels mentioned by this message.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyList<DiscordChannel> MentionedChannels
 			=> this._mentionedChannelsLazy.Value;
 
 		[JsonIgnore]
 		internal List<DiscordChannel> MentionedChannelsInternal;
 		[JsonIgnore]
 		private readonly Lazy<IReadOnlyList<DiscordChannel>> _mentionedChannelsLazy;
 
 		/// <summary>
 		/// Gets files attached to this message.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyList<DiscordAttachment> Attachments
 			=> this._attachmentsLazy.Value;
 
 		[JsonProperty("attachments", NullValueHandling = NullValueHandling.Ignore)]
 		internal List<DiscordAttachment> AttachmentsInternal = new();
 		[JsonIgnore]
 		private readonly Lazy<IReadOnlyList<DiscordAttachment>> _attachmentsLazy;
 
 		/// <summary>
 		/// Gets embeds attached to this message.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyList<DiscordEmbed> Embeds
 			=> this._embedsLazy.Value;
 
 		[JsonProperty("embeds", NullValueHandling = NullValueHandling.Ignore)]
 		internal List<DiscordEmbed> EmbedsInternal = new();
 		[JsonIgnore]
 		private readonly Lazy<IReadOnlyList<DiscordEmbed>> _embedsLazy;
 
 		/// <summary>
 		/// Gets reactions used on this message.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyList<DiscordReaction> Reactions
 			=> this._reactionsLazy.Value;
 
 		[JsonProperty("reactions", NullValueHandling = NullValueHandling.Ignore)]
 		internal List<DiscordReaction> ReactionsInternal = new();
 		[JsonIgnore]
 		private readonly Lazy<IReadOnlyList<DiscordReaction>> _reactionsLazy;
 
         /// <summary>
         /// Gets the nonce sent with the message, if the message was sent by the client.
         /// </summary>
         [JsonProperty("nonce", NullValueHandling = NullValueHandling.Ignore)]
         public string Nonce { get; internal set; }
 
 
 		/// <summary>
 		/// Gets whether the message is pinned.
 		/// </summary>
 		[JsonProperty("pinned", NullValueHandling = NullValueHandling.Ignore)]
 		public bool Pinned { get; internal set; }
 
 		/// <summary>
 		/// Gets the id of the webhook that generated this message.
 		/// </summary>
 		[JsonProperty("webhook_id", NullValueHandling = NullValueHandling.Ignore)]
 		public ulong? WebhookId { get; internal set; }
 
 		/// <summary>
 		/// Gets the type of the message.
 		/// </summary>
 		[JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
 		public MessageType? MessageType { get; internal set; }
 
 		/// <summary>
 		/// Gets the message activity in the Rich Presence embed.
 		/// </summary>
 		[JsonProperty("activity", NullValueHandling = NullValueHandling.Ignore)]
 		public DiscordMessageActivity Activity { get; internal set; }
 
 		/// <summary>
 		/// Gets the message application in the Rich Presence embed.
 		/// </summary>
 		[JsonProperty("application", NullValueHandling = NullValueHandling.Ignore)]
 		public DiscordMessageApplication Application { get; internal set; }
 
 		/// <summary>
 		/// Gets the message application id in the Rich Presence embed.
 		/// </summary>
 		[JsonProperty("application_id", NullValueHandling = NullValueHandling.Ignore)]
 		public ulong ApplicationId { get; internal set; }
 
 		/// <summary>
 		/// Gets the internal reference.
 		/// </summary>
 		[JsonProperty("message_reference", NullValueHandling = NullValueHandling.Ignore)]
 		internal InternalDiscordMessageReference? InternalReference { get; set; }
 
 		/// <summary>
 		/// Gets the original message reference from the crossposted message.
 		/// </summary>
 		[JsonIgnore]
 		public DiscordMessageReference Reference
 			=> this.InternalReference.HasValue ? this?.InternalBuildMessageReference() : null;
 
 		/// <summary>
 		/// Gets the bitwise flags for this message.
 		/// </summary>
 		[JsonProperty("flags", NullValueHandling = NullValueHandling.Ignore)]
 		public MessageFlags? Flags { get; internal set; }
 
 		/// <summary>
 		/// Gets whether the message originated from a webhook.
 		/// </summary>
 		[JsonIgnore]
 		public bool WebhookMessage
 			=> this.WebhookId != null;
 
 		/// <summary>
 		/// Gets the jump link to this message.
 		/// </summary>
 		[JsonIgnore]
 		public Uri JumpLink => this._jumpLink.Value;
 		private readonly Lazy<Uri> _jumpLink;
 
 		/// <summary>
 		/// Gets stickers for this message.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyList<DiscordSticker> Stickers
 			=> this._stickersLazy.Value;
 
 		[JsonProperty("sticker_items", NullValueHandling = NullValueHandling.Ignore)]
 		internal List<DiscordSticker> StickersInternal = new();
 		[JsonIgnore]
 		private readonly Lazy<IReadOnlyList<DiscordSticker>> _stickersLazy;
 
 		/// <summary>
 		/// Gets the guild id.
 		/// </summary>
 		[JsonProperty("guild_id", NullValueHandling = NullValueHandling.Ignore)]
 		internal ulong? GuildId { get; set; }
 
 		/// <summary>
 		/// Gets the message object for the referenced message
 		/// </summary>
 		[JsonProperty("referenced_message", NullValueHandling = NullValueHandling.Ignore)]
 		public DiscordMessage ReferencedMessage { get; internal set; }
 
 		/// <summary>
 		/// Gets whether the message is a response to an interaction.
 		/// </summary>
 		[JsonProperty("interaction", NullValueHandling = NullValueHandling.Ignore)]
 		public DiscordMessageInteraction Interaction { get; internal set; }
 
 		/// <summary>
 		/// Gets the thread that was started from this message.
 		/// </summary>
 		[JsonProperty("thread", NullValueHandling = NullValueHandling.Ignore)]
 		public DiscordThreadChannel Thread { get; internal set; }
 
 		/// <summary>
 		/// Build the message reference.
 		/// </summary>
 		internal DiscordMessageReference InternalBuildMessageReference()
 		{
 			var client = this.Discord as DiscordClient;
 			var guildId = this.InternalReference.Value.GuildId;
 			var channelId = this.InternalReference.Value.ChannelId;
 			var messageId = this.InternalReference.Value.MessageId;
 
 			var reference = new DiscordMessageReference();
 
 			if (guildId.HasValue)
 				reference.Guild = client.GuildsInternal.TryGetValue(guildId.Value, out var g)
 					? g
 					: new DiscordGuild
 					{
 						Id = guildId.Value,
 						Discord = client
 					};
 
 			var channel = client.InternalGetCachedChannel(channelId.Value);
 
 			if (channel == null)
 			{
 				reference.Channel = new DiscordChannel
 				{
 					Id = channelId.Value,
 					Discord = client
 				};
 
 				if (guildId.HasValue)
 					reference.Channel.GuildId = guildId.Value;
 			}
 
 			else reference.Channel = channel;
 
 			if (client.MessageCache != null && client.MessageCache.TryGet(m => m.Id == messageId.Value && m.ChannelId == channelId, out var msg))
 				reference.Message = msg;
 
 			else
 			{
 				reference.Message = new DiscordMessage
 				{
 					ChannelId = this.ChannelId,
 					Discord = client
 				};
 
 				if (messageId.HasValue)
 					reference.Message.Id = messageId.Value;
 			}
 
 			return reference;
 		}
 
 
 		/// <summary>
 		/// Gets the mentions.
 		/// </summary>
 		/// <returns>An array of IMentions.</returns>
 		private List<IMention> GetMentions()
 		{
 			var mentions = new List<IMention>();
 
 			if (this.ReferencedMessage != null && this.MentionedUsersInternal.Contains(this.ReferencedMessage.Author))
 				mentions.Add(new RepliedUserMention());
 
 			if (this.MentionedUsersInternal.Any())
 				mentions.AddRange(this.MentionedUsersInternal.Select(m => (IMention)new UserMention(m)));
 
 			if (this.MentionedRoleIds.Any())
 				mentions.AddRange(this.MentionedRoleIds.Select(r => (IMention)new RoleMention(r)));
 
 			return mentions;
 		}
 
 		/// <summary>
 		/// Populates the mentions.
 		/// </summary>
 		internal void PopulateMentions()
 		{
 			var guild = this.Channel?.Guild;
 			this.MentionedUsersInternal ??= new List<DiscordUser>();
 			this.MentionedRolesInternal ??= new List<DiscordRole>();
 			this.MentionedChannelsInternal ??= new List<DiscordChannel>();
 
 			var mentionedUsers = new HashSet<DiscordUser>(new DiscordUserComparer());
 			if (guild != null)
 			{
 				foreach (var usr in this.MentionedUsersInternal)
 				{
 					usr.Discord = this.Discord;
 					this.Discord.UserCache.AddOrUpdate(usr.Id, usr, (id, old) =>
 					{
 						old.Username = usr.Username;
 						old.Discriminator = usr.Discriminator;
 						old.AvatarHash = usr.AvatarHash;
 						return old;
 					});
 
 					mentionedUsers.Add(guild.MembersInternal.TryGetValue(usr.Id, out var member) ? member : usr);
 				}
 			}
 			if (!string.IsNullOrWhiteSpace(this.Content))
 			{
 				//mentionedUsers.UnionWith(Utilities.GetUserMentions(this).Select(this.Discord.GetCachedOrEmptyUserInternal));
 				if (guild != null)
 				{
 					//this._mentionedRoles = this._mentionedRoles.Union(Utilities.GetRoleMentions(this).Select(xid => guild.GetRole(xid))).ToList();
 					this.MentionedRolesInternal = this.MentionedRolesInternal.Union(this.MentionedRoleIds.Select(xid => guild.GetRole(xid))).ToList();
 					this.MentionedChannelsInternal = this.MentionedChannelsInternal.Union(Utilities.GetChannelMentions(this).Select(xid => guild.GetChannel(xid))).ToList();
 				}
 			}
 
 			this.MentionedUsersInternal = mentionedUsers.ToList();
 		}
 
 		/// <summary>
 		/// Edits the message.
 		/// </summary>
 		/// <param name="content">New content.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client tried to modify a message not sent by them.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordMessage> ModifyAsync(Optional<string> content)
 			=> this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, content, default, this.GetMentions(), default, default, Array.Empty<DiscordMessageFile>(), default);
 
 		/// <summary>
 		/// Edits the message.
 		/// </summary>
 		/// <param name="embed">New embed.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client tried to modify a message not sent by them.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordMessage> ModifyAsync(Optional<DiscordEmbed> embed = default)
 			=> this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, default, embed.Map(v => new[] { v }).ValueOr(Array.Empty<DiscordEmbed>()), this.GetMentions(), default, default, Array.Empty<DiscordMessageFile>(), default);
 
 		/// <summary>
 		/// Edits the message.
 		/// </summary>
 		/// <param name="content">New content.</param>
 		/// <param name="embed">New embed.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client tried to modify a message not sent by them.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordMessage> ModifyAsync(Optional<string> content, Optional<DiscordEmbed> embed = default)
 			=> this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, content, embed.Map(v => new[] { v }).ValueOr(Array.Empty<DiscordEmbed>()), this.GetMentions(), default, default, Array.Empty<DiscordMessageFile>(), default);
 
 		/// <summary>
 		/// Edits the message.
 		/// </summary>
 		/// <param name="content">New content.</param>
 		/// <param name="embeds">New embeds.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client tried to modify a message not sent by them.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordMessage> ModifyAsync(Optional<string> content, Optional<IEnumerable<DiscordEmbed>> embeds = default)
 			=> this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, content, embeds, this.GetMentions(), default, default, Array.Empty<DiscordMessageFile>(), default);
 
 		/// <summary>
 		/// Edits the message.
 		/// </summary>
 		/// <param name="builder">The builder of the message to edit.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client tried to modify a message not sent by them.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordMessage> ModifyAsync(DiscordMessageBuilder builder)
 		{
 			builder.Validate(true);
 			return await this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, builder.Content, Optional.Some(builder.Embeds.AsEnumerable()), builder.Mentions, builder.Components, builder.Suppressed, builder.Files, builder.Attachments.Count > 0 ? Optional.Some(builder.Attachments.AsEnumerable()) : builder.KeepAttachmentsInternal.HasValue ? builder.KeepAttachmentsInternal.Value ? Optional.Some(this.Attachments.AsEnumerable()) : Array.Empty<DiscordAttachment>() : null);
 		}
 
 		/// <summary>
 		/// Edits the message embed suppression.
 		/// </summary>
 		/// <param name="suppress">Suppress embeds.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client tried to modify a message not sent by them.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordMessage> ModifySuppressionAsync(bool suppress = false)
 			=> this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, default, default, default, default, suppress, default, default);
 
 		/// <summary>
 		/// Clears all attachments from the message.
 		/// </summary>
 		/// <returns></returns>
 		public Task<DiscordMessage> ClearAttachmentsAsync()
 			=> this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, default, default, this.GetMentions(), default, default, default, Array.Empty<DiscordAttachment>());
 
 		/// <summary>
 		/// Edits the message.
 		/// </summary>
 		/// <param name="action">The builder of the message to edit.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client tried to modify a message not sent by them.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<DiscordMessage> ModifyAsync(Action<DiscordMessageBuilder> action)
 		{
 			var builder = new DiscordMessageBuilder();
 			action(builder);
 			builder.Validate(true);
 			return await this.Discord.ApiClient.EditMessageAsync(this.ChannelId, this.Id, builder.Content, Optional.Some(builder.Embeds.AsEnumerable()), builder.Mentions, builder.Components, builder.Suppressed, builder.Files, builder.Attachments.Count > 0 ? Optional.Some(builder.Attachments.AsEnumerable()) : builder.KeepAttachmentsInternal.HasValue ? builder.KeepAttachmentsInternal.Value ? Optional.Some(this.Attachments.AsEnumerable()) : Array.Empty<DiscordAttachment>() : null);
 		}
 
 		/// <summary>
 		/// Deletes the message.
 		/// </summary>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageMessages"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task DeleteAsync(string reason = null)
 			=> this.Discord.ApiClient.DeleteMessageAsync(this.ChannelId, this.Id, reason);
 
 		/// <summary>
 		/// Creates a thread.
 		/// Depending on the <see cref="ChannelType"/> of the parent channel it's either a <see cref="ChannelType.PublicThread"/> or a <see cref="ChannelType.NewsThread"/>.
 		/// </summary>
 		/// <param name="name">The name of the thread.</param>
 		/// <param name="autoArchiveDuration"><see cref="ThreadAutoArchiveDuration"/> till it gets archived. Defaults to <see cref="ThreadAutoArchiveDuration.OneHour"/></param>
 		/// <param name="rateLimitPerUser">The per user ratelimit, aka slowdown.</param>
 		/// <param name="reason">The reason.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.CreatePrivateThreads"/> or <see cref="Permissions.SendMessagesInThreads"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		/// <exception cref="System.NotSupportedException">Thrown when the <see cref="ThreadAutoArchiveDuration"/> cannot be modified.</exception>
 		public async Task<DiscordThreadChannel> CreateThreadAsync(string name, ThreadAutoArchiveDuration autoArchiveDuration = ThreadAutoArchiveDuration.OneHour, int? rateLimitPerUser = null, string reason = null) =>
 			Utilities.CheckThreadAutoArchiveDurationFeature(this.Channel.Guild, autoArchiveDuration)
 				? await this.Discord.ApiClient.CreateThreadAsync(this.ChannelId, this.Id, name, autoArchiveDuration, this.Channel.Type == ChannelType.News ? ChannelType.NewsThread : ChannelType.PublicThread, rateLimitPerUser, reason)
 				: throw new NotSupportedException($"Cannot modify ThreadAutoArchiveDuration. Guild needs boost tier {(autoArchiveDuration == ThreadAutoArchiveDuration.ThreeDays ? "one" : "two")}.");
 
 		/// <summary>
 		/// Pins the message in its channel.
 		/// </summary>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageMessages"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task PinAsync()
 			=> this.Discord.ApiClient.PinMessageAsync(this.ChannelId, this.Id);
 
 		/// <summary>
 		/// Unpins the message in its channel.
 		/// </summary>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageMessages"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task UnpinAsync()
 			=> this.Discord.ApiClient.UnpinMessageAsync(this.ChannelId, this.Id);
 
 		/// <summary>
 		/// Responds to the message. This produces a reply.
 		/// </summary>
 		/// <param name="content">Message content to respond with.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.SendMessages"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordMessage> RespondAsync(string content)
 			=> this.Discord.ApiClient.CreateMessageAsync(this.ChannelId, content, null, sticker: null, replyMessageId: this.Id, mentionReply: false, failOnInvalidReply: false);
 
 		/// <summary>
 		/// Responds to the message. This produces a reply.
 		/// </summary>
 		/// <param name="embed">Embed to attach to the message.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.SendMessages"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordMessage> RespondAsync(DiscordEmbed embed)
 			=> this.Discord.ApiClient.CreateMessageAsync(this.ChannelId, null, embed != null ? new[] { embed } : null, sticker: null, replyMessageId: this.Id, mentionReply: false, failOnInvalidReply: false);
 
 		/// <summary>
 		/// Responds to the message. This produces a reply.
 		/// </summary>
 		/// <param name="content">Message content to respond with.</param>
 		/// <param name="embed">Embed to attach to the message.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.SendMessages"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordMessage> RespondAsync(string content, DiscordEmbed embed)
 			=> this.Discord.ApiClient.CreateMessageAsync(this.ChannelId, content, embed != null ? new[] { embed } : null, sticker: null, replyMessageId: this.Id, mentionReply: false, failOnInvalidReply: false);
 
 		/// <summary>
 		/// Responds to the message. This produces a reply.
 		/// </summary>
 		/// <param name="builder">The Discord message builder.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.SendMessages"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordMessage> RespondAsync(DiscordMessageBuilder builder)
 			=> this.Discord.ApiClient.CreateMessageAsync(this.ChannelId, builder.WithReply(this.Id, mention: false, failOnInvalidReply: false));
 
 		/// <summary>
 		/// Responds to the message. This produces a reply.
 		/// </summary>
 		/// <param name="action">The Discord message builder.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.SendMessages"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the member does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordMessage> RespondAsync(Action<DiscordMessageBuilder> action)
 		{
 			var builder = new DiscordMessageBuilder();
 			action(builder);
 			return this.Discord.ApiClient.CreateMessageAsync(this.ChannelId, builder.WithReply(this.Id, mention: false, failOnInvalidReply: false));
 		}
 
 		/// <summary>
 		/// Creates a reaction to this message.
 		/// </summary>
 		/// <param name="emoji">The emoji you want to react with, either an emoji or name:id</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.AddReactions"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the emoji does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task CreateReactionAsync(DiscordEmoji emoji)
 			=> this.Discord.ApiClient.CreateReactionAsync(this.ChannelId, this.Id, emoji.ToReactionString());
 
 		/// <summary>
 		/// Deletes your own reaction
 		/// </summary>
 		/// <param name="emoji">Emoji for the reaction you want to remove, either an emoji or name:id</param>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the emoji does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task DeleteOwnReactionAsync(DiscordEmoji emoji)
 			=> this.Discord.ApiClient.DeleteOwnReactionAsync(this.ChannelId, this.Id, emoji.ToReactionString());
 
 		/// <summary>
 		/// Deletes another user's reaction.
 		/// </summary>
 		/// <param name="emoji">Emoji for the reaction you want to remove, either an emoji or name:id.</param>
 		/// <param name="user">Member you want to remove the reaction for</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageMessages"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the emoji does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task DeleteReactionAsync(DiscordEmoji emoji, DiscordUser user, string reason = null)
 			=> this.Discord.ApiClient.DeleteUserReactionAsync(this.ChannelId, this.Id, user.Id, emoji.ToReactionString(), reason);
 
 		/// <summary>
 		/// Gets users that reacted with this emoji.
 		/// </summary>
 		/// <param name="emoji">Emoji to react with.</param>
 		/// <param name="limit">Limit of users to fetch.</param>
 		/// <param name="after">Fetch users after this user's id.</param>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the emoji does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<IReadOnlyList<DiscordUser>> GetReactionsAsync(DiscordEmoji emoji, int limit = 25, ulong? after = null)
 			=> this.GetReactionsInternalAsync(emoji, limit, after);
 
 		/// <summary>
 		/// Deletes all reactions for this message.
 		/// </summary>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageMessages"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the emoji does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task DeleteAllReactionsAsync(string reason = null)
 			=> this.Discord.ApiClient.DeleteAllReactionsAsync(this.ChannelId, this.Id, reason);
 
 		/// <summary>
 		/// Deletes all reactions of a specific reaction for this message.
 		/// </summary>
 		/// <param name="emoji">The emoji to clear, either an emoji or name:id.</param>
 		/// <exception cref="Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageMessages"/> permission.</exception>
 		/// <exception cref="Exceptions.NotFoundException">Thrown when the emoji does not exist.</exception>
 		/// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task DeleteReactionsEmojiAsync(DiscordEmoji emoji)
 			=> this.Discord.ApiClient.DeleteReactionsEmojiAsync(this.ChannelId, this.Id, emoji.ToReactionString());
 
 		/// <summary>
 		/// Gets the reactions.
 		/// </summary>
 		/// <param name="emoji">The emoji to search for.</param>
 		/// <param name="limit">The limit of results.</param>
 		/// <param name="after">Get the reasctions after snowflake.</param>
 		private async Task<IReadOnlyList<DiscordUser>> GetReactionsInternalAsync(DiscordEmoji emoji, int limit = 25, ulong? after = null)
 		{
 			if (limit < 0)
 				throw new ArgumentException("Cannot get a negative number of reactions' users.");
 
 			if (limit == 0)
 				return Array.Empty<DiscordUser>();
 
 			var users = new List<DiscordUser>(limit);
 			var remaining = limit;
 			var last = after;
 
 			int lastCount;
 			do
 			{
 				var fetchSize = remaining > 100 ? 100 : remaining;
 				var fetch = await this.Discord.ApiClient.GetReactionsAsync(this.Channel.Id, this.Id, emoji.ToReactionString(), last, fetchSize).ConfigureAwait(false);
 
 				lastCount = fetch.Count;
 				remaining -= lastCount;
 
 				users.AddRange(fetch);
 				last = fetch.LastOrDefault()?.Id;
 			} while (remaining > 0 && lastCount > 0);
 
-			return new ReadOnlyCollection<DiscordUser>(users);
+			return users;
 		}
 
 		/// <summary>
 		/// Returns a string representation of this message.
 		/// </summary>
 		/// <returns>String representation of this message.</returns>
 		public override string ToString()
 			=> $"Message {this.Id}; Attachment count: {this.AttachmentsInternal.Count}; Embed count: {this.EmbedsInternal.Count}; Contents: {this.Content}";
 
 		/// <summary>
 		/// Checks whether this <see cref="DiscordMessage"/> is equal to another object.
 		/// </summary>
 		/// <param name="obj">Object to compare to.</param>
 		/// <returns>Whether the object is equal to this <see cref="DiscordMessage"/>.</returns>
 		public override bool Equals(object obj)
 			=> this.Equals(obj as DiscordMessage);
 
 		/// <summary>
 		/// Checks whether this <see cref="DiscordMessage"/> is equal to another <see cref="DiscordMessage"/>.
 		/// </summary>
 		/// <param name="e"><see cref="DiscordMessage"/> to compare to.</param>
 		/// <returns>Whether the <see cref="DiscordMessage"/> is equal to this <see cref="DiscordMessage"/>.</returns>
 		public bool Equals(DiscordMessage e)
 			=> e is not null && (ReferenceEquals(this, e) || (this.Id == e.Id && this.ChannelId == e.ChannelId));
 
 		/// <summary>
 		/// Gets the hash code for this <see cref="DiscordMessage"/>.
 		/// </summary>
 		/// <returns>The hash code for this <see cref="DiscordMessage"/>.</returns>
 		public override int GetHashCode()
 		{
 			var hash = 13;
 
 			hash = (hash * 7) + this.Id.GetHashCode();
 			hash = (hash * 7) + this.ChannelId.GetHashCode();
 
 			return hash;
 		}
 
 		/// <summary>
 		/// Gets whether the two <see cref="DiscordMessage"/> objects are equal.
 		/// </summary>
 		/// <param name="e1">First message to compare.</param>
 		/// <param name="e2">Second message to compare.</param>
 		/// <returns>Whether the two messages are equal.</returns>
 		public static bool operator ==(DiscordMessage e1, DiscordMessage e2)
 		{
 			var o1 = e1 as object;
 			var o2 = e2 as object;
 
 			return (o1 != null || o2 == null)
 				&& (o1 == null || o2 != null)
 				&& ((o1 == null && o2 == null) || (e1.Id == e2.Id && e1.ChannelId == e2.ChannelId));
 		}
 
 		/// <summary>
 		/// Gets whether the two <see cref="DiscordMessage"/> objects are not equal.
 		/// </summary>
 		/// <param name="e1">First message to compare.</param>
 		/// <param name="e2">Second message to compare.</param>
 		/// <returns>Whether the two messages are not equal.</returns>
 		public static bool operator !=(DiscordMessage e1, DiscordMessage e2)
 			=> !(e1 == e2);
 	}
 }
diff --git a/DisCatSharp/Entities/Message/DiscordMessageBuilder.cs b/DisCatSharp/Entities/Message/DiscordMessageBuilder.cs
index 823796c0c..27b42af36 100644
--- a/DisCatSharp/Entities/Message/DiscordMessageBuilder.cs
+++ b/DisCatSharp/Entities/Message/DiscordMessageBuilder.cs
@@ -1,460 +1,460 @@
 // 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 System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
 namespace DisCatSharp.Entities
 {
 	/// <summary>
 	/// Constructs a Message to be sent.
 	/// </summary>
 	public sealed class DiscordMessageBuilder
 	{
 		/// <summary>
 		/// Gets or Sets the Message to be sent.
 		/// </summary>
 		public string Content
 		{
 			get => this._content;
 			set
 			{
 				if (value != null && value.Length > 2000)
 					throw new ArgumentException("Content cannot exceed 2000 characters.", nameof(value));
 				this._content = value;
 			}
 		}
 		private string _content;
 
 		/// <summary>
 		/// Gets or sets the embed for the builder. This will always set the builder to have one embed.
 		/// </summary>
 		public DiscordEmbed Embed
 		{
 			get => this._embeds.Count > 0 ? this._embeds[0] : null;
 			set
 			{
 				this._embeds.Clear();
 				this._embeds.Add(value);
 			}
 		}
 
 		/// <summary>
 		/// Gets the Sticker to be send.
 		/// </summary>
 		public DiscordSticker Sticker { get; set; }
 
 		/// <summary>
 		/// Gets the Embeds to be sent.
 		/// </summary>
 		public IReadOnlyList<DiscordEmbed> Embeds => this._embeds;
 		private readonly List<DiscordEmbed> _embeds = new();
 
 		/// <summary>
 		/// Gets or Sets if the message should be TTS.
 		/// </summary>
 		public bool IsTts { get; set; }
 
 		/// <summary>
 		/// Whether to keep previous attachments.
 		/// </summary>
 		internal bool? KeepAttachmentsInternal;
 
 		/// <summary>
 		/// Gets the Allowed Mentions for the message to be sent.
 		/// </summary>
 		public List<IMention> Mentions { get; private set; }
 
+		internal readonly List<DiscordMessageFile> FilesInternal = new();
 		/// <summary>
 		/// Gets the Files to be sent in the Message.
 		/// </summary>
-		public IReadOnlyCollection<DiscordMessageFile> Files => this.FilesInternal;
-		internal readonly List<DiscordMessageFile> FilesInternal = new();
+		public IReadOnlyList<DiscordMessageFile> Files => this.FilesInternal.AsReadOnly();
 
 		/// <summary>
 		/// Gets the components that will be attached to the message.
 		/// </summary>
 		public IReadOnlyList<DiscordActionRowComponent> Components => this.ComponentsInternal;
 		internal readonly List<DiscordActionRowComponent> ComponentsInternal = new(5);
 
 		/// <summary>
 		/// Gets the Attachments to be sent in the Message.
 		/// </summary>
 		public IReadOnlyList<DiscordAttachment> Attachments => this.AttachmentsInternal;
 		internal readonly List<DiscordAttachment> AttachmentsInternal = new();
 
 		/// <summary>
 		/// Gets the Reply Message ID.
 		/// </summary>
 		public ulong? ReplyId { get; private set; }
 
 		/// <summary>
 		/// Gets if the Reply should mention the user.
 		/// </summary>
 		public bool MentionOnReply { get; private set; }
 
 		/// <summary>
 		/// Gets if the embeds should be suppressed.
 		/// </summary>
 		public bool Suppressed { get; private set; }
 
 		/// <summary>
 		/// Gets if the Reply will error if the Reply Message Id does not reference a valid message.
 		/// <para>If set to false, invalid replies are send as a regular message.</para>
 		/// <para>Defaults to false.</para>
 		/// </summary>
 		public bool FailOnInvalidReply { get; set; }
 
 		/// <summary>
 		/// Sets the Content of the Message.
 		/// </summary>
 		/// <param name="content">The content to be set.</param>
 		/// <returns>The current builder to be chained.</returns>
 		public DiscordMessageBuilder WithContent(string content)
 		{
 			this.Content = content;
 			return this;
 		}
 
 		/// <summary>
 		/// Adds a sticker to the message. Sticker must be from current guild.
 		/// </summary>
 		/// <param name="sticker">The sticker to add.</param>
 		/// <returns>The current builder to be chained.</returns>
 		public DiscordMessageBuilder WithSticker(DiscordSticker sticker)
 		{
 			this.Sticker = sticker;
 			return this;
 		}
 
 		/// <summary>
 		/// Adds a row of components to a message, up to 5 components per row, and up to 5 rows per message.
 		/// </summary>
 		/// <param name="components">The components to add to the message.</param>
 		/// <returns>The current builder to be chained.</returns>
 		/// <exception cref="System.ArgumentOutOfRangeException">No components were passed.</exception>
 		public DiscordMessageBuilder AddComponents(params DiscordComponent[] components)
 			=> this.AddComponents((IEnumerable<DiscordComponent>)components);
 
 
 		/// <summary>
 		/// Appends several rows of components to the message
 		/// </summary>
 		/// <param name="components">The rows of components to add, holding up to five each.</param>
 		/// <returns></returns>
 		public DiscordMessageBuilder AddComponents(IEnumerable<DiscordActionRowComponent> components)
 		{
 			var ara = components.ToArray();
 
 			if (ara.Length + this.ComponentsInternal.Count > 5)
 				throw new ArgumentException("ActionRow count exceeds maximum of five.");
 
 			foreach (var ar in ara)
 				this.ComponentsInternal.Add(ar);
 
 			return this;
 		}
 
 		/// <summary>
 		/// Adds a row of components to a message, up to 5 components per row, and up to 5 rows per message.
 		/// </summary>
 		/// <param name="components">The components to add to the message.</param>
 		/// <returns>The current builder to be chained.</returns>
 		/// <exception cref="System.ArgumentOutOfRangeException">No components were passed.</exception>
 		public DiscordMessageBuilder AddComponents(IEnumerable<DiscordComponent> components)
 		{
 			var cmpArr = components.ToArray();
 			var count = cmpArr.Length;
 
 			if (!cmpArr.Any())
 				throw new ArgumentOutOfRangeException(nameof(components), "You must provide at least one component");
 
 			if (count > 5)
 				throw new ArgumentException("Cannot add more than 5 components per action row!");
 
 			var comp = new DiscordActionRowComponent(cmpArr);
 			this.ComponentsInternal.Add(comp);
 
 			return this;
 		}
 
 		/// <summary>
 		/// Sets if the message should be TTS.
 		/// </summary>
 		/// <param name="isTts">If TTS should be set.</param>
 		/// <returns>The current builder to be chained.</returns>
 		public DiscordMessageBuilder HasTts(bool isTts)
 		{
 			this.IsTts = isTts;
 			return this;
 		}
 
 		/// <summary>
 		/// Sets the embed for the current builder.
 		/// </summary>
 		/// <param name="embed">The embed that should be set.</param>
 		/// <returns>The current builder to be chained.</returns>
 		public DiscordMessageBuilder WithEmbed(DiscordEmbed embed)
 		{
 			if (embed == null)
 				return this;
 
 			this.Embed = embed;
 			return this;
 		}
 
 		/// <summary>
 		/// Appends an embed to the current builder.
 		/// </summary>
 		/// <param name="embed">The embed that should be appended.</param>
 		/// <returns>The current builder to be chained.</returns>
 		public DiscordMessageBuilder AddEmbed(DiscordEmbed embed)
 		{
 			if (embed == null)
 				return this; //Providing null embeds will produce a 400 response from Discord.//
 			this._embeds.Add(embed);
 			return this;
 		}
 
 		/// <summary>
 		/// Appends several embeds to the current builder.
 		/// </summary>
 		/// <param name="embeds">The embeds that should be appended.</param>
 		/// <returns>The current builder to be chained.</returns>
 		public DiscordMessageBuilder AddEmbeds(IEnumerable<DiscordEmbed> embeds)
 		{
 			this._embeds.AddRange(embeds);
 			return this;
 		}
 
 		/// <summary>
 		/// Sets if the message has allowed mentions.
 		/// </summary>
 		/// <param name="allowedMention">The allowed Mention that should be sent.</param>
 		/// <returns>The current builder to be chained.</returns>
 		public DiscordMessageBuilder WithAllowedMention(IMention allowedMention)
 		{
 			if (this.Mentions != null)
 				this.Mentions.Add(allowedMention);
 			else
 				this.Mentions = new List<IMention> { allowedMention };
 
 			return this;
 		}
 
 		/// <summary>
 		/// Sets if the message has allowed mentions.
 		/// </summary>
 		/// <param name="allowedMentions">The allowed Mentions that should be sent.</param>
 		/// <returns>The current builder to be chained.</returns>
 		public DiscordMessageBuilder WithAllowedMentions(IEnumerable<IMention> allowedMentions)
 		{
 			if (this.Mentions != null)
 				this.Mentions.AddRange(allowedMentions);
 			else
 				this.Mentions = allowedMentions.ToList();
 
 			return this;
 		}
 
 		/// <summary>
 		/// Sets if the message has files to be sent.
 		/// </summary>
 		/// <param name="fileName">The fileName that the file should be sent as.</param>
 		/// <param name="stream">The Stream to the file.</param>
 		/// <param name="resetStreamPosition">Tells the API Client to reset the stream position to what it was after the file is sent.</param>
 		/// <param name="description">Description of the file.</param>
 		/// <returns>The current builder to be chained.</returns>
 		public DiscordMessageBuilder WithFile(string fileName, Stream stream, bool resetStreamPosition = false, string description = null)
 		{
 			if (this.Files.Count > 10)
 				throw new ArgumentException("Cannot send more than 10 files with a single message.");
 
 			if (this.FilesInternal.Any(x => x.FileName == fileName))
 				throw new ArgumentException("A File with that filename already exists");
 
 			if (resetStreamPosition)
 				this.FilesInternal.Add(new DiscordMessageFile(fileName, stream, stream.Position, description: description));
 			else
 				this.FilesInternal.Add(new DiscordMessageFile(fileName, stream, null, description: description));
 
 			return this;
 		}
 
 		/// <summary>
 		/// Sets if the message has files to be sent.
 		/// </summary>
 		/// <param name="stream">The Stream to the file.</param>
 		/// <param name="resetStreamPosition">Tells the API Client to reset the stream position to what it was after the file is sent.</param>
 		/// <param name="description">Description of the file.</param>
 		/// <returns>The current builder to be chained.</returns>
 		public DiscordMessageBuilder WithFile(FileStream stream, bool resetStreamPosition = false, string description = null)
 		{
 			if (this.Files.Count > 10)
 				throw new ArgumentException("Cannot send more than 10 files with a single message.");
 
 			if (this.FilesInternal.Any(x => x.FileName == stream.Name))
 				throw new ArgumentException("A File with that filename already exists");
 
 			if (resetStreamPosition)
 				this.FilesInternal.Add(new DiscordMessageFile(stream.Name, stream, stream.Position, description: description));
 			else
 				this.FilesInternal.Add(new DiscordMessageFile(stream.Name, stream, null, description: description));
 
 			return this;
 		}
 
 		/// <summary>
 		/// Sets if the message has files to be sent.
 		/// </summary>
 		/// <param name="files">The Files that should be sent.</param>
 		/// <param name="resetStreamPosition">Tells the API Client to reset the stream position to what it was after the file is sent.</param>
 		/// <returns>The current builder to be chained.</returns>
 		public DiscordMessageBuilder WithFiles(Dictionary<string, Stream> files, bool resetStreamPosition = false)
 		{
 			if (this.Files.Count + files.Count > 10)
 				throw new ArgumentException("Cannot send more than 10 files with a single message.");
 
 			foreach (var file in files)
 			{
 				if (this.FilesInternal.Any(x => x.FileName == file.Key))
 					throw new ArgumentException("A File with that filename already exists");
 
 				if (resetStreamPosition)
 					this.FilesInternal.Add(new DiscordMessageFile(file.Key, file.Value, file.Value.Position));
 				else
 					this.FilesInternal.Add(new DiscordMessageFile(file.Key, file.Value, null));
 			}
 
 			return this;
 		}
 
 		/// <summary>
 		/// Modifies the given attachments on edit.
 		/// </summary>
 		/// <param name="attachments">Attachments to edit.</param>
 		/// <returns></returns>
 		public DiscordMessageBuilder ModifyAttachments(IEnumerable<DiscordAttachment> attachments)
 		{
 			this.AttachmentsInternal.AddRange(attachments);
 			return this;
 		}
 
 		/// <summary>
 		/// Whether to keep the message attachments, if new ones are added.
 		/// </summary>
 		/// <returns></returns>
 		public DiscordMessageBuilder KeepAttachments(bool keep)
 		{
 			this.KeepAttachmentsInternal = keep;
 			return this;
 		}
 
 		/// <summary>
 		/// Sets if the message is a reply
 		/// </summary>
 		/// <param name="messageId">The ID of the message to reply to.</param>
 		/// <param name="mention">If we should mention the user in the reply.</param>
 		/// <param name="failOnInvalidReply">Whether sending a reply that references an invalid message should be </param>
 		/// <returns>The current builder to be chained.</returns>
 		public DiscordMessageBuilder WithReply(ulong messageId, bool mention = false, bool failOnInvalidReply = false)
 		{
 			this.ReplyId = messageId;
 			this.MentionOnReply = mention;
 			this.FailOnInvalidReply = failOnInvalidReply;
 
 			if (mention)
 			{
 				this.Mentions ??= new List<IMention>();
 				this.Mentions.Add(new RepliedUserMention());
 			}
 
 			return this;
 		}
 
 
 		/// <summary>
 		/// Sends the Message to a specific channel
 		/// </summary>
 		/// <param name="channel">The channel the message should be sent to.</param>
 		/// <returns>The current builder to be chained.</returns>
 		public Task<DiscordMessage> SendAsync(DiscordChannel channel) => channel.SendMessageAsync(this);
 
 		/// <summary>
 		/// Sends the modified message.
 		/// <para>Note: Message replies cannot be modified. To clear the reply, simply pass <see langword="null"/> to <see cref="WithReply"/>.</para>
 		/// </summary>
 		/// <param name="msg">The original Message to modify.</param>
 		/// <returns>The current builder to be chained.</returns>
 		public Task<DiscordMessage> ModifyAsync(DiscordMessage msg) => msg.ModifyAsync(this);
 
 		/// <summary>
 		/// Clears all message components on this builder.
 		/// </summary>
 		public void ClearComponents()
 			=> this.ComponentsInternal.Clear();
 
 		/// <summary>
 		/// Allows for clearing the Message Builder so that it can be used again to send a new message.
 		/// </summary>
 		public void Clear()
 		{
 			this.Content = "";
 			this._embeds.Clear();
 			this.IsTts = false;
 			this.Mentions = null;
 			this.FilesInternal.Clear();
 			this.ReplyId = null;
 			this.MentionOnReply = false;
 			this.ComponentsInternal.Clear();
 			this.Suppressed = false;
 			this.Sticker = null;
 			this.AttachmentsInternal.Clear();
 			this.KeepAttachmentsInternal = false;
 		}
 
 		/// <summary>
 		/// Does the validation before we send a the Create/Modify request.
 		/// </summary>
 		/// <param name="isModify">Tells the method to perform the Modify Validation or Create Validation.</param>
 		internal void Validate(bool isModify = false)
 		{
 			if (this._embeds.Count > 10)
 				throw new ArgumentException("A message can only have up to 10 embeds.");
 
 			if (!isModify)
 			{
 				if (this.Files?.Count == 0 && string.IsNullOrEmpty(this.Content) && (!this.Embeds?.Any() ?? true) && this.Sticker is null)
 					throw new ArgumentException("You must specify content, an embed, a sticker or at least one file.");
 
 				if (this.Components.Count > 5)
 					throw new InvalidOperationException("You can only have 5 action rows per message.");
 
 				if (this.Components.Any(c => c.Components.Count > 5))
 					throw new InvalidOperationException("Action rows can only have 5 components");
 			}
 		}
 	}
 }
diff --git a/DisCatSharp/Entities/Thread/DiscordThreadChannel.cs b/DisCatSharp/Entities/Thread/DiscordThreadChannel.cs
index 806f956bc..b6d095304 100644
--- a/DisCatSharp/Entities/Thread/DiscordThreadChannel.cs
+++ b/DisCatSharp/Entities/Thread/DiscordThreadChannel.cs
@@ -1,645 +1,645 @@
 // 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 System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 
 using DisCatSharp.Net.Models;
 using DisCatSharp.Net.Serialization;
 
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Entities
 {
 	/// <summary>
 	/// Represents a discord thread channel.
 	/// </summary>
 	public class DiscordThreadChannel : DiscordChannel, IEquatable<DiscordThreadChannel>
 	{
 		/// <summary>
 		/// Gets ID of the owner that started this thread.
 		/// </summary>
 		[JsonProperty("owner_id", NullValueHandling = NullValueHandling.Ignore)]
 		public ulong OwnerId { get; internal set; }
 
 		/// <summary>
 		/// Gets the name of this thread.
 		/// </summary>
 		[JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
 		public new string Name { get; internal set; }
 
 		/// <summary>
 		/// Gets the type of this thread.
 		/// </summary>
 		[JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
 		public new ChannelType Type { get; internal set; }
 
 		/// <summary>
 		/// Gets whether this thread is private.
 		/// </summary>
 		[JsonIgnore]
 		public new bool IsPrivate
 			=> this.Type == ChannelType.PrivateThread;
 
 		/// <summary>
 		/// Gets the ID of the last message sent in this thread.
 		/// </summary>
 		[JsonProperty("last_message_id", NullValueHandling = NullValueHandling.Ignore)]
 		public new ulong? LastMessageId { get; internal set; }
 
 		/// <summary>
 		/// <para>Gets the slowmode delay configured for this thread.</para>
 		/// <para>All bots, as well as users with <see cref="Permissions.ManageChannels"/> or <see cref="Permissions.ManageMessages"/> permissions in the channel are exempt from slowmode.</para>
 		/// </summary>
 		[JsonProperty("rate_limit_per_user", NullValueHandling = NullValueHandling.Ignore)]
 		public new int? PerUserRateLimit { get; internal set; }
 
 		/// <summary>
 		/// Gets an approximate count of messages in a thread, stops counting at 50.
 		/// </summary>
 		[JsonProperty("message_count", NullValueHandling = NullValueHandling.Ignore)]
 		public int? MessageCount { get; internal set; }
 
 		/// <summary>
 		/// Gets an approximate count of users in a thread, stops counting at 50.
 		/// </summary>
 		[JsonProperty("member_count", NullValueHandling = NullValueHandling.Ignore)]
 		public int? MemberCount { get; internal set; }
 
 		/// <summary>
 		/// Represents the current member for this thread. This will have a value if the user has joined the thread.
 		/// </summary>
 		[JsonProperty("member", NullValueHandling = NullValueHandling.Ignore)]
 		public DiscordThreadChannelMember CurrentMember { get; internal set; }
 
 
 		/// <summary>
 		/// Gets when the last pinned message was pinned in this thread.
 		/// </summary>
 		[JsonIgnore]
 		public new DateTimeOffset? LastPinTimestamp
 			=> !string.IsNullOrWhiteSpace(this.LastPinTimestampRaw) && DateTimeOffset.TryParse(this.LastPinTimestampRaw, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dto) ?
 				dto : null;
 
 		/// <summary>
 		/// Gets when the last pinned message was pinned in this thread as raw string.
 		/// </summary>
 		[JsonProperty("last_pin_timestamp", NullValueHandling = NullValueHandling.Ignore)]
 		internal new string LastPinTimestampRaw { get; set; }
 
 		/// <summary>
 		/// Gets the threads metadata.
 		/// </summary>
 		[JsonProperty("thread_metadata", NullValueHandling = NullValueHandling.Ignore)]
 		public DiscordThreadChannelMetadata ThreadMetadata { get; internal set; }
 
 		/// <summary>
 		/// Gets the thread members object.
 		/// </summary>
 		[JsonIgnore]
 		public IReadOnlyDictionary<ulong, DiscordThreadChannelMember> ThreadMembers => new ReadOnlyConcurrentDictionary<ulong, DiscordThreadChannelMember>(this.ThreadMembersInternal);
 
 		[JsonProperty("thread_member", NullValueHandling = NullValueHandling.Ignore)]
 		[JsonConverter(typeof(SnowflakeArrayAsDictionaryJsonConverter))]
 		internal ConcurrentDictionary<ulong, DiscordThreadChannelMember> ThreadMembersInternal;
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordThreadChannel"/> class.
 		/// </summary>
 		internal DiscordThreadChannel()
 		{ }
 
 		#region Methods
 
 		/// <summary>
 		/// Deletes a thread.
 		/// </summary>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageThreads"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public new Task DeleteAsync(string reason = null)
 			=> this.Discord.ApiClient.DeleteThreadAsync(this.Id, reason);
 
 		/// <summary>
 		/// Modifies the current thread.
 		/// </summary>
 		/// <param name="action">Action to perform on this thread</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageThreads"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		/// <exception cref="System.NotSupportedException">Thrown when the <see cref="ThreadAutoArchiveDuration"/> cannot be modified. This happens, when the guild hasn't reached a certain boost <see cref="PremiumTier"/>.</exception>
 		public Task ModifyAsync(Action<ThreadEditModel> action)
 		{
 			var mdl = new ThreadEditModel();
 			action(mdl);
 
 			var canContinue = !mdl.AutoArchiveDuration.HasValue || !mdl.AutoArchiveDuration.Value.HasValue || Utilities.CheckThreadAutoArchiveDurationFeature(this.Guild, mdl.AutoArchiveDuration.Value.Value);
 			if (mdl.Invitable.HasValue)
 			{
 				canContinue = this.Guild.Features.CanCreatePrivateThreads;
 			}
 			return canContinue ? this.Discord.ApiClient.ModifyThreadAsync(this.Id, mdl.Name, mdl.Locked, mdl.Archived, mdl.PerUserRateLimit, mdl.AutoArchiveDuration, mdl.Invitable, mdl.AuditLogReason) : throw new NotSupportedException($"Cannot modify ThreadAutoArchiveDuration. Guild needs boost tier {(mdl.AutoArchiveDuration.Value.Value == ThreadAutoArchiveDuration.ThreeDays ? "one" : "two")}.");
 		}
 
 		/// <summary>
 		/// Archives a thread.
 		/// </summary>
 		/// <param name="locked">Whether the thread should be locked.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageThreads"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task ArchiveAsync(bool locked = true, string reason = null)
 			=> this.Discord.ApiClient.ModifyThreadAsync(this.Id, null, locked, true, null, null, null, reason: reason);
 
 		/// <summary>
 		/// Unarchives a thread.
 		/// </summary>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task UnarchiveAsync(string reason = null)
 			=> this.Discord.ApiClient.ModifyThreadAsync(this.Id, null, null, false, null, null, null, reason: reason);
 
 		/// <summary>
 		/// Gets the members of a thread. Needs the <see cref="DiscordIntents.GuildMembers"/> intent.
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task<IReadOnlyList<DiscordThreadChannelMember>> GetMembersAsync()
 			=> await this.Discord.ApiClient.GetThreadMembersAsync(this.Id);
 
 		/// <summary>
 		/// Adds a member to this thread.
 		/// </summary>
 		/// <param name="memberId">The member id to be added.</param>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task AddMemberAsync(ulong memberId)
 			=> this.Discord.ApiClient.AddThreadMemberAsync(this.Id, memberId);
 
 		/// <summary>
 		/// Adds a member to this thread.
 		/// </summary>
 		/// <param name="member">The member to be added.</param>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task AddMemberAsync(DiscordMember member)
 			=> this.AddMemberAsync(member.Id);
 
 		/// <summary>
 		/// Gets a member in this thread.
 		/// </summary>
 		/// <param name="memberId">The member to be added.</param>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the member is not part of the thread.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordThreadChannelMember> GetMemberAsync(ulong memberId)
 			=> this.Discord.ApiClient.GetThreadMemberAsync(this.Id, memberId);
 
 		/// <summary>
 		/// Gets a member in this thread.
 		/// </summary>
 		/// <param name="member">The member to be added.</param>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the member is not part of the thread.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task<DiscordThreadChannelMember> GetMemberAsync(DiscordMember member)
 			=> this.Discord.ApiClient.GetThreadMemberAsync(this.Id, member.Id);
 
 		/// <summary>
 		/// Removes a member from this thread.
 		/// </summary>
 		/// <param name="memberId">The member id to be removed.</param>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task RemoveMemberAsync(ulong memberId)
 			=> this.Discord.ApiClient.RemoveThreadMemberAsync(this.Id, memberId);
 
 		/// <summary>
 		/// Removes a member from this thread. Only applicable to private threads.
 		/// </summary>
 		/// <param name="member">The member to be removed.</param>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task RemoveMemberAsync(DiscordMember member)
 			=> this.RemoveMemberAsync(member.Id);
 
 		/// <summary>
 		/// Adds a role to this thread. Only applicable to private threads.
 		/// </summary>
 		/// <param name="roleId">The role id to be added.</param>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task AddRoleAsync(ulong roleId)
 		{
 			var role = this.Guild.GetRole(roleId);
 			var members = await this.Guild.GetAllMembersAsync();
 			var roleMembers = members.Where(m => m.Roles.Contains(role));
 			foreach (var member in roleMembers)
 			{
 				await this.Discord.ApiClient.AddThreadMemberAsync(this.Id, member.Id);
 			}
 		}
 
 		/// <summary>
 		/// Adds a role to this thread. Only applicable to private threads.
 		/// </summary>
 		/// <param name="role">The role to be added.</param>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task AddRoleAsync(DiscordRole role)
 			=> this.AddRoleAsync(role.Id);
 
 		/// <summary>
 		/// Removes a role from this thread. Only applicable to private threads.
 		/// </summary>
 		/// <param name="roleId">The role id to be removed.</param>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public async Task RemoveRoleAsync(ulong roleId)
 		{
 			var role = this.Guild.GetRole(roleId);
 			var members = await this.Guild.GetAllMembersAsync();
 			var roleMembers = members.Where(m => m.Roles.Contains(role));
 			foreach (var member in roleMembers)
 			{
 				await this.Discord.ApiClient.RemoveThreadMemberAsync(this.Id, member.Id);
 			}
 		}
 
 		/// <summary>
 		/// Removes a role to from thread. Only applicable to private threads.
 		/// </summary>
 		/// <param name="role">The role to be removed.</param>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task RemoveRoleAsync(DiscordRole role)
 			=> this.RemoveRoleAsync(role.Id);
 
 		/// <summary>
 		/// Joins a thread.
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client has no access to this thread.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task JoinAsync()
 			=> this.Discord.ApiClient.JoinThreadAsync(this.Id);
 
 		/// <summary>
 		/// Leaves a thread.
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client has no access to this thread.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public Task LeaveAsync()
 			=> this.Discord.ApiClient.LeaveThreadAsync(this.Id);
 
 		/// <summary>
 		/// Sends a message to this thread.
 		/// </summary>
 		/// <param name="content">Content of the message to send.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.SendMessagesInThreads"/> permission and <see cref="Permissions.SendTtsMessages"/> if TTS is true or the thread is locked.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public new Task<DiscordMessage> SendMessageAsync(string content) =>
 			!this.IsWritable()
 				? throw new ArgumentException("Cannot send a text message to a non-thread channel.")
 				: this.Discord.ApiClient.CreateMessageAsync(this.Id, content, null, sticker: null, replyMessageId: null, mentionReply: false, failOnInvalidReply: false);
 
 		/// <summary>
 		/// Sends a message to this thread.
 		/// </summary>
 		/// <param name="embed">Embed to attach to the message.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.SendMessagesInThreads"/> permission and <see cref="Permissions.SendTtsMessages"/> if TTS is true or the thread is locked.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public new Task<DiscordMessage> SendMessageAsync(DiscordEmbed embed) =>
 			!this.IsWritable()
 				? throw new ArgumentException("Cannot send a text message to a non-thread channel.")
 				: this.Discord.ApiClient.CreateMessageAsync(this.Id, null, new[] { embed }, sticker: null, replyMessageId: null, mentionReply: false, failOnInvalidReply: false);
 
 		/// <summary>
 		/// Sends a message to this thread.
 		/// </summary>
 		/// <param name="content">Content of the message to send.</param>
 		/// <param name="embed">Embed to attach to the message.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.SendMessagesInThreads"/> permission and <see cref="Permissions.SendTtsMessages"/> if TTS is true or the thread is locked.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public new Task<DiscordMessage> SendMessageAsync(string content, DiscordEmbed embed) =>
 			!this.IsWritable()
 				? throw new ArgumentException("Cannot send a text message to a non-thread channel.")
 				: this.Discord.ApiClient.CreateMessageAsync(this.Id, content, new[] { embed }, sticker: null, replyMessageId: null, mentionReply: false, failOnInvalidReply: false);
 
 		/// <summary>
 		/// Sends a message to this thread.
 		/// </summary>
 		/// <param name="builder">The builder with all the items to thread.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.SendMessagesInThreads"/> permission and <see cref="Permissions.SendTtsMessages"/> if TTS is true or the thread is locked.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public new Task<DiscordMessage> SendMessageAsync(DiscordMessageBuilder builder)
 			=> this.Discord.ApiClient.CreateMessageAsync(this.Id, builder);
 
 		/// <summary>
 		/// Sends a message to this channel.
 		/// </summary>
 		/// <param name="action">The builder with all the items to send.</param>
 		/// <returns>The sent message.</returns>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.SendMessagesInThreads"/> permission and <see cref="Permissions.SendTtsMessages"/> if TTS is true or the thread is locked.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public new Task<DiscordMessage> SendMessageAsync(Action<DiscordMessageBuilder> action)
 		{
 			var builder = new DiscordMessageBuilder();
 			action(builder);
 
 			return !this.IsWritable()
 				? throw new ArgumentException("Cannot send a text message to a non-text channel.")
 				: this.Discord.ApiClient.CreateMessageAsync(this.Id, builder);
 		}
 
 		/// <summary>
 		/// Returns a specific message
 		/// </summary>
 		/// <param name="id">The id of the message</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.SendMessagesInThreads"/> permission and <see cref="Permissions.SendTtsMessages"/> if TTS is true or the thread is locked.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public new async Task<DiscordMessage> GetMessageAsync(ulong id) =>
 			this.Discord.Configuration.MessageCacheSize > 0
 			&& this.Discord is DiscordClient dc
 			&& dc.MessageCache != null
 			&& dc.MessageCache.TryGet(xm => xm.Id == id && xm.ChannelId == this.Id, out var msg)
 				? msg
 				: await this.Discord.ApiClient.GetMessageAsync(this.Id, id).ConfigureAwait(false);
 
 		/// <summary>
 		/// Returns a list of messages before a certain message.
 		/// <param name="limit">The amount of messages to fetch.</param>
 		/// <param name="before">Message to fetch before from.</param>
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.AccessChannels"/> or the <see cref="Permissions.ReadMessageHistory"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public new Task<IReadOnlyList<DiscordMessage>> GetMessagesBeforeAsync(ulong before, int limit = 100)
 			=> this.GetMessagesInternalAsync(limit, before, null, null);
 
 		/// <summary>
 		/// Returns a list of messages after a certain message.
 		/// <param name="limit">The amount of messages to fetch.</param>
 		/// <param name="after">Message to fetch after from.</param>
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.AccessChannels"/> or the <see cref="Permissions.ReadMessageHistory"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public new Task<IReadOnlyList<DiscordMessage>> GetMessagesAfterAsync(ulong after, int limit = 100)
 			=> this.GetMessagesInternalAsync(limit, null, after, null);
 
 		/// <summary>
 		/// Returns a list of messages around a certain message.
 		/// <param name="limit">The amount of messages to fetch.</param>
 		/// <param name="around">Message to fetch around from.</param>
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.AccessChannels"/> or the <see cref="Permissions.ReadMessageHistory"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public new Task<IReadOnlyList<DiscordMessage>> GetMessagesAroundAsync(ulong around, int limit = 100)
 			=> this.GetMessagesInternalAsync(limit, null, null, around);
 
 		/// <summary>
 		/// Returns a list of messages from the last message in the thread.
 		/// <param name="limit">The amount of messages to fetch.</param>
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.AccessChannels"/> or the <see cref="Permissions.ReadMessageHistory"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public new Task<IReadOnlyList<DiscordMessage>> GetMessagesAsync(int limit = 100) =>
 			this.GetMessagesInternalAsync(limit, null, null, null);
 
 		/// <summary>
 		/// Returns a list of messages
 		/// </summary>
 		/// <param name="limit">How many messages should be returned.</param>
 		/// <param name="before">Get messages before snowflake.</param>
 		/// <param name="after">Get messages after snowflake.</param>
 		/// <param name="around">Get messages around snowflake.</param>
 		private async Task<IReadOnlyList<DiscordMessage>> GetMessagesInternalAsync(int limit = 100, ulong? before = null, ulong? after = null, ulong? around = null)
 		{
 			if (this.Type != ChannelType.PublicThread && this.Type != ChannelType.PrivateThread && this.Type != ChannelType.NewsThread)
 				throw new ArgumentException("Cannot get the messages of a non-thread channel.");
 
 			if (limit < 0)
 				throw new ArgumentException("Cannot get a negative number of messages.");
 
 			if (limit == 0)
 				return Array.Empty<DiscordMessage>();
 
 			//return this.Discord.ApiClient.GetChannelMessagesAsync(this.Id, limit, before, after, around);
 			if (limit > 100 && around != null)
 				throw new InvalidOperationException("Cannot get more than 100 messages around the specified ID.");
 
 			var msgs = new List<DiscordMessage>(limit);
 			var remaining = limit;
 			ulong? last = null;
 			var isAfter = after != null;
 
 			int lastCount;
 			do
 			{
 				var fetchSize = remaining > 100 ? 100 : remaining;
 				var fetch = await this.Discord.ApiClient.GetChannelMessagesAsync(this.Id, fetchSize, !isAfter ? last ?? before : null, isAfter ? last ?? after : null, around).ConfigureAwait(false);
 
 				lastCount = fetch.Count;
 				remaining -= lastCount;
 
 				if (!isAfter)
 				{
 					msgs.AddRange(fetch);
 					last = fetch.LastOrDefault()?.Id;
 				}
 				else
 				{
 					msgs.InsertRange(0, fetch);
 					last = fetch.FirstOrDefault()?.Id;
 				}
 			}
 			while (remaining > 0 && lastCount > 0);
 
-			return new ReadOnlyCollection<DiscordMessage>(msgs);
+			return msgs;
 		}
 
 		/// <summary>
 		/// Deletes multiple messages if they are less than 14 days old.  If they are older, none of the messages will be deleted and you will receive a <see cref="DisCatSharp.Exceptions.BadRequestException"/> error.
 		/// </summary>
 		/// <param name="messages">A collection of messages to delete.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageMessages"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public new async Task DeleteMessagesAsync(IEnumerable<DiscordMessage> messages, string reason = null)
 		{
 			// don't enumerate more than once
 			var msgs = messages.Where(x => x.Channel.Id == this.Id).Select(x => x.Id).ToArray();
 			if (messages == null || !msgs.Any())
 				throw new ArgumentException("You need to specify at least one message to delete.");
 
 			if (msgs.Length < 2)
 			{
 				await this.Discord.ApiClient.DeleteMessageAsync(this.Id, msgs.Single(), reason).ConfigureAwait(false);
 				return;
 			}
 
 			for (var i = 0; i < msgs.Length; i += 100)
 				await this.Discord.ApiClient.DeleteMessagesAsync(this.Id, msgs.Skip(i).Take(100), reason).ConfigureAwait(false);
 		}
 
 		/// <summary>
 		/// Deletes a message
 		/// </summary>
 		/// <param name="message">The message to be deleted.</param>
 		/// <param name="reason">Reason for audit logs.</param>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.ManageMessages"/> permission.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public new Task DeleteMessageAsync(DiscordMessage message, string reason = null)
 			=> this.Discord.ApiClient.DeleteMessageAsync(this.Id, message.Id, reason);
 
 		/// <summary>
 		/// Post a typing indicator
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public new Task TriggerTypingAsync() =>
 			this.Type != ChannelType.PublicThread && this.Type != ChannelType.PrivateThread && this.Type != ChannelType.NewsThread
 				? throw new ArgumentException("Cannot start typing in a non-text channel.")
 				: this.Discord.ApiClient.TriggerTypingAsync(this.Id);
 
 		/// <summary>
 		/// Returns all pinned messages
 		/// </summary>
 		/// <exception cref="DisCatSharp.Exceptions.UnauthorizedException">Thrown when the client does not have the <see cref="Permissions.AccessChannels"/> permission or the client is missing <see cref="Permissions.ReadMessageHistory"/>.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.NotFoundException">Thrown when the thread does not exist.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
 		/// <exception cref="DisCatSharp.Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
 		public new Task<IReadOnlyList<DiscordMessage>> GetPinnedMessagesAsync() =>
 			this.Type != ChannelType.PublicThread && this.Type != ChannelType.PrivateThread && this.Type != ChannelType.News
 				? throw new ArgumentException("A non-thread channel does not have pinned messages.")
 				: this.Discord.ApiClient.GetPinnedMessagesAsync(this.Id);
 
 		/// <summary>
 		/// Returns a string representation of this thread.
 		/// </summary>
 		/// <returns>String representation of this thread.</returns>
 		public override string ToString()
 			=> this.Type switch
 				{
 					ChannelType.NewsThread => $"News thread {this.Name} ({this.Id})",
 					ChannelType.PublicThread => $"Thread {this.Name} ({this.Id})",
 					ChannelType.PrivateThread => $"Private thread {this.Name} ({this.Id})",
 					_ => $"Thread {this.Name} ({this.Id})",
 				};
 		#endregion
 
 		/// <summary>
 		/// Checks whether this <see cref="DiscordThreadChannel"/> is equal to another object.
 		/// </summary>
 		/// <param name="obj">Object to compare to.</param>
 		/// <returns>Whether the object is equal to this <see cref="DiscordThreadChannel"/>.</returns>
 		public override bool Equals(object obj) => this.Equals(obj as DiscordThreadChannel);
 
 		/// <summary>
 		/// Checks whether this <see cref="DiscordThreadChannel"/> is equal to another <see cref="DiscordThreadChannel"/>.
 		/// </summary>
 		/// <param name="e"><see cref="DiscordThreadChannel"/> to compare to.</param>
 		/// <returns>Whether the <see cref="DiscordThreadChannel"/> is equal to this <see cref="DiscordThreadChannel"/>.</returns>
 		public bool Equals(DiscordThreadChannel e) => e is not null && (ReferenceEquals(this, e) || this.Id == e.Id);
 
 		/// <summary>
 		/// Gets the hash code for this <see cref="DiscordThreadChannel"/>.
 		/// </summary>
 		/// <returns>The hash code for this <see cref="DiscordThreadChannel"/>.</returns>
 		public override int GetHashCode() => this.Id.GetHashCode();
 
 		/// <summary>
 		/// Gets whether the two <see cref="DiscordThreadChannel"/> objects are equal.
 		/// </summary>
 		/// <param name="e1">First channel to compare.</param>
 		/// <param name="e2">Second channel to compare.</param>
 		/// <returns>Whether the two channels are equal.</returns>
 		public static bool operator ==(DiscordThreadChannel e1, DiscordThreadChannel e2)
 		{
 			var o1 = e1 as object;
 			var o2 = e2 as object;
 
 			return (o1 != null || o2 == null) && (o1 == null || o2 != null) && ((o1 == null && o2 == null) || e1.Id == e2.Id);
 		}
 
 		/// <summary>
 		/// Gets whether the two <see cref="DiscordThreadChannel"/> objects are not equal.
 		/// </summary>
 		/// <param name="e1">First channel to compare.</param>
 		/// <param name="e2">Second channel to compare.</param>
 		/// <returns>Whether the two channels are not equal.</returns>
 		public static bool operator !=(DiscordThreadChannel e1, DiscordThreadChannel e2)
 			=> !(e1 == e2);
 	}
 }
diff --git a/DisCatSharp/Entities/User/DiscordTeam.cs b/DisCatSharp/Entities/User/DiscordTeam.cs
index 45ea9248e..dd608776a 100644
--- a/DisCatSharp/Entities/User/DiscordTeam.cs
+++ b/DisCatSharp/Entities/User/DiscordTeam.cs
@@ -1,203 +1,203 @@
 // 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 System.Collections.Generic;
 using System.Globalization;
 
 using DisCatSharp.Enums;
 using DisCatSharp.Net;
 using DisCatSharp.Net.Abstractions;
 
 namespace DisCatSharp.Entities
 {
 	/// <summary>
 	/// Represents a team consisting of users. A team can own an application.
 	/// </summary>
 	public sealed class DiscordTeam : SnowflakeObject, IEquatable<DiscordTeam>
 	{
 		/// <summary>
 		/// Gets the team's name.
 		/// </summary>
 		public string Name { get; internal set; }
 
 		/// <summary>
 		/// Gets the team's icon hash.
 		/// </summary>
 		public string IconHash { get; internal set; }
 
 		/// <summary>
 		/// Gets the team's icon.
 		/// </summary>
 		public string Icon
 			=> !string.IsNullOrWhiteSpace(this.IconHash) ? $"{DiscordDomain.GetDomain(CoreDomain.DiscordCdn).Url}{Endpoints.TEAM_ICONS}/{this.Id.ToString(CultureInfo.InvariantCulture)}/{this.IconHash}.png?size=1024" : null;
 
 		/// <summary>
 		/// Gets the owner of the team.
 		/// </summary>
 		public DiscordUser Owner { get; internal set; }
 
 		/// <summary>
 		/// Gets the members of this team.
 		/// </summary>
 		public IReadOnlyList<DiscordTeamMember> Members { get; internal set; }
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordTeam"/> class.
 		/// </summary>
 		/// <param name="tt">The tt.</param>
 		internal DiscordTeam(TransportTeam tt)
 		{
 			this.Id = tt.Id;
 			this.Name = tt.Name;
 			this.IconHash = tt.IconHash;
 		}
 
 		/// <summary>
 		/// Compares this team to another object and returns whether they are equal.
 		/// </summary>
 		/// <param name="obj">Object to compare this team to.</param>
 		/// <returns>Whether this team is equal to the given object.</returns>
 		public override bool Equals(object obj)
 			=> obj is DiscordTeam other && this == other;
 
 		/// <summary>
 		/// Compares this team to another team and returns whether they are equal.
 		/// </summary>
 		/// <param name="other">Team to compare to.</param>
 		/// <returns>Whether the teams are equal.</returns>
 		public bool Equals(DiscordTeam other)
 			=> this == other;
 
 		/// <summary>
 		/// Gets the hash code of this team.
 		/// </summary>
 		/// <returns>Hash code of this team.</returns>
 		public override int GetHashCode()
 			=> this.Id.GetHashCode();
 
 		/// <summary>
 		/// Converts this team to its string representation.
 		/// </summary>
 		/// <returns>The string representation of this team.</returns>
 		public override string ToString()
 			=> $"Team: {this.Name} ({this.Id})";
 
 		public static bool operator ==(DiscordTeam left, DiscordTeam right)
 			=> left?.Id == right?.Id;
 
 		public static bool operator !=(DiscordTeam left, DiscordTeam right)
 			=> left?.Id != right?.Id;
 	}
 
 	/// <summary>
 	/// Represents a member of <see cref="DiscordTeam"/>.
 	/// </summary>
 	public sealed class DiscordTeamMember : IEquatable<DiscordTeamMember>
 	{
 		/// <summary>
 		/// Gets the member's membership status.
 		/// </summary>
 		public DiscordTeamMembershipStatus MembershipStatus { get; internal set; }
 
 		/// <summary>
 		/// Gets the member's permissions within the team.
 		/// </summary>
-		public IReadOnlyCollection<string> Permissions { get; internal set; }
+		public IReadOnlyList<string> Permissions { get; internal set; }
 
 		/// <summary>
 		/// Gets the id of the team this member belongs to.
 		/// </summary>
 		public ulong? TeamId { get; internal set; }
 
 		/// <summary>
 		/// Gets the name of the team this member belongs to.
 		/// </summary>
 		public string TeamName { get; internal set; }
 
 		/// <summary>
 		/// Gets the user who is the team member.
 		/// </summary>
 		public DiscordUser User { get; internal set; }
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordTeamMember"/> class.
 		/// </summary>
 		/// <param name="ttm">The ttm.</param>
 		internal DiscordTeamMember(TransportTeamMember ttm)
 		{
 			this.MembershipStatus = (DiscordTeamMembershipStatus)ttm.MembershipState;
 			this.Permissions = new ReadOnlySet<string>(new HashSet<string>(ttm.Permissions));
 		}
 
 		/// <summary>
 		/// Compares this team member to another object and returns whether they are equal.
 		/// </summary>
 		/// <param name="obj">Object to compare to.</param>
 		/// <returns>Whether this team is equal to given object.</returns>
 		public override bool Equals(object obj)
 			=> obj is DiscordTeamMember other && this == other;
 
 		/// <summary>
 		/// Compares this team member to another team member and returns whether they are equal.
 		/// </summary>
 		/// <param name="other">Team member to compare to.</param>
 		/// <returns>Whether this team member is equal to the given one.</returns>
 		public bool Equals(DiscordTeamMember other)
 			=> this == other;
 
 		/// <summary>
 		/// Gets a hash code of this team member.
 		/// </summary>
 		/// <returns>Hash code of this team member.</returns>
 		public override int GetHashCode() => HashCode.Combine(this.User, this.TeamId);
 
 		/// <summary>
 		/// Converts this team member to their string representation.
 		/// </summary>
 		/// <returns>String representation of this team member.</returns>
 		public override string ToString()
 			=> $"Team member: {this.User.Username}#{this.User.Discriminator} ({this.User.Id}), part of team {this.TeamName} ({this.TeamId})";
 
 		public static bool operator ==(DiscordTeamMember left, DiscordTeamMember right)
 			=> left?.TeamId == right?.TeamId && left?.User?.Id == right?.User?.Id;
 
 		public static bool operator !=(DiscordTeamMember left, DiscordTeamMember right)
 			=> left?.TeamId != right?.TeamId || left?.User?.Id != right?.User?.Id;
 	}
 
 	/// <summary>
 	/// Signifies the status of user's team membership.
 	/// </summary>
 	public enum DiscordTeamMembershipStatus : int
 	{
 		/// <summary>
 		/// Indicates that this user is invited to the team, and is pending membership.
 		/// </summary>
 		Invited = 1,
 
 		/// <summary>
 		/// Indicates that this user is a member of the team.
 		/// </summary>
 		Accepted = 2
 	}
 }
diff --git a/DisCatSharp/EventArgs/Guild/Member/GuildMembersChunkEventArgs.cs b/DisCatSharp/EventArgs/Guild/Member/GuildMembersChunkEventArgs.cs
index dc46d2d12..f7e4ea8f2 100644
--- a/DisCatSharp/EventArgs/Guild/Member/GuildMembersChunkEventArgs.cs
+++ b/DisCatSharp/EventArgs/Guild/Member/GuildMembersChunkEventArgs.cs
@@ -1,75 +1,75 @@
 // 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 System.Collections.Generic;
 
 using DisCatSharp.Entities;
 
 namespace DisCatSharp.EventArgs
 {
 	/// <summary>
 	/// Represents arguments for <see cref="DiscordClient.GuildMembersChunked"/> event.
 	/// </summary>
 	public class GuildMembersChunkEventArgs : DiscordEventArgs
 	{
 		/// <summary>
 		/// Gets the guild that requested this chunk.
 		/// </summary>
 		public DiscordGuild Guild { get; internal set; }
 
 		/// <summary>
 		/// Gets the collection of members returned from this chunk.
 		/// </summary>
-		public IReadOnlyCollection<DiscordMember> Members { get; internal set; }
+		public IReadOnlyList<DiscordMember> Members { get; internal set; }
 
 		/// <summary>
 		/// Gets the current chunk index from the response.
 		/// </summary>
 		public int ChunkIndex { get; internal set; }
 
 		/// <summary>
 		/// Gets the total amount of chunks for the request.
 		/// </summary>
 		public int ChunkCount { get; internal set; }
 
 		/// <summary>
 		/// Gets the collection of presences returned from this chunk, if specified.
 		/// </summary>
-		public IReadOnlyCollection<DiscordPresence> Presences { get; internal set; }
+		public IReadOnlyList<DiscordPresence> Presences { get; internal set; }
 
 		/// <summary>
 		/// Gets the returned Ids that were not found in the chunk, if specified.
 		/// </summary>
-		public IReadOnlyCollection<ulong> NotFound { get; internal set; }
+		public IReadOnlyList<ulong> NotFound { get; internal set; }
 
 		/// <summary>
 		/// Gets the unique string used to identify the request, if specified.
 		/// </summary>
 		public string Nonce { get; set; }
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="GuildMembersChunkEventArgs"/> class.
 		/// </summary>
 		internal GuildMembersChunkEventArgs(IServiceProvider provider) : base(provider) { }
 	}
 }
diff --git a/DisCatSharp/Logging/CompositeDefaultLogger.cs b/DisCatSharp/Logging/CompositeDefaultLogger.cs
index c855a1956..f25dddad0 100644
--- a/DisCatSharp/Logging/CompositeDefaultLogger.cs
+++ b/DisCatSharp/Logging/CompositeDefaultLogger.cs
@@ -1,79 +1,79 @@
 // 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 System.Collections.Generic;
 using System.Linq;
 
 using Microsoft.Extensions.Logging;
 
 namespace DisCatSharp
 {
 	/// <summary>
 	/// Represents a composite default logger.
 	/// </summary>
 	internal class CompositeDefaultLogger : ILogger<BaseDiscordClient>
 	{
 		/// <summary>
 		/// Gets the loggers.
 		/// </summary>
-		private readonly IEnumerable<ILogger<BaseDiscordClient>> _loggers;
+		private readonly ILogger<BaseDiscordClient>[] _loggers;
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="CompositeDefaultLogger"/> class.
 		/// </summary>
 		/// <param name="providers">The providers.</param>
 		public CompositeDefaultLogger(IEnumerable<ILoggerProvider> providers)
 		{
 			this._loggers = providers.Select(x => x.CreateLogger(typeof(BaseDiscordClient).FullName))
 				.OfType<ILogger<BaseDiscordClient>>()
-				.ToList();
+				.ToArray();
 		}
 
 		/// <summary>
 		/// Whether the logger is enabled.
 		/// </summary>
 		/// <param name="logLevel">The log level.</param>
 		public bool IsEnabled(LogLevel logLevel)
 			=> true;
 
 		/// <summary>
 		/// Logs an event.
 		/// </summary>
 		/// <param name="logLevel">The log level.</param>
 		/// <param name="eventId">The event id.</param>
 		/// <param name="state">The state.</param>
 		/// <param name="exception">The exception.</param>
 		/// <param name="formatter">The formatter.</param>
 		public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
 		{
 			foreach (var logger in this._loggers)
 				logger.Log(logLevel, eventId, state, exception, formatter);
 		}
 
 		/// <summary>
 		/// Begins the scope.
 		/// </summary>
 		/// <param name="state">The state.</param>
 		public IDisposable BeginScope<TState>(TState state) => throw new NotImplementedException();
 	}
 }
diff --git a/DisCatSharp/Net/Abstractions/Rest/RestApplicationCommandPayloads.cs b/DisCatSharp/Net/Abstractions/Rest/RestApplicationCommandPayloads.cs
index f073c2e14..e926015e9 100644
--- a/DisCatSharp/Net/Abstractions/Rest/RestApplicationCommandPayloads.cs
+++ b/DisCatSharp/Net/Abstractions/Rest/RestApplicationCommandPayloads.cs
@@ -1,235 +1,235 @@
 // 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.Collections.Generic;
 
 using DisCatSharp.Entities;
 using DisCatSharp.Enums;
 
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Net.Abstractions
 {
 	/// <summary>
 	/// Represents a application command create payload.
 	/// </summary>
 	internal class RestApplicationCommandCreatePayload
 	{
 		/// <summary>
 		/// Gets the type.
 		/// </summary>
 		[JsonProperty("type")]
 		public ApplicationCommandType Type { get; set; }
 
 		/// <summary>
 		/// Gets the name.
 		/// </summary>
 		[JsonProperty("name")]
 		public string Name { get; set; }
 
 		/// <summary>
 		/// Gets the name localizations.
 		/// </summary>
 		[JsonProperty("name_localizations", NullValueHandling = NullValueHandling.Ignore)]
 		public Optional<Dictionary<string, string>> NameLocalizations { get; set; }
 
 		/// <summary>
 		/// Gets the description.
 		/// </summary>
 		[JsonProperty("description", NullValueHandling = NullValueHandling.Ignore)]
 		public string Description { get; set; }
 
 		/// <summary>
 		/// Gets the description localizations.
 		/// </summary>
 		[JsonProperty("description_localizations", NullValueHandling = NullValueHandling.Ignore)]
 		public Optional<Dictionary<string, string>> DescriptionLocalizations { get; set; }
 
 		/// <summary>
 		/// Gets the options.
 		/// </summary>
 		[JsonProperty("options", NullValueHandling = NullValueHandling.Ignore)]
 		public IEnumerable<DiscordApplicationCommandOption> Options { get; set; }
 
 		/// <summary>
 		/// Whether the command is allowed for everyone.
 		/// </summary>
 		[JsonProperty("default_permission")]
 		public bool DefaultPermission { get; set; } = true;
 
 		/// <summary>
 		/// The command needed permissions.
 		/// </summary>
 		[JsonProperty("default_member_permissions", NullValueHandling = NullValueHandling.Include)]
 		public Permissions? DefaultMemberPermission { get; set; }
 
 		/// <summary>
 		/// Whether the command is allowed for dms.
 		/// </summary>
 		[JsonProperty("dm_permission", NullValueHandling = NullValueHandling.Include)]
 		public bool? DmPermission { get; set; }
 	}
 
 	/// <summary>
 	/// Represents a application command edit payload.
 	/// </summary>
 	internal class RestApplicationCommandEditPayload
 	{
 		/// <summary>
 		/// Gets the name.
 		/// </summary>
 		[JsonProperty("name")]
 		public Optional<string> Name { get; set; }
 
 		/// <summary>
 		/// Gets the name localizations.
 		/// </summary>
 		[JsonProperty("name_localizations")]
 		public Optional<Dictionary<string, string>> NameLocalizations { get; set; }
 
 		/// <summary>
 		/// Gets the description.
 		/// </summary>
 		[JsonProperty("description")]
 		public Optional<string> Description { get; set; }
 
 		/// <summary>
 		/// Gets the description localizations.
 		/// </summary>
 		[JsonProperty("description_localizations")]
 		public Optional<Dictionary<string, string>> DescriptionLocalizations { get; set; }
 
 		/// <summary>
 		/// Gets the options.
 		/// </summary>
 		[JsonProperty("options")]
-		public Optional<IReadOnlyCollection<DiscordApplicationCommandOption>> Options { get; set; }
+		public Optional<IReadOnlyList<DiscordApplicationCommandOption>> Options { get; set; }
 
 		/// <summary>
 		/// Gets the default permission.
 		/// </summary>
 		[JsonProperty("default_permission")]
 		public Optional<bool> DefaultPermission { get; set; } = true;
 
 		/// <summary>
 		/// The command needed permissions.
 		/// </summary>
 		[JsonProperty("default_member_permissions", NullValueHandling = NullValueHandling.Include)]
 		public Optional<Permissions> DefaultMemberPermission { get; set; }
 
 		/// <summary>
 		/// Whether the command is allowed for dms.
 		/// </summary>
 		[JsonProperty("dm_permission", NullValueHandling = NullValueHandling.Include)]
 		public Optional<bool> DmPermission { get; set; }
 	}
 
 	/// <summary>
 	/// Represents a interaction response payload.
 	/// </summary>
 	internal class RestInteractionResponsePayload
 	{
 		/// <summary>
 		/// Gets the type.
 		/// </summary>
 		[JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
 		public InteractionResponseType Type { get; set; }
 
 		/// <summary>
 		/// Gets the data.
 		/// </summary>
 		[JsonProperty("data", NullValueHandling = NullValueHandling.Ignore)]
 		public DiscordInteractionApplicationCommandCallbackData Data { get; set; }
 
 		/// <summary>
 		/// Gets the attachments.
 		/// </summary>
 		[JsonProperty("attachments", NullValueHandling = NullValueHandling.Ignore)]
 		public List<DiscordAttachment> Attachments { get; set; }
 	}
 
 	/// <summary>
 	/// Represents a interaction response payload.
 	/// </summary>
 	internal class RestInteractionModalResponsePayload
 	{
 		/// <summary>
 		/// Gets the type.
 		/// </summary>
 		[JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
 		public InteractionResponseType Type { get; set; }
 
 		/// <summary>
 		/// Gets the data.
 		/// </summary>
 		[JsonProperty("data", NullValueHandling = NullValueHandling.Ignore)]
 		public DiscordInteractionApplicationCommandModalCallbackData Data { get; set; }
 	}
 
 	/// <summary>
 	/// Represents a followup message create payload.
 	/// </summary>
 	internal class RestFollowupMessageCreatePayload
 	{
 		/// <summary>
 		/// Gets the content.
 		/// </summary>
 		[JsonProperty("content", NullValueHandling = NullValueHandling.Ignore)]
 		public string Content { get; set; }
 
 		/// <summary>
 		/// Get whether the message is tts.
 		/// </summary>
 		[JsonProperty("tts", NullValueHandling = NullValueHandling.Ignore)]
 		public bool? IsTts { get; set; }
 
 		/// <summary>
 		/// Gets the embeds.
 		/// </summary>
 		[JsonProperty("embeds", NullValueHandling = NullValueHandling.Ignore)]
 		public IEnumerable<DiscordEmbed> Embeds { get; set; }
 
 		/// <summary>
 		/// Gets the mentions.
 		/// </summary>
 		[JsonProperty("allowed_mentions", NullValueHandling = NullValueHandling.Ignore)]
 		public DiscordMentions Mentions { get; set; }
 
 		/// <summary>
 		/// Gets the flags.
 		/// </summary>
 		[JsonProperty("flags", NullValueHandling = NullValueHandling.Ignore)]
 		public int? Flags { get; set; }
 
 		/// <summary>
 		/// Gets the components.
 		/// </summary>
 		[JsonProperty("components", NullValueHandling = NullValueHandling.Ignore)]
-		public IReadOnlyCollection<DiscordActionRowComponent> Components { get; set; }
+		public IReadOnlyList<DiscordActionRowComponent> Components { get; set; }
 
 		/// <summary>
 		/// Gets attachments.
 		/// </summary>
 		[JsonProperty("attachments", NullValueHandling = NullValueHandling.Ignore)]
 		public List<DiscordAttachment> Attachments { get; set; }
 	}
 }
diff --git a/DisCatSharp/Net/Abstractions/Rest/RestChannelPayloads.cs b/DisCatSharp/Net/Abstractions/Rest/RestChannelPayloads.cs
index a23ad3828..6b77bad07 100644
--- a/DisCatSharp/Net/Abstractions/Rest/RestChannelPayloads.cs
+++ b/DisCatSharp/Net/Abstractions/Rest/RestChannelPayloads.cs
@@ -1,505 +1,505 @@
 // 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.Collections.Generic;
 
 using DisCatSharp.Entities;
 
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Net.Abstractions
 {
 	/// <summary>
 	/// Represents a channel create payload.
 	/// </summary>
 	internal sealed class RestChannelCreatePayload
 	{
 		/// <summary>
 		/// Gets or sets the name.
 		/// </summary>
 		[JsonProperty("name")]
 		public string Name { get; set; }
 
 		/// <summary>
 		/// Gets or sets the type.
 		/// </summary>
 		[JsonProperty("type")]
 		public ChannelType Type { get; set; }
 
 		/// <summary>
 		/// Gets or sets the parent.
 		/// </summary>
 		[JsonProperty("parent_id", NullValueHandling = NullValueHandling.Ignore)]
 		public ulong? Parent { get; set; }
 
 		/// <summary>
 		/// Gets or sets the topic.
 		/// </summary>
 		[JsonProperty("topic")]
 		public Optional<string> Topic { get; set; }
 
 		/// <summary>
 		/// Gets or sets the bitrate.
 		/// </summary>
 		[JsonProperty("bitrate", NullValueHandling = NullValueHandling.Ignore)]
 		public int? Bitrate { get; set; }
 
 		/// <summary>
 		/// Gets or sets the user limit.
 		/// </summary>
 		[JsonProperty("user_limit", NullValueHandling = NullValueHandling.Ignore)]
 		public int? UserLimit { get; set; }
 
 		/// <summary>
 		/// Gets or sets the permission overwrites.
 		/// </summary>
 		[JsonProperty("permission_overwrites", NullValueHandling = NullValueHandling.Ignore)]
 		public IEnumerable<DiscordRestOverwrite> PermissionOverwrites { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value indicating whether nsfw.
 		/// </summary>
 		[JsonProperty("nsfw", NullValueHandling = NullValueHandling.Ignore)]
 		public bool? Nsfw { get; set; }
 
 		/// <summary>
 		/// Gets or sets the per user rate limit.
 		/// </summary>
 		[JsonProperty("rate_limit_per_user")]
 		public Optional<int?> PerUserRateLimit { get; set; }
 
 		/// <summary>
 		/// Gets or sets the quality mode.
 		/// </summary>
 		[JsonProperty("video_quality_mode", NullValueHandling = NullValueHandling.Ignore)]
 		public VideoQualityMode? QualityMode { get; set; }
 
 		/// <summary>
 		/// Gets or sets the default auto archive duration.
 		/// </summary>
 		[JsonProperty("default_auto_archive_duration", NullValueHandling = NullValueHandling.Ignore)]
 		public ThreadAutoArchiveDuration? DefaultAutoArchiveDuration { get; set; }
 	}
 
 	/// <summary>
 	/// Represents a channel modify payload.
 	/// </summary>
 	internal sealed class RestChannelModifyPayload
 	{
 		/// <summary>
 		/// Gets or sets the name.
 		/// </summary>
 		[JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
 		public string Name { get; set; }
 
 		/// <summary>
 		/// Gets or sets the type.
 		/// </summary>
 		[JsonProperty("type")]
 		public Optional<ChannelType> Type { get; set; }
 
 		/// <summary>
 		/// Gets or sets the position.
 		/// </summary>
 		[JsonProperty("position", NullValueHandling = NullValueHandling.Ignore)]
 		public int? Position { get; set; }
 
 		/// <summary>
 		/// Gets or sets the topic.
 		/// </summary>
 		[JsonProperty("topic")]
 		public Optional<string> Topic { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value indicating whether nsfw.
 		/// </summary>
 		[JsonProperty("nsfw", NullValueHandling = NullValueHandling.Ignore)]
 		public bool? Nsfw { get; set; }
 
 		/// <summary>
 		/// Gets or sets the parent.
 		/// </summary>
 		[JsonProperty("parent_id")]
 		public Optional<ulong?> Parent { get; set; }
 
 		/// <summary>
 		/// Gets or sets the bitrate.
 		/// </summary>
 		[JsonProperty("bitrate", NullValueHandling = NullValueHandling.Ignore)]
 		public int? Bitrate { get; set; }
 
 		/// <summary>
 		/// Gets or sets the user limit.
 		/// </summary>
 		[JsonProperty("user_limit", NullValueHandling = NullValueHandling.Ignore)]
 		public int? UserLimit { get; set; }
 
 		/// <summary>
 		/// Gets or sets the per user rate limit.
 		/// </summary>
 		[JsonProperty("rate_limit_per_user")]
 		public Optional<int?> PerUserRateLimit { get; set; }
 
 		/// <summary>
 		/// Gets or sets the rtc region.
 		/// </summary>
 		[JsonProperty("rtc_region")]
 		public Optional<string> RtcRegion { get; set; }
 
 		/// <summary>
 		/// Gets or sets the quality mode.
 		/// </summary>
 		[JsonProperty("video_quality_mode", NullValueHandling = NullValueHandling.Ignore)]
 		public VideoQualityMode? QualityMode { get; set; }
 
 		/// <summary>
 		/// Gets or sets the default auto archive duration.
 		/// </summary>
 		[JsonProperty("default_auto_archive_duration", NullValueHandling = NullValueHandling.Ignore)]
 		public ThreadAutoArchiveDuration? DefaultAutoArchiveDuration { get; set; }
 
 		/// <summary>
 		/// Gets or sets the permission overwrites.
 		/// </summary>
 		[JsonProperty("permission_overwrites", NullValueHandling = NullValueHandling.Ignore)]
 		public IEnumerable<DiscordRestOverwrite> PermissionOverwrites { get; set; }
 
 		/// <summary>
 		/// Gets or sets the banner base64.
 		/// </summary>
 		[JsonProperty("banner")]
 		public Optional<string> BannerBase64 { get; set; }
 	}
 
 	/// <summary>
 	/// Represents a channel message edit payload.
 	/// </summary>
 	internal class RestChannelMessageEditPayload
 	{
 		/// <summary>
 		/// Gets or sets the content.
 		/// </summary>
 		[JsonProperty("content", NullValueHandling = NullValueHandling.Include)]
 		public string Content { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value indicating whether has content.
 		/// </summary>
 		[JsonIgnore]
 		public bool HasContent { get; set; }
 
 		/// <summary>
 		/// Gets or sets the embeds.
 		/// </summary>
 		[JsonProperty("embeds", NullValueHandling = NullValueHandling.Ignore)]
 		public IEnumerable<DiscordEmbed> Embeds { get; set; }
 
 		/// <summary>
 		/// Gets or sets the mentions.
 		/// </summary>
 		[JsonProperty("allowed_mentions", NullValueHandling = NullValueHandling.Ignore)]
 		public DiscordMentions Mentions { get; set; }
 
 		/// <summary>
 		/// Gets or sets the attachments.
 		/// </summary>
 		[JsonProperty("attachments", NullValueHandling = NullValueHandling.Ignore)]
 		public IEnumerable<DiscordAttachment> Attachments { get; set; }
 
 		/// <summary>
 		/// Gets or sets the flags.
 		/// </summary>
 		[JsonProperty("flags", NullValueHandling = NullValueHandling.Ignore)]
 		public MessageFlags? Flags { get; set; }
 
 		/// <summary>
 		/// Gets or sets the components.
 		/// </summary>
 		[JsonProperty("components", NullValueHandling = NullValueHandling.Ignore)]
-		public IReadOnlyCollection<DiscordActionRowComponent> Components { get; set; }
+		public IReadOnlyList<DiscordActionRowComponent> Components { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value indicating whether has embed.
 		/// </summary>
 		[JsonIgnore]
 		public bool HasEmbed { get; set; }
 
 		/// <summary>
 		/// Should serialize the content.
 		/// </summary>
 		public bool ShouldSerializeContent()
 			=> this.HasContent;
 
 		/// <summary>
 		/// Should serialize the embed.
 		/// </summary>
 		public bool ShouldSerializeEmbed()
 			=> this.HasEmbed;
 	}
 
 	/// <summary>
 	/// Represents a channel message create payload.
 	/// </summary>
 	internal sealed class RestChannelMessageCreatePayload : RestChannelMessageEditPayload
 	{
 		/// <summary>
 		/// Gets or sets a value indicating whether t t is s.
 		/// </summary>
 		[JsonProperty("tts", NullValueHandling = NullValueHandling.Ignore)]
 		public bool? IsTts { get; set; }
 
 		/// <summary>
 		/// Gets or sets the stickers ids.
 		/// </summary>
 		[JsonProperty("sticker_ids", NullValueHandling = NullValueHandling.Ignore)]
 		public IEnumerable<ulong> StickersIds { get; set; }
 
 		/// <summary>
 		/// Gets or sets the message reference.
 		/// </summary>
 		[JsonProperty("message_reference", NullValueHandling = NullValueHandling.Ignore)]
 		public InternalDiscordMessageReference? MessageReference { get; set; }
 
 	}
 
 	/// <summary>
 	/// Represents a channel message create multipart payload.
 	/// </summary>
 	internal sealed class RestChannelMessageCreateMultipartPayload
 	{
 		/// <summary>
 		/// Gets or sets the content.
 		/// </summary>
 		[JsonProperty("content", NullValueHandling = NullValueHandling.Ignore)]
 		public string Content { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value indicating whether t t is s.
 		/// </summary>
 		[JsonProperty("tts", NullValueHandling = NullValueHandling.Ignore)]
 		public bool? IsTts { get; set; }
 
 		/// <summary>
 		/// Gets or sets the embeds.
 		/// </summary>
 		[JsonProperty("embeds", NullValueHandling = NullValueHandling.Ignore)]
 		public IEnumerable<DiscordEmbed> Embeds { get; set; }
 
 		/// <summary>
 		/// Gets or sets the mentions.
 		/// </summary>
 		[JsonProperty("allowed_mentions", NullValueHandling = NullValueHandling.Ignore)]
 		public DiscordMentions Mentions { get; set; }
 
 		/// <summary>
 		/// Gets or sets the message reference.
 		/// </summary>
 		[JsonProperty("message_reference", NullValueHandling = NullValueHandling.Ignore)]
 		public InternalDiscordMessageReference? MessageReference { get; set; }
 	}
 
 	/// <summary>
 	/// Represents a channel message bulk delete payload.
 	/// </summary>
 	internal sealed class RestChannelMessageBulkDeletePayload
 	{
 		/// <summary>
 		/// Gets or sets the messages.
 		/// </summary>
 		[JsonProperty("messages", NullValueHandling = NullValueHandling.Ignore)]
 		public IEnumerable<ulong> Messages { get; set; }
 	}
 
 	/// <summary>
 	/// Represents a channel invite create payload.
 	/// </summary>
 	internal sealed class RestChannelInviteCreatePayload
 	{
 		/// <summary>
 		/// Gets or sets the max age.
 		/// </summary>
 		[JsonProperty("max_age", NullValueHandling = NullValueHandling.Ignore)]
 		public int MaxAge { get; set; }
 
 		/// <summary>
 		/// Gets or sets the max uses.
 		/// </summary>
 		[JsonProperty("max_uses", NullValueHandling = NullValueHandling.Ignore)]
 		public int MaxUses { get; set; }
 
 		/// <summary>
 		/// Gets or sets the target type.
 		/// </summary>
 		[JsonProperty("target_type", NullValueHandling = NullValueHandling.Ignore)]
 		public TargetType? TargetType { get; set; }
 
 		/// <summary>
 		/// Gets or sets the target application.
 		/// </summary>
 		[JsonProperty("target_application_id", NullValueHandling = NullValueHandling.Ignore)]
 		public TargetActivity? TargetApplication { get; set; }
 
 		/// <summary>
 		/// Gets or sets the target user id.
 		/// </summary>
 		[JsonProperty("target_user_id", NullValueHandling = NullValueHandling.Ignore)]
 		public ulong? TargetUserId { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value indicating whether temporary.
 		/// </summary>
 		[JsonProperty("temporary", NullValueHandling = NullValueHandling.Ignore)]
 		public bool Temporary { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value indicating whether unique.
 		/// </summary>
 		[JsonProperty("unique", NullValueHandling = NullValueHandling.Ignore)]
 		public bool Unique { get; set; }
 	}
 
 	/// <summary>
 	/// Represents a channel permission edit payload.
 	/// </summary>
 	internal sealed class RestChannelPermissionEditPayload
 	{
 		/// <summary>
 		/// Gets or sets the allow.
 		/// </summary>
 		[JsonProperty("allow", NullValueHandling = NullValueHandling.Ignore)]
 		public Permissions Allow { get; set; }
 
 		/// <summary>
 		/// Gets or sets the deny.
 		/// </summary>
 		[JsonProperty("deny", NullValueHandling = NullValueHandling.Ignore)]
 		public Permissions Deny { get; set; }
 
 		/// <summary>
 		/// Gets or sets the type.
 		/// </summary>
 		[JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
 		public string Type { get; set; }
 	}
 
 	/// <summary>
 	/// Represents a channel group dm recipient add payload.
 	/// </summary>
 	internal sealed class RestChannelGroupDmRecipientAddPayload : IOAuth2Payload
 	{
 		/// <summary>
 		/// Gets or sets the access token.
 		/// </summary>
 		[JsonProperty("access_token")]
 		public string AccessToken { get; set; }
 
 		/// <summary>
 		/// Gets or sets the nickname.
 		/// </summary>
 		[JsonProperty("nick", NullValueHandling = NullValueHandling.Ignore)]
 		public string Nickname { get; set; }
 	}
 
 	/// <summary>
 	/// The acknowledge payload.
 	/// </summary>
 	internal sealed class AcknowledgePayload
 	{
 		/// <summary>
 		/// Gets or sets the token.
 		/// </summary>
 		[JsonProperty("token", NullValueHandling = NullValueHandling.Include)]
 		public string Token { get; set; }
 	}
 
 	/// <summary>
 	/// Represents a thread channel create payload.
 	/// </summary>
 	internal sealed class RestThreadChannelCreatePayload
 	{
 		/// <summary>
 		/// Gets or sets the name.
 		/// </summary>
 		[JsonProperty("name")]
 		public string Name { get; set; }
 
 		/// <summary>
 		/// Gets or sets the auto archive duration.
 		/// </summary>
 		[JsonProperty("auto_archive_duration")]
 		public ThreadAutoArchiveDuration AutoArchiveDuration { get; set; }
 
 		/// <summary>
 		/// Gets or sets the rate limit per user.
 		/// </summary>
 		[JsonProperty("rate_limit_per_user")]
 		public int? PerUserRateLimit { get; set; }
 
 		/// <summary>
 		/// Gets or sets the thread type.
 		/// </summary>
 		[JsonProperty("type")]
 		public ChannelType Type { get; set; }
 	}
 
 	/// <summary>
 	/// Represents a thread channel modify payload.
 	/// </summary>
 	internal sealed class RestThreadChannelModifyPayload
 	{
 		/// <summary>
 		/// Gets or sets the name.
 		/// </summary>
 		[JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
 		public string Name { get; set; }
 
 		/// <summary>
 		/// Gets or sets the archived.
 		/// </summary>
 		[JsonProperty("archived", NullValueHandling = NullValueHandling.Ignore)]
 		public Optional<bool?> Archived { get; set; }
 
 		/// <summary>
 		/// Gets or sets the auto archive duration.
 		/// </summary>
 		[JsonProperty("auto_archive_duration", NullValueHandling = NullValueHandling.Ignore)]
 		public Optional<ThreadAutoArchiveDuration?> AutoArchiveDuration { get; set; }
 
 		/// <summary>
 		/// Gets or sets the locked.
 		/// </summary>
 		[JsonProperty("locked", NullValueHandling = NullValueHandling.Ignore)]
 		public Optional<bool?> Locked { get; set; }
 
 		/// <summary>
 		/// Gets or sets the per user rate limit.
 		/// </summary>
 		[JsonProperty("rate_limit_per_user", NullValueHandling = NullValueHandling.Ignore)]
 		public Optional<int?> PerUserRateLimit { get; set; }
 
 		/// <summary>
 		/// Gets or sets the thread's invitable state.
 		/// </summary>
 		[JsonProperty("invitable", NullValueHandling = NullValueHandling.Ignore)]
 		public Optional<bool?> Invitable { internal get; set; }
 	}
 }
diff --git a/DisCatSharp/Net/Models/ApplicationCommandEditModel.cs b/DisCatSharp/Net/Models/ApplicationCommandEditModel.cs
index 99f41fd48..4bb49c407 100644
--- a/DisCatSharp/Net/Models/ApplicationCommandEditModel.cs
+++ b/DisCatSharp/Net/Models/ApplicationCommandEditModel.cs
@@ -1,90 +1,90 @@
 // 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 System.Collections.Generic;
 
 using DisCatSharp.Entities;
 
 namespace DisCatSharp.Net.Models
 {
 	/// <summary>
 	/// Represents a application command edit model.
 	/// </summary>
 	public class ApplicationCommandEditModel
 	{
 		/// <summary>
 		/// Sets the command's new name.
 		/// </summary>
 		public Optional<string> Name
 		{
 			internal get => this._name;
 			set
 			{
 				if (value.Value.Length > 32)
 					throw new ArgumentException("Application command name cannot exceed 32 characters.", nameof(value));
 				this._name = value;
 			}
 		}
 		private Optional<string> _name;
 
 		/// <summary>
 		/// Sets the command's new description
 		/// </summary>
 		public Optional<string> Description
 		{
 			internal get => this._description;
 			set
 			{
 				if (value.Value.Length > 100)
 					throw new ArgumentException("Application command description cannot exceed 100 characters.", nameof(value));
 				this._description = value;
 			}
 		}
 		private Optional<string> _description;
 
 		/// <summary>
 		/// Sets the command's name localizations.
 		/// </summary>
 		public Optional<DiscordApplicationCommandLocalization> NameLocalizations { internal get; set; }
 
 		/// <summary>
 		/// Sets the command's description localizations.
 		/// </summary>
 		public Optional<DiscordApplicationCommandLocalization> DescriptionLocalizations { internal get; set; }
 
 		/// <summary>
 		/// Sets the command's new options.
 		/// </summary>
-		public Optional<IReadOnlyCollection<DiscordApplicationCommandOption>> Options { internal get; set; }
+		public Optional<IReadOnlyList<DiscordApplicationCommandOption>> Options { internal get; set; }
 
 		/// <summary>
 		/// Sets the command's needed permissions.
 		/// </summary>
 		public Optional<Permissions> DefaultMemberPermissions { internal get; set; }
 
 		/// <summary>
 		/// Sets whether the command can be used in direct messages.
 		/// </summary>
 		public Optional<bool> DmPermission { internal get; set; }
 	}
 }
diff --git a/DisCatSharp/Net/Rest/DiscordApiClient.cs b/DisCatSharp/Net/Rest/DiscordApiClient.cs
index 429ae1d44..42268e8a2 100644
--- a/DisCatSharp/Net/Rest/DiscordApiClient.cs
+++ b/DisCatSharp/Net/Rest/DiscordApiClient.cs
@@ -1,5259 +1,5219 @@
 // 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 System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
+using DisCatSharp.Common;
 using DisCatSharp.Entities;
 using DisCatSharp.Net.Abstractions;
 using DisCatSharp.Net.Serialization;
 
 using Microsoft.Extensions.Logging;
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace DisCatSharp.Net
 {
 	/// <summary>
 	/// Represents a discord api client.
 	/// </summary>
 	public sealed class DiscordApiClient
 	{
 		/// <summary>
 		/// The audit log reason header name.
 		/// </summary>
 		private const string REASON_HEADER_NAME = "X-Audit-Log-Reason";
 
 		/// <summary>
 		/// Gets the discord client.
 		/// </summary>
 		internal BaseDiscordClient Discord { get; }
 
 		/// <summary>
 		/// Gets the rest client.
 		/// </summary>
 		internal RestClient Rest { get; }
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordApiClient"/> class.
 		/// </summary>
 		/// <param name="client">The client.</param>
 		internal DiscordApiClient(BaseDiscordClient client)
 		{
 			this.Discord = client;
 			this.Rest = new RestClient(client);
 		}
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordApiClient"/> class.
 		/// </summary>
 		/// <param name="proxy">The proxy.</param>
 		/// <param name="timeout">The timeout.</param>
 		/// <param name="useRelativeRateLimit">If true, use relative rate limit.</param>
 		/// <param name="logger">The logger.</param>
 		internal DiscordApiClient(IWebProxy proxy, TimeSpan timeout, bool useRelativeRateLimit, ILogger logger) // This is for meta-clients, such as the webhook client
 		{
 			this.Rest = new RestClient(proxy, timeout, useRelativeRateLimit, logger);
 		}
 
 		/// <summary>
 		/// Builds the query string.
 		/// </summary>
 		/// <param name="values">The values.</param>
 		/// <param name="post">Whether this query will be transmitted via POST.</param>
 		private static string BuildQueryString(IDictionary<string, string> values, bool post = false)
 		{
 			if (values == null || values.Count == 0)
 				return string.Empty;
 
 			var valsCollection = values.Select(xkvp =>
 				$"{WebUtility.UrlEncode(xkvp.Key)}={WebUtility.UrlEncode(xkvp.Value)}");
 			var vals = string.Join("&", valsCollection);
 
 			return !post ? $"?{vals}" : vals;
 		}
 
 		/// <summary>
 		/// Prepares the message.
 		/// </summary>
 		/// <param name="msgRaw">The msg_raw.</param>
 		/// <returns>A DiscordMessage.</returns>
 		private DiscordMessage PrepareMessage(JToken msgRaw)
 		{
 			var author = msgRaw["author"].ToObject<TransportUser>();
 			var ret = msgRaw.ToDiscordObject<DiscordMessage>();
 			ret.Discord = this.Discord;
 
 			this.PopulateMessage(author, ret);
 
 			var referencedMsg = msgRaw["referenced_message"];
 			if (ret.MessageType == MessageType.Reply && !string.IsNullOrWhiteSpace(referencedMsg?.ToString()))
 			{
 				author = referencedMsg["author"].ToObject<TransportUser>();
 				ret.ReferencedMessage.Discord = this.Discord;
 				this.PopulateMessage(author, ret.ReferencedMessage);
 			}
 
 			if (ret.Channel != null)
 				return ret;
 
 			var channel = !ret.GuildId.HasValue
 				? new DiscordDmChannel
 				{
 					Id = ret.ChannelId,
 					Discord = this.Discord,
 					Type = ChannelType.Private
 				}
 				: new DiscordChannel
 				{
 					Id = ret.ChannelId,
 					GuildId = ret.GuildId,
 					Discord = this.Discord
 				};
 
 			ret.Channel = channel;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Populates the message.
 		/// </summary>
 		/// <param name="author">The author.</param>
 		/// <param name="ret">The message.</param>
 		private void PopulateMessage(TransportUser author, DiscordMessage ret)
 		{
 			var guild = ret.Channel?.Guild;
 
 			//If this is a webhook, it shouldn't be in the user cache.
 			if (author.IsBot && int.Parse(author.Discriminator) == 0)
 			{
 				ret.Author = new DiscordUser(author) { Discord = this.Discord };
 			}
 			else
 			{
 				if (!this.Discord.UserCache.TryGetValue(author.Id, out var usr))
 				{
 					this.Discord.UserCache[author.Id] = usr = new DiscordUser(author) { Discord = this.Discord };
 				}
 
 				if (guild != null)
 				{
 					if (!guild.Members.TryGetValue(author.Id, out var mbr))
 						mbr = new DiscordMember(usr) { Discord = this.Discord, GuildId = guild.Id };
 					ret.Author = mbr;
 				}
 				else
 				{
 					ret.Author = usr;
 				}
 			}
 
 			ret.PopulateMentions();
 
 			if (ret.ReactionsInternal == null)
 				ret.ReactionsInternal = new List<DiscordReaction>();
 			foreach (var xr in ret.ReactionsInternal)
 				xr.Emoji.Discord = this.Discord;
 		}
 
 		/// <summary>
 		/// Executes a rest request.
 		/// </summary>
 		/// <param name="client">The client.</param>
 		/// <param name="bucket">The bucket.</param>
 		/// <param name="url">The url.</param>
 		/// <param name="method">The method.</param>
 		/// <param name="route">The route.</param>
 		/// <param name="headers">The headers.</param>
 		/// <param name="payload">The payload.</param>
 		/// <param name="ratelimitWaitOverride">The ratelimit wait override.</param>
 		internal Task<RestResponse> DoRequestAsync(BaseDiscordClient client, RateLimitBucket bucket, Uri url, RestRequestMethod method, string route, IReadOnlyDictionary<string, string> headers = null, string payload = null, double? ratelimitWaitOverride = null)
 		{
 			var req = new RestRequest(client, bucket, url, method, route, headers, payload, ratelimitWaitOverride);
 
 			if (this.Discord != null)
 				this.Rest.ExecuteRequestAsync(req).LogTaskFault(this.Discord.Logger, LogLevel.Error, LoggerEvents.RestError, "Error while executing request");
 			else
 				_ = this.Rest.ExecuteRequestAsync(req);
 
 			return req.WaitForCompletionAsync();
 		}
 
 		/// <summary>
 		/// Executes a multipart rest request for stickers.
 		/// </summary>
 		/// <param name="client">The client.</param>
 		/// <param name="bucket">The bucket.</param>
 		/// <param name="url">The url.</param>
 		/// <param name="method">The method.</param>
 		/// <param name="route">The route.</param>
 		/// <param name="headers">The headers.</param>
 		/// <param name="file">The file.</param>
 		/// <param name="name">The sticker name.</param>
 		/// <param name="tags">The sticker tag.</param>
 		/// <param name="description">The sticker description.</param>
 		/// <param name="ratelimitWaitOverride">The ratelimit wait override.</param>
 		private Task<RestResponse> DoStickerMultipartAsync(BaseDiscordClient client, RateLimitBucket bucket, Uri url, RestRequestMethod method, string route, IReadOnlyDictionary<string, string> headers = null,
 			DiscordMessageFile file = null, string name = "", string tags = "", string description = "", double? ratelimitWaitOverride = null)
 		{
 			var req = new MultipartStickerWebRequest(client, bucket, url, method, route, headers, file, name, tags, description, ratelimitWaitOverride);
 
 			if (this.Discord != null)
 				this.Rest.ExecuteRequestAsync(req).LogTaskFault(this.Discord.Logger, LogLevel.Error, LoggerEvents.RestError, "Error while executing request");
 			else
 				_ = this.Rest.ExecuteRequestAsync(req);
 
 			return req.WaitForCompletionAsync();
 		}
 
 		/// <summary>
 		/// Executes a multipart request.
 		/// </summary>
 		/// <param name="client">The client.</param>
 		/// <param name="bucket">The bucket.</param>
 		/// <param name="url">The url.</param>
 		/// <param name="method">The method.</param>
 		/// <param name="route">The route.</param>
 		/// <param name="headers">The headers.</param>
 		/// <param name="values">The values.</param>
 		/// <param name="files">The files.</param>
 		/// <param name="ratelimitWaitOverride">The ratelimit wait override.</param>
 		private Task<RestResponse> DoMultipartAsync(BaseDiscordClient client, RateLimitBucket bucket, Uri url, RestRequestMethod method, string route, IReadOnlyDictionary<string, string> headers = null, IReadOnlyDictionary<string, string> values = null,
-			IReadOnlyCollection<DiscordMessageFile> files = null, double? ratelimitWaitOverride = null)
+			IReadOnlyList<DiscordMessageFile> files = null, double? ratelimitWaitOverride = null)
 		{
 			var req = new MultipartWebRequest(client, bucket, url, method, route, headers, values, files, ratelimitWaitOverride);
 
 			if (this.Discord != null)
 				this.Rest.ExecuteRequestAsync(req).LogTaskFault(this.Discord.Logger, LogLevel.Error, LoggerEvents.RestError, "Error while executing request");
 			else
 				_ = this.Rest.ExecuteRequestAsync(req);
 
 			return req.WaitForCompletionAsync();
 		}
 
 		#region Guild
 
 		/// <summary>
 		/// Searches the members async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="limit">The limit.</param>
 		internal async Task<IReadOnlyList<DiscordMember>> SearchMembersAsync(ulong guildId, string name, int? limit)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}{Endpoints.SEARCH}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 			var querydict = new Dictionary<string, string>
 			{
 				["query"] = name,
 				["limit"] = limit.ToString()
 			};
 			var url = Utilities.GetApiUriFor(path, BuildQueryString(querydict), this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 			var json = JArray.Parse(res.Response);
 			var tms = json.ToObject<IReadOnlyList<TransportMember>>();
 
 			var mbrs = new List<DiscordMember>();
 			foreach (var xtm in tms)
 			{
 				var usr = new DiscordUser(xtm.User) { Discord = this.Discord };
 
 				this.Discord.UserCache.AddOrUpdate(xtm.User.Id, usr, (id, old) =>
 				{
 					old.Username = usr.Username;
 					old.Discord = usr.Discord;
 					old.AvatarHash = usr.AvatarHash;
 
 					return old;
 				});
 
 				mbrs.Add(new DiscordMember(xtm) { Discord = this.Discord, GuildId = guildId });
 			}
 
 			return mbrs;
 		}
 
 		/// <summary>
 		/// Gets the guild ban async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="userId">The user_id.</param>
 		internal async Task<DiscordBan> GetGuildBanAsync(ulong guildId, ulong userId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.BANS}/:user_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId, user_id = userId}, out var path);
 			var uri = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, uri, RestRequestMethod.GET, route).ConfigureAwait(false);
 			var json = JObject.Parse(res.Response);
 
 			var ban = json.ToObject<DiscordBan>();
 
 			return ban;
 		}
 
 		/// <summary>
 		/// Creates the guild async.
 		/// </summary>
 		/// <param name="name">The name.</param>
 		/// <param name="regionId">The region_id.</param>
 		/// <param name="iconb64">The iconb64.</param>
 		/// <param name="verificationLevel">The verification_level.</param>
 		/// <param name="defaultMessageNotifications">The default_message_notifications.</param>
 		/// <param name="systemChannelFlags">The system_channel_flags.</param>
 		internal async Task<DiscordGuild> CreateGuildAsync(string name, string regionId, Optional<string> iconb64, VerificationLevel? verificationLevel,
 			DefaultMessageNotifications? defaultMessageNotifications, SystemChannelFlags? systemChannelFlags)
 		{
 			var pld = new RestGuildCreatePayload
 			{
 				Name = name,
 				RegionId = regionId,
 				DefaultMessageNotifications = defaultMessageNotifications,
 				VerificationLevel = verificationLevel,
 				IconBase64 = iconb64,
 				SystemChannelFlags = systemChannelFlags
 
 			};
 
 			var route = $"{Endpoints.GUILDS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new { }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var json = JObject.Parse(res.Response);
 			var rawMembers = (JArray)json["members"];
 			var guild = json.ToDiscordObject<DiscordGuild>();
 
 			if (this.Discord is DiscordClient dc)
 				await dc.OnGuildCreateEventAsync(guild, rawMembers, null).ConfigureAwait(false);
 			return guild;
 		}
 
 		/// <summary>
 		/// Creates the guild from template async.
 		/// </summary>
 		/// <param name="templateCode">The template_code.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="iconb64">The iconb64.</param>
 		internal async Task<DiscordGuild> CreateGuildFromTemplateAsync(string templateCode, string name, Optional<string> iconb64)
 		{
 			var pld = new RestGuildCreateFromTemplatePayload
 			{
 				Name = name,
 				IconBase64 = iconb64
 			};
 
 			var route = $"{Endpoints.GUILDS}{Endpoints.TEMPLATES}/:template_code";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {template_code = templateCode }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var json = JObject.Parse(res.Response);
 			var rawMembers = (JArray)json["members"];
 			var guild = json.ToDiscordObject<DiscordGuild>();
 
 			if (this.Discord is DiscordClient dc)
 				await dc.OnGuildCreateEventAsync(guild, rawMembers, null).ConfigureAwait(false);
 			return guild;
 		}
 
 		/// <summary>
 		/// Deletes the guild async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		internal async Task DeleteGuildAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route).ConfigureAwait(false);
 
 			if (this.Discord is DiscordClient dc)
 			{
 				var gld = dc.GuildsInternal[guildId];
 				await dc.OnGuildDeleteEventAsync(gld).ConfigureAwait(false);
 			}
 		}
 
 		/// <summary>
 		/// Modifies the guild.
 		/// </summary>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="verificationLevel">The verification level.</param>
 		/// <param name="defaultMessageNotifications">The default message notifications.</param>
 		/// <param name="mfaLevel">The mfa level.</param>
 		/// <param name="explicitContentFilter">The explicit content filter.</param>
 		/// <param name="afkChannelId">The afk channel id.</param>
 		/// <param name="afkTimeout">The afk timeout.</param>
 		/// <param name="iconb64">The iconb64.</param>
 		/// <param name="ownerId">The owner id.</param>
 		/// <param name="splashb64">The splashb64.</param>
 		/// <param name="systemChannelId">The system channel id.</param>
 		/// <param name="systemChannelFlags">The system channel flags.</param>
 		/// <param name="publicUpdatesChannelId">The public updates channel id.</param>
 		/// <param name="rulesChannelId">The rules channel id.</param>
 		/// <param name="description">The description.</param>
 		/// <param name="bannerb64">The banner base64.</param>
 		/// <param name="discoverySplashb64">The discovery base64.</param>
 		/// <param name="preferredLocale">The preferred locale.</param>
 		/// <param name="premiumProgressBarEnabled">Whether the premium progress bar should be enabled.</param>
 		/// <param name="reason">The reason.</param>
 		internal async Task<DiscordGuild> ModifyGuildAsync(ulong guildId, Optional<string> name, Optional<VerificationLevel> verificationLevel,
 			Optional<DefaultMessageNotifications> defaultMessageNotifications, Optional<MfaLevel> mfaLevel,
 			Optional<ExplicitContentFilter> explicitContentFilter, Optional<ulong?> afkChannelId,
 			Optional<int> afkTimeout, Optional<string> iconb64, Optional<ulong> ownerId, Optional<string> splashb64,
 			Optional<ulong?> systemChannelId, Optional<SystemChannelFlags> systemChannelFlags,
 			Optional<ulong?> publicUpdatesChannelId, Optional<ulong?> rulesChannelId, Optional<string> description,
 			Optional<string> bannerb64, Optional<string> discoverySplashb64, Optional<string> preferredLocale, Optional<bool> premiumProgressBarEnabled, string reason)
 		{
 			var pld = new RestGuildModifyPayload
 			{
 				Name = name,
 				VerificationLevel = verificationLevel,
 				DefaultMessageNotifications = defaultMessageNotifications,
 				MfaLevel = mfaLevel,
 				ExplicitContentFilter = explicitContentFilter,
 				AfkChannelId = afkChannelId,
 				AfkTimeout = afkTimeout,
 				IconBase64 = iconb64,
 				SplashBase64 = splashb64,
 				BannerBase64 = bannerb64,
 				DiscoverySplashBase64 = discoverySplashb64,
 				OwnerId = ownerId,
 				SystemChannelId = systemChannelId,
 				SystemChannelFlags = systemChannelFlags,
 				RulesChannelId = rulesChannelId,
 				PublicUpdatesChannelId = publicUpdatesChannelId,
 				PreferredLocale = preferredLocale,
 				Description = description,
 				PremiumProgressBarEnabled = premiumProgressBarEnabled
 			};
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.GUILDS}/:guild_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new { guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var json = JObject.Parse(res.Response);
 			var rawMembers = (JArray)json["members"];
 			var guild = json.ToDiscordObject<DiscordGuild>();
 			foreach (var r in guild.RolesInternal.Values)
 				r.GuildId = guild.Id;
 
 			if (this.Discord is DiscordClient dc)
 				await dc.OnGuildUpdateEventAsync(guild, rawMembers).ConfigureAwait(false);
 			return guild;
 		}
 
 
 
 		/// <summary>
 		/// Modifies the guild community settings.
 		/// </summary>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="features">The guild features.</param>
 		/// <param name="rulesChannelId">The rules channel id.</param>
 		/// <param name="publicUpdatesChannelId">The public updates channel id.</param>
 		/// <param name="preferredLocale">The preferred locale.</param>
 		/// <param name="description">The description.</param>
 		/// <param name="defaultMessageNotifications">The default message notifications.</param>
 		/// <param name="explicitContentFilter">The explicit content filter.</param>
 		/// <param name="verificationLevel">The verification level.</param>
 		/// <param name="reason">The reason.</param>
 		internal async Task<DiscordGuild> ModifyGuildCommunitySettingsAsync(ulong guildId, List<string> features, Optional<ulong?> rulesChannelId, Optional<ulong?> publicUpdatesChannelId, string preferredLocale, string description, DefaultMessageNotifications defaultMessageNotifications, ExplicitContentFilter explicitContentFilter, VerificationLevel verificationLevel, string reason)
 		{
 			var pld = new RestGuildCommunityModifyPayload
 			{
 				VerificationLevel = verificationLevel,
 				DefaultMessageNotifications = defaultMessageNotifications,
 				ExplicitContentFilter = explicitContentFilter,
 				RulesChannelId = rulesChannelId,
 				PublicUpdatesChannelId = publicUpdatesChannelId,
 				PreferredLocale = preferredLocale,
 				Description = Optional.FromNullable(description),
 				Features = features
 			};
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.GUILDS}/:guild_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new { guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var json = JObject.Parse(res.Response);
 			var rawMembers = (JArray)json["members"];
 			var guild = json.ToDiscordObject<DiscordGuild>();
 			foreach (var r in guild.RolesInternal.Values)
 				r.GuildId = guild.Id;
 
 			if (this.Discord is DiscordClient dc)
 				await dc.OnGuildUpdateEventAsync(guild, rawMembers).ConfigureAwait(false);
 			return guild;
 		}
 
 		/// <summary>
 		/// Implements https://discord.com/developers/docs/resources/guild#get-guild-bans.
 		/// </summary>
 		internal async Task<IReadOnlyList<DiscordBan>> GetGuildBansAsync(ulong guildId, int? limit, ulong? before, ulong? after)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.BANS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var urlParams = new Dictionary<string, string>();
 			if (limit != null)
 				urlParams["limit"] = limit.Value.ToString(CultureInfo.InvariantCulture);
 			if (before != null)
 				urlParams["before"] = before.Value.ToString(CultureInfo.InvariantCulture);
 			if (after != null)
 				urlParams["after"] = after.Value.ToString(CultureInfo.InvariantCulture);
 
 			var url = Utilities.GetApiUriFor(path, BuildQueryString(urlParams), this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-			var bansRaw = JsonConvert.DeserializeObject<IEnumerable<DiscordBan>>(res.Response).Select(xb =>
+			return JsonConvert.DeserializeObject<List<DiscordBan>>(res.Response).Mutate(xb =>
 			{
 				if (!this.Discord.TryGetCachedUserInternal(xb.RawUser.Id, out var usr))
 				{
 					usr = new DiscordUser(xb.RawUser) { Discord = this.Discord };
 					usr = this.Discord.UserCache.AddOrUpdate(usr.Id, usr, (id, old) =>
 					{
 						old.Username = usr.Username;
 						old.Discriminator = usr.Discriminator;
 						old.AvatarHash = usr.AvatarHash;
 						return old;
 					});
 				}
 
 				xb.User = usr;
-				return xb;
 			});
-			var bans = new ReadOnlyCollection<DiscordBan>(new List<DiscordBan>(bansRaw));
-
-			return bans;
 		}
 
 		/// <summary>
 		/// Creates the guild ban async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="userId">The user_id.</param>
 		/// <param name="deleteMessageDays">The delete_message_days.</param>
 		/// <param name="reason">The reason.</param>
 		internal Task CreateGuildBanAsync(ulong guildId, ulong userId, int deleteMessageDays, string reason)
 		{
 			if (deleteMessageDays < 0 || deleteMessageDays > 7)
 				throw new ArgumentException("Delete message days must be a number between 0 and 7.", nameof(deleteMessageDays));
 
 			var urlParams = new Dictionary<string, string>
 			{
 				["delete_message_days"] = deleteMessageDays.ToString(CultureInfo.InvariantCulture)
 			};
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.BANS}/:user_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {guild_id = guildId, user_id = userId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, BuildQueryString(urlParams), this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, headers);
 		}
 
 		/// <summary>
 		/// Removes the guild ban async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="userId">The user_id.</param>
 		/// <param name="reason">The reason.</param>
 		internal Task RemoveGuildBanAsync(ulong guildId, ulong userId, string reason)
 		{
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.BANS}/:user_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId, user_id = userId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
 		}
 
 		/// <summary>
 		/// Leaves the guild async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 
 		internal Task LeaveGuildAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.GUILDS}/:guild_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route);
 		}
 
 		/// <summary>
 		/// Adds the guild member async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="userId">The user_id.</param>
 		/// <param name="accessToken">The access_token.</param>
 		/// <param name="nick">The nick.</param>
 		/// <param name="roles">The roles.</param>
 		/// <param name="muted">If true, muted.</param>
 		/// <param name="deafened">If true, deafened.</param>
 
 		internal async Task<DiscordMember> AddGuildMemberAsync(ulong guildId, ulong userId, string accessToken, string nick, IEnumerable<DiscordRole> roles, bool muted, bool deafened)
 		{
 			var pld = new RestGuildMemberAddPayload
 			{
 				AccessToken = accessToken,
 				Nickname = nick ?? "",
 				Roles = roles ?? new List<DiscordRole>(),
 				Deaf = deafened,
 				Mute = muted
 			};
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}/:user_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {guild_id = guildId, user_id = userId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var tm = JsonConvert.DeserializeObject<TransportMember>(res.Response);
 
 			return new DiscordMember(tm) { Discord = this.Discord, GuildId = guildId };
 		}
 
 		/// <summary>
 		/// Lists the guild members async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="limit">The limit.</param>
 		/// <param name="after">The after.</param>
 
 		internal async Task<IReadOnlyList<TransportMember>> ListGuildMembersAsync(ulong guildId, int? limit, ulong? after)
 		{
 			var urlParams = new Dictionary<string, string>();
 			if (limit != null && limit > 0)
 				urlParams["limit"] = limit.Value.ToString(CultureInfo.InvariantCulture);
 			if (after != null)
 				urlParams["after"] = after.Value.ToString(CultureInfo.InvariantCulture);
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-			var membersRaw = JsonConvert.DeserializeObject<List<TransportMember>>(res.Response);
-			return new ReadOnlyCollection<TransportMember>(membersRaw);
+			return JsonConvert.DeserializeObject<List<TransportMember>>(res.Response);
 		}
 
 		/// <summary>
 		/// Adds the guild member role async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="userId">The user_id.</param>
 		/// <param name="roleId">The role_id.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task AddGuildMemberRoleAsync(ulong guildId, ulong userId, ulong roleId, string reason)
 		{
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}/:user_id{Endpoints.ROLES}/:role_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {guild_id = guildId, user_id = userId, role_id = roleId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, headers);
 		}
 
 		/// <summary>
 		/// Removes the guild member role async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="userId">The user_id.</param>
 		/// <param name="roleId">The role_id.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task RemoveGuildMemberRoleAsync(ulong guildId, ulong userId, ulong roleId, string reason)
 		{
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}/:user_id{Endpoints.ROLES}/:role_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId, user_id = userId, role_id = roleId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
 		}
 
 		/// <summary>
 		/// Modifies the guild channel position async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="pld">The pld.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task ModifyGuildChannelPositionAsync(ulong guildId, IEnumerable<RestGuildChannelReorderPayload> pld, string reason)
 		{
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.CHANNELS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
 		}
 
 		/// <summary>
 		/// Modifies the guild channel parent async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="pld">The pld.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task ModifyGuildChannelParentAsync(ulong guildId, IEnumerable<RestGuildChannelNewParentPayload> pld, string reason)
 		{
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.CHANNELS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
 		}
 
 		/// <summary>
 		/// Detaches the guild channel parent async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="pld">The pld.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task DetachGuildChannelParentAsync(ulong guildId, IEnumerable<RestGuildChannelNoParentPayload> pld, string reason)
 		{
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.CHANNELS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
 		}
 
 		/// <summary>
 		/// Modifies the guild role position async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="pld">The pld.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task ModifyGuildRolePositionAsync(ulong guildId, IEnumerable<RestGuildRoleReorderPayload> pld, string reason)
 		{
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.ROLES}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
 		}
 
 		/// <summary>
 		/// Gets the audit logs async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="limit">The limit.</param>
 		/// <param name="after">The after.</param>
 		/// <param name="before">The before.</param>
 		/// <param name="responsible">The responsible.</param>
 		/// <param name="actionType">The action_type.</param>
 
 		internal async Task<AuditLog> GetAuditLogsAsync(ulong guildId, int limit, ulong? after, ulong? before, ulong? responsible, int? actionType)
 		{
 			var urlParams = new Dictionary<string, string>
 			{
 				["limit"] = limit.ToString(CultureInfo.InvariantCulture)
 			};
 			if (after != null)
 				urlParams["after"] = after?.ToString(CultureInfo.InvariantCulture);
 			if (before != null)
 				urlParams["before"] = before?.ToString(CultureInfo.InvariantCulture);
 			if (responsible != null)
 				urlParams["user_id"] = responsible?.ToString(CultureInfo.InvariantCulture);
 			if (actionType != null)
 				urlParams["action_type"] = actionType?.ToString(CultureInfo.InvariantCulture);
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.AUDIT_LOGS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var auditLogDataRaw = JsonConvert.DeserializeObject<AuditLog>(res.Response);
 
 			return auditLogDataRaw;
 		}
 
 		/// <summary>
 		/// Gets the guild vanity url async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 
 		internal async Task<DiscordInvite> GetGuildVanityUrlAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.VANITY_URL}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var invite = JsonConvert.DeserializeObject<DiscordInvite>(res.Response);
 
 			return invite;
 		}
 
 		/// <summary>
 		/// Gets the guild widget async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 
 		internal async Task<DiscordWidget> GetGuildWidgetAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.WIDGET_JSON}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var json = JObject.Parse(res.Response);
 			var rawChannels = (JArray)json["channels"];
 
 			var ret = json.ToDiscordObject<DiscordWidget>();
 			ret.Discord = this.Discord;
 			ret.Guild = this.Discord.Guilds[guildId];
 
 			ret.Channels = ret.Guild == null
 				? rawChannels.Select(r => new DiscordChannel
 				{
 					Id = (ulong)r["id"],
 					Name = r["name"].ToString(),
 					Position = (int)r["position"]
-				}).ToList()
+				}).ToArray()
 				: rawChannels.Select(r =>
 				{
 					var c = ret.Guild.GetChannel((ulong)r["id"]);
 					c.Position = (int)r["position"];
 					return c;
-				}).ToList();
+				}).ToArray();
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Gets the guild widget settings async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 
 		internal async Task<DiscordWidgetSettings> GetGuildWidgetSettingsAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.WIDGET}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordWidgetSettings>(res.Response);
 			ret.Guild = this.Discord.Guilds[guildId];
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Modifies the guild widget settings async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="isEnabled">If true, is enabled.</param>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal async Task<DiscordWidgetSettings> ModifyGuildWidgetSettingsAsync(ulong guildId, bool? isEnabled, ulong? channelId, string reason)
 		{
 			var pld = new RestGuildWidgetSettingsPayload
 			{
 				Enabled = isEnabled,
 				ChannelId = channelId
 			};
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.WIDGET}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordWidgetSettings>(res.Response);
 			ret.Guild = this.Discord.Guilds[guildId];
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Gets the guild templates async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 
 		internal async Task<IReadOnlyList<DiscordGuildTemplate>> GetGuildTemplatesAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.TEMPLATES}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-			var templatesRaw = JsonConvert.DeserializeObject<IEnumerable<DiscordGuildTemplate>>(res.Response);
-
-			return new ReadOnlyCollection<DiscordGuildTemplate>(new List<DiscordGuildTemplate>(templatesRaw));
+			return JsonConvert.DeserializeObject<List<DiscordGuildTemplate>>(res.Response);
 		}
 
 		/// <summary>
 		/// Creates the guild template async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="description">The description.</param>
 
 		internal async Task<DiscordGuildTemplate> CreateGuildTemplateAsync(ulong guildId, string name, string description)
 		{
 			var pld = new RestGuildTemplateCreateOrModifyPayload
 			{
 				Name = name,
 				Description = description
 			};
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.TEMPLATES}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordGuildTemplate>(res.Response);
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Syncs the guild template async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="templateCode">The template_code.</param>
 
 		internal async Task<DiscordGuildTemplate> SyncGuildTemplateAsync(ulong guildId, string templateCode)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.TEMPLATES}/:template_code";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {guild_id = guildId, template_code = templateCode }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route).ConfigureAwait(false);
 
 			var templateRaw = JsonConvert.DeserializeObject<DiscordGuildTemplate>(res.Response);
 
 			return templateRaw;
 		}
 
 		/// <summary>
 		/// Modifies the guild template async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="templateCode">The template_code.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="description">The description.</param>
 
 		internal async Task<DiscordGuildTemplate> ModifyGuildTemplateAsync(ulong guildId, string templateCode, string name, string description)
 		{
 			var pld = new RestGuildTemplateCreateOrModifyPayload
 			{
 				Name = name,
 				Description = description
 			};
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.TEMPLATES}/:template_code";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, template_code = templateCode }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var templateRaw = JsonConvert.DeserializeObject<DiscordGuildTemplate>(res.Response);
 
 			return templateRaw;
 		}
 
 		/// <summary>
 		/// Deletes the guild template async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="templateCode">The template_code.</param>
 
 		internal async Task<DiscordGuildTemplate> DeleteGuildTemplateAsync(ulong guildId, string templateCode)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.TEMPLATES}/:template_code";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId, template_code = templateCode }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route).ConfigureAwait(false);
 
 			var templateRaw = JsonConvert.DeserializeObject<DiscordGuildTemplate>(res.Response);
 
 			return templateRaw;
 		}
 
 		/// <summary>
 		/// Gets the guild membership screening form async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 
 		internal async Task<DiscordGuildMembershipScreening> GetGuildMembershipScreeningFormAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBER_VERIFICATION}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var screeningRaw = JsonConvert.DeserializeObject<DiscordGuildMembershipScreening>(res.Response);
 
 			return screeningRaw;
 		}
 
 		/// <summary>
 		/// Modifies the guild membership screening form async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="enabled">The enabled.</param>
 		/// <param name="fields">The fields.</param>
 		/// <param name="description">The description.</param>
 
 		internal async Task<DiscordGuildMembershipScreening> ModifyGuildMembershipScreeningFormAsync(ulong guildId, Optional<bool> enabled, Optional<DiscordGuildMembershipScreeningField[]> fields, Optional<string> description)
 		{
 			var pld = new RestGuildMembershipScreeningFormModifyPayload
 			{
 				Enabled = enabled,
 				Description = description,
 				Fields = fields
 			};
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBER_VERIFICATION}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var screeningRaw = JsonConvert.DeserializeObject<DiscordGuildMembershipScreening>(res.Response);
 
 			return screeningRaw;
 		}
 
 		/// <summary>
 		/// Gets the guild welcome screen async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 
 		internal async Task<DiscordGuildWelcomeScreen> GetGuildWelcomeScreenAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.WELCOME_SCREEN}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route);
 
 			var ret = JsonConvert.DeserializeObject<DiscordGuildWelcomeScreen>(res.Response);
 			return ret;
 		}
 
 		/// <summary>
 		/// Modifies the guild welcome screen async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="enabled">The enabled.</param>
 		/// <param name="welcomeChannels">The welcome channels.</param>
 		/// <param name="description">The description.</param>
 
 		internal async Task<DiscordGuildWelcomeScreen> ModifyGuildWelcomeScreenAsync(ulong guildId, Optional<bool> enabled, Optional<IEnumerable<DiscordGuildWelcomeScreenChannel>> welcomeChannels, Optional<string> description)
 		{
 			var pld = new RestGuildWelcomeScreenModifyPayload
 			{
 				Enabled = enabled,
 				WelcomeChannels = welcomeChannels,
 				Description = description
 			};
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.WELCOME_SCREEN}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld));
 
 			var ret = JsonConvert.DeserializeObject<DiscordGuildWelcomeScreen>(res.Response);
 			return ret;
 		}
 
 		/// <summary>
 		/// Updates the current user voice state async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="suppress">If true, suppress.</param>
 		/// <param name="requestToSpeakTimestamp">The request to speak timestamp.</param>
 
 		internal async Task UpdateCurrentUserVoiceStateAsync(ulong guildId, ulong channelId, bool? suppress, DateTimeOffset? requestToSpeakTimestamp)
 		{
 			var pld = new RestGuildUpdateCurrentUserVoiceStatePayload
 			{
 				ChannelId = channelId,
 				Suppress = suppress,
 				RequestToSpeakTimestamp = requestToSpeakTimestamp
 			};
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.VOICE_STATES}/@me";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld));
 		}
 
 		/// <summary>
 		/// Updates the user voice state async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="userId">The user_id.</param>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="suppress">If true, suppress.</param>
 
 		internal async Task UpdateUserVoiceStateAsync(ulong guildId, ulong userId, ulong channelId, bool? suppress)
 		{
 			var pld = new RestGuildUpdateUserVoiceStatePayload
 			{
 				ChannelId = channelId,
 				Suppress = suppress
 			};
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.VOICE_STATES}/:user_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, user_id = userId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld));
 		}
 		#endregion
 
 		#region Guild Scheduled Events
 
 		/// <summary>
 		/// Creates a scheduled event.
 		/// </summary>
 		internal async Task<DiscordScheduledEvent> CreateGuildScheduledEventAsync(ulong guildId, ulong? channelId, DiscordScheduledEventEntityMetadata metadata, string name, DateTimeOffset scheduledStartTime, DateTimeOffset? scheduledEndTime, string description, ScheduledEventEntityType type, Optional<string> coverb64, string reason = null)
 		{
 			var pld = new RestGuildScheduledEventCreatePayload
 			{
 				ChannelId = channelId,
 				EntityMetadata = metadata,
 				Name = name,
 				ScheduledStartTime = scheduledStartTime,
 				ScheduledEndTime = scheduledEndTime,
 				Description = description,
 				EntityType = type,
 				CoverBase64 = coverb64
 			};
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.SCHEDULED_EVENTS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld));
 
 			var scheduledEvent = JsonConvert.DeserializeObject<DiscordScheduledEvent>(res.Response);
 			var guild = this.Discord.Guilds[guildId];
 
 			scheduledEvent.Discord = this.Discord;
 
 			if (scheduledEvent.Creator != null)
 				scheduledEvent.Creator.Discord = this.Discord;
 
 			if (this.Discord is DiscordClient dc)
 				await dc.OnGuildScheduledEventCreateEventAsync(scheduledEvent, guild);
 
 			return scheduledEvent;
 		}
 
 		/// <summary>
 		/// Modifies a scheduled event.
 		/// </summary>
 		internal async Task<DiscordScheduledEvent> ModifyGuildScheduledEventAsync(ulong guildId, ulong scheduledEventId, Optional<ulong?> channelId, Optional<DiscordScheduledEventEntityMetadata> metadata, Optional<string> name, Optional<DateTimeOffset> scheduledStartTime, Optional<DateTimeOffset> scheduledEndTime, Optional<string> description, Optional<ScheduledEventEntityType> type, Optional<ScheduledEventStatus> status, Optional<string> coverb64, string reason = null)
 		{
 			var pld = new RestGuildScheduledEventModifyPayload
 			{
 				ChannelId = channelId,
 				EntityMetadata = metadata,
 				Name = name,
 				ScheduledStartTime = scheduledStartTime,
 				ScheduledEndTime = scheduledEndTime,
 				Description = description,
 				EntityType = type,
 				Status = status,
 				CoverBase64 = coverb64
 			};
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.SCHEDULED_EVENTS}/:scheduled_event_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, scheduled_event_id = scheduledEventId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
 
 			var scheduledEvent = JsonConvert.DeserializeObject<DiscordScheduledEvent>(res.Response);
 			var guild = this.Discord.Guilds[guildId];
 
 			scheduledEvent.Discord = this.Discord;
 
 			if (scheduledEvent.Creator != null)
 			{
 				scheduledEvent.Creator.Discord = this.Discord;
 				this.Discord.UserCache.AddOrUpdate(scheduledEvent.Creator.Id, scheduledEvent.Creator, (id, old) =>
 				{
 					old.Username = scheduledEvent.Creator.Username;
 					old.Discriminator = scheduledEvent.Creator.Discriminator;
 					old.AvatarHash = scheduledEvent.Creator.AvatarHash;
 					old.Flags = scheduledEvent.Creator.Flags;
 					return old;
 				});
 			}
 
 			if (this.Discord is DiscordClient dc)
 				await dc.OnGuildScheduledEventUpdateEventAsync(scheduledEvent, guild);
 
 			return scheduledEvent;
 		}
 
 		/// <summary>
 		/// Modifies a scheduled event.
 		/// </summary>
 		internal async Task<DiscordScheduledEvent> ModifyGuildScheduledEventStatusAsync(ulong guildId, ulong scheduledEventId, ScheduledEventStatus status, string reason = null)
 		{
 			var pld = new RestGuildScheduledEventModifyPayload
 			{
 				Status = status
 			};
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.SCHEDULED_EVENTS}/:scheduled_event_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, scheduled_event_id = scheduledEventId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
 
 			var scheduledEvent = JsonConvert.DeserializeObject<DiscordScheduledEvent>(res.Response);
 			var guild = this.Discord.Guilds[guildId];
 
 			scheduledEvent.Discord = this.Discord;
 
 			if (scheduledEvent.Creator != null)
 			{
 				scheduledEvent.Creator.Discord = this.Discord;
 				this.Discord.UserCache.AddOrUpdate(scheduledEvent.Creator.Id, scheduledEvent.Creator, (id, old) =>
 				{
 					old.Username = scheduledEvent.Creator.Username;
 					old.Discriminator = scheduledEvent.Creator.Discriminator;
 					old.AvatarHash = scheduledEvent.Creator.AvatarHash;
 					old.Flags = scheduledEvent.Creator.Flags;
 					return old;
 				});
 			}
 
 			if (this.Discord is DiscordClient dc)
 				await dc.OnGuildScheduledEventUpdateEventAsync(scheduledEvent, guild);
 
 			return scheduledEvent;
 		}
 
 		/// <summary>
 		/// Gets a scheduled event.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="scheduledEventId">The event id.</param>
 		/// <param name="withUserCount">Whether to include user count.</param>
 		internal async Task<DiscordScheduledEvent> GetGuildScheduledEventAsync(ulong guildId, ulong scheduledEventId, bool? withUserCount)
 		{
 			var urlParams = new Dictionary<string, string>();
 			if (withUserCount.HasValue)
 				urlParams["with_user_count"] = withUserCount?.ToString();
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.SCHEDULED_EVENTS}/:scheduled_event_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId, scheduled_event_id = scheduledEventId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route);
 
 			var scheduledEvent = JsonConvert.DeserializeObject<DiscordScheduledEvent>(res.Response);
 			var guild = this.Discord.Guilds[guildId];
 
 			scheduledEvent.Discord = this.Discord;
 
 			if (scheduledEvent.Creator != null)
 			{
 				scheduledEvent.Creator.Discord = this.Discord;
 				this.Discord.UserCache.AddOrUpdate(scheduledEvent.Creator.Id, scheduledEvent.Creator, (id, old) =>
 				{
 					old.Username = scheduledEvent.Creator.Username;
 					old.Discriminator = scheduledEvent.Creator.Discriminator;
 					old.AvatarHash = scheduledEvent.Creator.AvatarHash;
 					old.Flags = scheduledEvent.Creator.Flags;
 					return old;
 				});
 			}
 
 			return scheduledEvent;
 		}
 
 		/// <summary>
 		/// Gets the guilds scheduled events.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="withUserCount">Whether to include the count of users subscribed to the scheduled event.</param>
 		internal async Task<IReadOnlyDictionary<ulong, DiscordScheduledEvent>> ListGuildScheduledEventsAsync(ulong guildId, bool? withUserCount)
 		{
 			var urlParams = new Dictionary<string, string>();
 			if (withUserCount.HasValue)
 				urlParams["with_user_count"] = withUserCount?.ToString();
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.SCHEDULED_EVENTS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route);
 
 			var events = new Dictionary<ulong, DiscordScheduledEvent>();
 			var eventsRaw = JsonConvert.DeserializeObject<List<DiscordScheduledEvent>>(res.Response);
 			var guild = this.Discord.Guilds[guildId];
 
 			foreach (var ev in eventsRaw)
 			{
 				ev.Discord = this.Discord;
 				if (ev.Creator != null)
 				{
 					ev.Creator.Discord = this.Discord;
 					this.Discord.UserCache.AddOrUpdate(ev.Creator.Id, ev.Creator, (id, old) =>
 					{
 						old.Username = ev.Creator.Username;
 						old.Discriminator = ev.Creator.Discriminator;
 						old.AvatarHash = ev.Creator.AvatarHash;
 						old.Flags = ev.Creator.Flags;
 						return old;
 					});
 				}
 
 				events.Add(ev.Id, ev);
 			}
 
 			return new ReadOnlyDictionary<ulong, DiscordScheduledEvent>(new Dictionary<ulong, DiscordScheduledEvent>(events));
 		}
 
 		/// <summary>
 		/// Deletes a guild scheduled event.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="scheduledEventId">The scheduled event id.</param>
 		/// <param name="reason">The reason.</param>
 		internal Task DeleteGuildScheduledEventAsync(ulong guildId, ulong scheduledEventId, string reason)
 		{
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.SCHEDULED_EVENTS}/:scheduled_event_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId, scheduled_event_id = scheduledEventId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
 		}
 
 		/// <summary>
 		/// Gets the users who RSVP'd to a scheduled event.
 		/// Optional with member objects.
 		/// This endpoint is paginated.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="scheduledEventId">The scheduled event id.</param>
 		/// <param name="limit">The limit how many users to receive from the event.</param>
 		/// <param name="before">Get results before the given id.</param>
 		/// <param name="after">Get results after the given id.</param>
 		/// <param name="withMember">Whether to include guild member data. attaches guild_member property to the user object.</param>
 		internal async Task<IReadOnlyDictionary<ulong, DiscordScheduledEventUser>> GetGuildScheduledEventRspvUsersAsync(ulong guildId, ulong scheduledEventId, int? limit, ulong? before, ulong? after, bool? withMember)
 		{
 			var urlParams = new Dictionary<string, string>();
 			if (limit != null && limit > 0)
 				urlParams["limit"] = limit.Value.ToString(CultureInfo.InvariantCulture);
 			if (before != null)
 				urlParams["before"] = before.Value.ToString(CultureInfo.InvariantCulture);
 			if (after != null)
 				urlParams["after"] = after.Value.ToString(CultureInfo.InvariantCulture);
 			if (withMember != null)
 				urlParams["with_member"] = withMember.Value.ToString(CultureInfo.InvariantCulture);
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.SCHEDULED_EVENTS}/:scheduled_event_id{Endpoints.USERS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId, scheduled_event_id = scheduledEventId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var rspvUsers = JsonConvert.DeserializeObject<IEnumerable<DiscordScheduledEventUser>>(res.Response);
 			Dictionary<ulong, DiscordScheduledEventUser> rspv = new();
 
 			foreach (var rspvUser in rspvUsers)
 			{
 
 				rspvUser.Discord = this.Discord;
 				rspvUser.GuildId = guildId;
 
 				rspvUser.User.Discord = this.Discord;
 				rspvUser.User = this.Discord.UserCache.AddOrUpdate(rspvUser.User.Id, rspvUser.User, (id, old) =>
 				{
 					old.Username = rspvUser.User.Username;
 					old.Discriminator = rspvUser.User.Discriminator;
 					old.AvatarHash = rspvUser.User.AvatarHash;
 					old.BannerHash = rspvUser.User.BannerHash;
 					old.BannerColorInternal = rspvUser.User.BannerColorInternal;
 					return old;
 				});
 
 				/*if (with_member.HasValue && with_member.Value && rspv_user.Member != null)
                 {
                     rspv_user.Member.Discord = this.Discord;
                 }*/
 
 				rspv.Add(rspvUser.User.Id, rspvUser);
 			}
 
 			return new ReadOnlyDictionary<ulong, DiscordScheduledEventUser>(new Dictionary<ulong, DiscordScheduledEventUser>(rspv));
 		}
 		#endregion
 
 		#region Channel
 		/// <summary>
 		/// Creates the guild channel async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="type">The type.</param>
 		/// <param name="parent">The parent.</param>
 		/// <param name="topic">The topic.</param>
 		/// <param name="bitrate">The bitrate.</param>
 		/// <param name="userLimit">The user_limit.</param>
 		/// <param name="overwrites">The overwrites.</param>
 		/// <param name="nsfw">If true, nsfw.</param>
 		/// <param name="perUserRateLimit">The per user rate limit.</param>
 		/// <param name="qualityMode">The quality mode.</param>
 		/// <param name="defaultAutoArchiveDuration">The default auto archive duration.</param>
 		/// <param name="reason">The reason.</param>
 		internal async Task<DiscordChannel> CreateGuildChannelAsync(ulong guildId, string name, ChannelType type, ulong? parent, Optional<string> topic, int? bitrate, int? userLimit, IEnumerable<DiscordOverwriteBuilder> overwrites, bool? nsfw, Optional<int?> perUserRateLimit, VideoQualityMode? qualityMode, ThreadAutoArchiveDuration? defaultAutoArchiveDuration, string reason)
 		{
 			var restOverwrites = new List<DiscordRestOverwrite>();
 			if (overwrites != null)
 				foreach (var ow in overwrites)
 					restOverwrites.Add(ow.Build());
 
 			var pld = new RestChannelCreatePayload
 			{
 				Name = name,
 				Type = type,
 				Parent = parent,
 				Topic = topic,
 				Bitrate = bitrate,
 				UserLimit = userLimit,
 				PermissionOverwrites = restOverwrites,
 				Nsfw = nsfw,
 				PerUserRateLimit = perUserRateLimit,
 				QualityMode = qualityMode,
 				DefaultAutoArchiveDuration = defaultAutoArchiveDuration
 			};
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.CHANNELS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordChannel>(res.Response);
 			ret.Discord = this.Discord;
 			foreach (var xo in ret.PermissionOverwritesInternal)
 			{
 				xo.Discord = this.Discord;
 				xo.ChannelId = ret.Id;
 			}
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Modifies the channel async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="position">The position.</param>
 		/// <param name="topic">The topic.</param>
 		/// <param name="nsfw">If true, nsfw.</param>
 		/// <param name="parent">The parent.</param>
 		/// <param name="bitrate">The bitrate.</param>
 		/// <param name="userLimit">The user_limit.</param>
 		/// <param name="perUserRateLimit">The per user rate limit.</param>
 		/// <param name="rtcRegion">The rtc region.</param>
 		/// <param name="qualityMode">The quality mode.</param>
 		/// <param name="autoArchiveDuration">The default auto archive duration.</param>
 		/// <param name="type">The type.</param>
 		/// <param name="permissionOverwrites">The permission overwrites.</param>
 		/// <param name="bannerb64">The banner.</param>
 		/// <param name="reason">The reason.</param>
 		internal Task ModifyChannelAsync(ulong channelId, string name, int? position, Optional<string> topic, bool? nsfw, Optional<ulong?> parent, int? bitrate, int? userLimit, Optional<int?> perUserRateLimit, Optional<string> rtcRegion, VideoQualityMode? qualityMode, ThreadAutoArchiveDuration? autoArchiveDuration, Optional<ChannelType> type, IEnumerable<DiscordOverwriteBuilder> permissionOverwrites, Optional<string> bannerb64, string reason)
 		{
 
 			List<DiscordRestOverwrite> restoverwrites = null;
 			if (permissionOverwrites != null)
 			{
 				restoverwrites = new List<DiscordRestOverwrite>();
 				foreach (var ow in permissionOverwrites)
 					restoverwrites.Add(ow.Build());
 			}
 
 			var pld = new RestChannelModifyPayload
 			{
 				Name = name,
 				Position = position,
 				Topic = topic,
 				Nsfw = nsfw,
 				Parent = parent,
 				Bitrate = bitrate,
 				UserLimit = userLimit,
 				PerUserRateLimit = perUserRateLimit,
 				RtcRegion = rtcRegion,
 				QualityMode = qualityMode,
 				DefaultAutoArchiveDuration = autoArchiveDuration,
 				Type = type,
 				PermissionOverwrites = restoverwrites,
 				BannerBase64 = bannerb64
 			};
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
 		}
 
 		/// <summary>
 		/// Gets the channel async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 
 		internal async Task<DiscordChannel> GetChannelAsync(ulong channelId)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordChannel>(res.Response);
 			ret.Discord = this.Discord;
 			foreach (var xo in ret.PermissionOverwritesInternal)
 			{
 				xo.Discord = this.Discord;
 				xo.ChannelId = ret.Id;
 			}
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Deletes the channel async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task DeleteChannelAsync(ulong channelId, string reason)
 		{
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
 		}
 
 		/// <summary>
 		/// Gets the message async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="messageId">The message_id.</param>
 
 		internal async Task<DiscordMessage> GetMessageAsync(ulong channelId, ulong messageId)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId, message_id = messageId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var ret = this.PrepareMessage(JObject.Parse(res.Response));
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Creates the message async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="content">The content.</param>
 		/// <param name="embeds">The embeds.</param>
 		/// <param name="sticker">The sticker.</param>
 		/// <param name="replyMessageId">The reply message id.</param>
 		/// <param name="mentionReply">If true, mention reply.</param>
 		/// <param name="failOnInvalidReply">If true, fail on invalid reply.</param>
 
 		internal async Task<DiscordMessage> CreateMessageAsync(ulong channelId, string content, IEnumerable<DiscordEmbed> embeds, DiscordSticker sticker, ulong? replyMessageId, bool mentionReply, bool failOnInvalidReply)
 		{
 			if (content != null && content.Length > 2000)
 				throw new ArgumentException("Message content length cannot exceed 2000 characters.");
 
 			if (!embeds?.Any() ?? true)
 			{
 				if (content == null && sticker == null)
 					throw new ArgumentException("You must specify message content, a sticker or an embed.");
 				if (content.Length == 0)
 					throw new ArgumentException("Message content must not be empty.");
 			}
 
 			if (embeds != null)
 				foreach (var embed in embeds)
 					if (embed.Timestamp != null)
 						embed.Timestamp = embed.Timestamp.Value.ToUniversalTime();
 
 			var pld = new RestChannelMessageCreatePayload
 			{
 				HasContent = content != null,
 				Content = content,
 				StickersIds = sticker is null ? Array.Empty<ulong>() : new[] {sticker.Id},
 				IsTts = false,
 				HasEmbed = embeds?.Any() ?? false,
 				Embeds = embeds
 			};
 
 			if (replyMessageId != null)
 				pld.MessageReference = new InternalDiscordMessageReference { MessageId = replyMessageId, FailIfNotExists = failOnInvalidReply };
 
 			if (replyMessageId != null)
 				pld.Mentions = new DiscordMentions(Mentions.All, true, mentionReply);
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var ret = this.PrepareMessage(JObject.Parse(res.Response));
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Creates the message async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="builder">The builder.</param>
 
 		internal async Task<DiscordMessage> CreateMessageAsync(ulong channelId, DiscordMessageBuilder builder)
 		{
 			builder.Validate();
 
 			if (builder.Embeds != null)
 				foreach (var embed in builder.Embeds)
 					if (embed?.Timestamp != null)
 						embed.Timestamp = embed.Timestamp.Value.ToUniversalTime();
 
 			var pld = new RestChannelMessageCreatePayload
 			{
 				HasContent = builder.Content != null,
 				Content = builder.Content,
 				StickersIds = builder.Sticker is null ? Array.Empty<ulong>() : new[] {builder.Sticker.Id},
 				IsTts = builder.IsTts,
 				HasEmbed = builder.Embeds != null,
 				Embeds = builder.Embeds,
 				Components = builder.Components
 			};
 
 			if (builder.ReplyId != null)
 				pld.MessageReference = new InternalDiscordMessageReference { MessageId = builder.ReplyId, FailIfNotExists = builder.FailOnInvalidReply };
 
 			pld.Mentions = new DiscordMentions(builder.Mentions ?? Mentions.All, builder.Mentions?.Any() ?? false, builder.MentionOnReply);
 
 			if (builder.Files.Count == 0)
 			{
 				var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}";
 				var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId }, out var path);
 
 				var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 				var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 				var ret = this.PrepareMessage(JObject.Parse(res.Response));
 				return ret;
 			}
 			else
 			{
 				ulong fileId = 0;
 				List<DiscordAttachment> attachments = new(builder.Files.Count);
 				foreach (var file in builder.Files)
 				{
 					DiscordAttachment att = new()
 					{
 						Id = fileId,
 						Discord = this.Discord,
 						Description = file.Description,
 						FileName = file.FileName
 					};
 					attachments.Add(att);
 					fileId++;
 				}
 				pld.Attachments = attachments;
 
 				var values = new Dictionary<string, string>
 				{
 					["payload_json"] = DiscordJson.SerializeObject(pld)
 				};
 
 				var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}";
 				var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId }, out var path);
 
 				var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 				var res = await this.DoMultipartAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, values: values, files: builder.Files).ConfigureAwait(false);
 
 				var ret = this.PrepareMessage(JObject.Parse(res.Response));
 
 				foreach (var file in builder.FilesInternal.Where(x => x.ResetPositionTo.HasValue))
 				{
 					file.Stream.Position = file.ResetPositionTo.Value;
 				}
 
 				return ret;
 			}
 		}
 
 		/// <summary>
 		/// Gets the guild channels async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 
 		internal async Task<IReadOnlyList<DiscordChannel>> GetGuildChannelsAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.CHANNELS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-			var channelsRaw = JsonConvert.DeserializeObject<IEnumerable<DiscordChannel>>(res.Response).Select(xc => { xc.Discord = this.Discord; return xc; });
-
-			foreach (var ret in channelsRaw)
-				foreach (var xo in ret.PermissionOverwritesInternal)
+			return JsonConvert.DeserializeObject<List<DiscordChannel>>(res.Response)
+				.Mutate(xc =>
 				{
-					xo.Discord = this.Discord;
-					xo.ChannelId = ret.Id;
-				}
-
-			return new ReadOnlyCollection<DiscordChannel>(new List<DiscordChannel>(channelsRaw));
+					xc.Discord = this.Discord;
+					xc.PermissionOverwritesInternal.Mutate(xo =>
+					{
+						xo.Discord = this.Discord;
+						xo.ChannelId = xc.Id;
+					});
+				});
 		}
 
 		/// <summary>
 		/// Creates the stage instance async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="topic">The topic.</param>
 		/// <param name="sendStartNotification">Whether everyone should be notified about the stage.</param>
 		/// <param name="privacyLevel">The privacy_level.</param>
 		/// <param name="reason">The reason.</param>
 		internal async Task<DiscordStageInstance> CreateStageInstanceAsync(ulong channelId, string topic, bool sendStartNotification, StagePrivacyLevel privacyLevel, string reason)
 		{
 			var pld = new RestStageInstanceCreatePayload
 			{
 				ChannelId = channelId,
 				Topic = topic,
 				PrivacyLevel = privacyLevel,
 				SendStartNotification = sendStartNotification
 			};
 
 			var route = $"{Endpoints.STAGE_INSTANCES}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new { }, out var path);
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var stageInstance = JsonConvert.DeserializeObject<DiscordStageInstance>(res.Response);
 
 			return stageInstance;
 		}
 
 		/// <summary>
 		/// Gets the stage instance async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		internal async Task<DiscordStageInstance> GetStageInstanceAsync(ulong channelId)
 		{
 			var route = $"{Endpoints.STAGE_INSTANCES}/:channel_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var stageInstance = JsonConvert.DeserializeObject<DiscordStageInstance>(res.Response);
 
 			return stageInstance;
 		}
 
 		/// <summary>
 		/// Modifies the stage instance async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="topic">The topic.</param>
 		/// <param name="privacyLevel">The privacy_level.</param>
 		/// <param name="reason">The reason.</param>
 		internal Task ModifyStageInstanceAsync(ulong channelId, Optional<string> topic, Optional<StagePrivacyLevel> privacyLevel, string reason)
 		{
 			var pld = new RestStageInstanceModifyPayload
 			{
 				Topic = topic,
 				PrivacyLevel = privacyLevel
 			};
 
 			var route = $"{Endpoints.STAGE_INSTANCES}/:channel_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {channel_id = channelId }, out var path);
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
 		}
 
 		/// <summary>
 		/// Deletes the stage instance async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="reason">The reason.</param>
 		internal Task DeleteStageInstanceAsync(ulong channelId, string reason)
 		{
 			var route = $"{Endpoints.STAGE_INSTANCES}/:channel_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId }, out var path);
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
 		}
 
 		/// <summary>
 		/// Gets the channel messages async.
 		/// </summary>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="limit">The limit.</param>
 		/// <param name="before">The before.</param>
 		/// <param name="after">The after.</param>
 		/// <param name="around">The around.</param>
 
 		internal async Task<IReadOnlyList<DiscordMessage>> GetChannelMessagesAsync(ulong channelId, int limit, ulong? before, ulong? after, ulong? around)
 		{
 			var urlParams = new Dictionary<string, string>();
 			if (around != null)
 				urlParams["around"] = around?.ToString(CultureInfo.InvariantCulture);
 			if (before != null)
 				urlParams["before"] = before?.ToString(CultureInfo.InvariantCulture);
 			if (after != null)
 				urlParams["after"] = after?.ToString(CultureInfo.InvariantCulture);
 			if (limit > 0)
 				urlParams["limit"] = limit.ToString(CultureInfo.InvariantCulture);
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-			var msgsRaw = JArray.Parse(res.Response);
-			var msgs = new List<DiscordMessage>();
-			foreach (var xj in msgsRaw)
-				msgs.Add(this.PrepareMessage(xj));
-
-			return new ReadOnlyCollection<DiscordMessage>(new List<DiscordMessage>(msgs));
+			return JArray.Parse(res.Response)
+				.Select(this.PrepareMessage)
+				.ToArray();
 		}
 
 		/// <summary>
 		/// Gets the channel message async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="messageId">The message_id.</param>
 
 		internal async Task<DiscordMessage> GetChannelMessageAsync(ulong channelId, ulong messageId)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId, message_id = messageId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var ret = this.PrepareMessage(JObject.Parse(res.Response));
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Edits the message async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="messageId">The message_id.</param>
 		/// <param name="content">The content.</param>
 		/// <param name="embeds">The embeds.</param>
 		/// <param name="mentions">The mentions.</param>
 		/// <param name="components">The components.</param>
 		/// <param name="suppressEmbed">The suppress_embed.</param>
 		/// <param name="files">The files.</param>
 		/// <param name="attachments">The attachments to keep.</param>
 
-		internal async Task<DiscordMessage> EditMessageAsync(ulong channelId, ulong messageId, Optional<string> content, Optional<IEnumerable<DiscordEmbed>> embeds, Optional<IEnumerable<IMention>> mentions, IReadOnlyList<DiscordActionRowComponent> components, Optional<bool> suppressEmbed, IReadOnlyCollection<DiscordMessageFile> files, Optional<IEnumerable<DiscordAttachment>> attachments)
+		internal async Task<DiscordMessage> EditMessageAsync(ulong channelId, ulong messageId, Optional<string> content, Optional<IEnumerable<DiscordEmbed>> embeds, Optional<IEnumerable<IMention>> mentions, IReadOnlyList<DiscordActionRowComponent> components, Optional<bool> suppressEmbed, IReadOnlyList<DiscordMessageFile> files, Optional<IEnumerable<DiscordAttachment>> attachments)
 		{
 			if (embeds.HasValue && embeds.Value != null)
 				foreach (var embed in embeds.Value)
 					if (embed.Timestamp != null)
 						embed.Timestamp = embed.Timestamp.Value.ToUniversalTime();
 
 			var pld = new RestChannelMessageEditPayload
 			{
 				HasContent = content.HasValue,
 				Content = content.ValueOrDefault(),
 				HasEmbed = embeds.HasValue && (embeds.Value?.Any() ?? false),
 				Embeds = embeds.HasValue && (embeds.Value?.Any() ?? false) ? embeds.Value : null,
 				Components = components,
 				Flags = suppressEmbed.HasValue && (bool)suppressEmbed ? MessageFlags.SuppressedEmbeds : null,
 				Mentions = mentions
 				.Map(m => new DiscordMentions(m ?? Mentions.None, false, mentions.Value?.OfType<RepliedUserMention>().Any() ?? false))
 				.ValueOrDefault()
 			};
 
 			if (files?.Count > 0)
 			{
 				ulong fileId = 0;
 				List<DiscordAttachment> attachmentsNew = new();
 				foreach (var file in files)
 				{
 					DiscordAttachment att = new()
 					{
 						Id = fileId,
 						Discord = this.Discord,
 						Description = file.Description,
 						FileName = file.FileName
 					};
 					attachmentsNew.Add(att);
 					fileId++;
 				}
 				if (attachments.HasValue && attachments.Value.Any())
 					attachmentsNew.AddRange(attachments.Value);
 
 				pld.Attachments = attachmentsNew;
 
 				var values = new Dictionary<string, string>
 				{
 					["payload_json"] = DiscordJson.SerializeObject(pld)
 				};
 
 				var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id";
 				var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {channel_id = channelId, message_id = messageId }, out var path);
 
 				var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 				var res = await this.DoMultipartAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, values: values, files: files).ConfigureAwait(false);
 
 				var ret = this.PrepareMessage(JObject.Parse(res.Response));
 
 				foreach (var file in files.Where(x => x.ResetPositionTo.HasValue))
 				{
 					file.Stream.Position = file.ResetPositionTo.Value;
 				}
 
 				return ret;
 			}
 			else
 			{
 				pld.Attachments = attachments.ValueOrDefault();
 
 				var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id";
 				var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {channel_id = channelId, message_id = messageId }, out var path);
 
 				var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 				var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 				var ret = this.PrepareMessage(JObject.Parse(res.Response));
 
 				return ret;
 			}
 		}
 
 		/// <summary>
 		/// Deletes the message async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="messageId">The message_id.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task DeleteMessageAsync(ulong channelId, ulong messageId, string reason)
 		{
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, message_id = messageId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
 		}
 
 		/// <summary>
 		/// Deletes the messages async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="messageIds">The message_ids.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task DeleteMessagesAsync(ulong channelId, IEnumerable<ulong> messageIds, string reason)
 		{
 			var pld = new RestChannelMessageBulkDeletePayload
 			{
 				Messages = messageIds
 			};
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}{Endpoints.BULK_DELETE}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld));
 		}
 
 		/// <summary>
 		/// Gets the channel invites async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 
 		internal async Task<IReadOnlyList<DiscordInvite>> GetChannelInvitesAsync(ulong channelId)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.INVITES}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var invitesRaw = JsonConvert.DeserializeObject<IEnumerable<DiscordInvite>>(res.Response).Select(xi => { xi.Discord = this.Discord; return xi; });
 
-			return new ReadOnlyCollection<DiscordInvite>(new List<DiscordInvite>(invitesRaw));
+			return JsonConvert.DeserializeObject<List<DiscordInvite>>(res.Response)
+				.Mutate(xi => xi.Discord = this.Discord);
 		}
 
 		/// <summary>
 		/// Creates the channel invite async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="maxAge">The max_age.</param>
 		/// <param name="maxUses">The max_uses.</param>
 		/// <param name="targetType">The target_type.</param>
 		/// <param name="targetApplication">The target_application.</param>
 		/// <param name="targetUser">The target_user.</param>
 		/// <param name="temporary">If true, temporary.</param>
 		/// <param name="unique">If true, unique.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal async Task<DiscordInvite> CreateChannelInviteAsync(ulong channelId, int maxAge, int maxUses, TargetType? targetType, TargetActivity? targetApplication, ulong? targetUser, bool temporary, bool unique, string reason)
 		{
 			var pld = new RestChannelInviteCreatePayload
 			{
 				MaxAge = maxAge,
 				MaxUses = maxUses,
 				TargetType = targetType,
 				TargetApplication = targetApplication,
 				TargetUserId = targetUser,
 				Temporary = temporary,
 				Unique = unique
 			};
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.INVITES}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordInvite>(res.Response);
 			ret.Discord = this.Discord;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Deletes the channel permission async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="overwriteId">The overwrite_id.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task DeleteChannelPermissionAsync(ulong channelId, ulong overwriteId, string reason)
 		{
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.PERMISSIONS}/:overwrite_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, overwrite_id = overwriteId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
 		}
 
 		/// <summary>
 		/// Edits the channel permissions async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="overwriteId">The overwrite_id.</param>
 		/// <param name="allow">The allow.</param>
 		/// <param name="deny">The deny.</param>
 		/// <param name="type">The type.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task EditChannelPermissionsAsync(ulong channelId, ulong overwriteId, Permissions allow, Permissions deny, string type, string reason)
 		{
 			var pld = new RestChannelPermissionEditPayload
 			{
 				Type = type,
 				Allow = allow & PermissionMethods.FullPerms,
 				Deny = deny & PermissionMethods.FullPerms
 			};
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.PERMISSIONS}/:overwrite_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {channel_id = channelId, overwrite_id = overwriteId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, headers, DiscordJson.SerializeObject(pld));
 		}
 
 		/// <summary>
 		/// Triggers the typing async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 
 		internal Task TriggerTypingAsync(ulong channelId)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.TYPING}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route);
 		}
 
 		/// <summary>
 		/// Gets the pinned messages async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 
 		internal async Task<IReadOnlyList<DiscordMessage>> GetPinnedMessagesAsync(ulong channelId)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.PINS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-			var msgsRaw = JArray.Parse(res.Response);
-			var msgs = new List<DiscordMessage>();
-			foreach (var xj in msgsRaw)
-				msgs.Add(this.PrepareMessage(xj));
-
-			return new ReadOnlyCollection<DiscordMessage>(new List<DiscordMessage>(msgs));
+			return JArray.Parse(res.Response)
+				.Select(this.PrepareMessage)
+				.ToArray();
 		}
 
 		/// <summary>
 		/// Pins the message async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="messageId">The message_id.</param>
 
 		internal Task PinMessageAsync(ulong channelId, ulong messageId)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.PINS}/:message_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {channel_id = channelId, message_id = messageId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route);
 		}
 
 		/// <summary>
 		/// Unpins the message async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="messageId">The message_id.</param>
 
 		internal Task UnpinMessageAsync(ulong channelId, ulong messageId)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.PINS}/:message_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, message_id = messageId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route);
 		}
 
 		/// <summary>
 		/// Adds the group dm recipient async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="userId">The user_id.</param>
 		/// <param name="accessToken">The access_token.</param>
 		/// <param name="nickname">The nickname.</param>
 
 		internal Task AddGroupDmRecipientAsync(ulong channelId, ulong userId, string accessToken, string nickname)
 		{
 			var pld = new RestChannelGroupDmRecipientAddPayload
 			{
 				AccessToken = accessToken,
 				Nickname = nickname
 			};
 
 			var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.CHANNELS}/:channel_id{Endpoints.RECIPIENTS}/:user_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {channel_id = channelId, user_id = userId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, payload: DiscordJson.SerializeObject(pld));
 		}
 
 		/// <summary>
 		/// Removes the group dm recipient async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="userId">The user_id.</param>
 
 		internal Task RemoveGroupDmRecipientAsync(ulong channelId, ulong userId)
 		{
 			var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.CHANNELS}/:channel_id{Endpoints.RECIPIENTS}/:user_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, user_id = userId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route);
 		}
 
 		/// <summary>
 		/// Creates the group dm async.
 		/// </summary>
 		/// <param name="accessTokens">The access_tokens.</param>
 		/// <param name="nicks">The nicks.</param>
 
 		internal async Task<DiscordDmChannel> CreateGroupDmAsync(IEnumerable<string> accessTokens, IDictionary<ulong, string> nicks)
 		{
 			var pld = new RestUserGroupDmCreatePayload
 			{
 				AccessTokens = accessTokens,
 				Nicknames = nicks
 			};
 
 			var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.CHANNELS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new { }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordDmChannel>(res.Response);
 			ret.Discord = this.Discord;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Creates the dm async.
 		/// </summary>
 		/// <param name="recipientId">The recipient_id.</param>
 
 		internal async Task<DiscordDmChannel> CreateDmAsync(ulong recipientId)
 		{
 			var pld = new RestUserDmCreatePayload
 			{
 				Recipient = recipientId
 			};
 
 			var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.CHANNELS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new { }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordDmChannel>(res.Response);
 			ret.Discord = this.Discord;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Follows the channel async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="webhookChannelId">The webhook_channel_id.</param>
 
 		internal async Task<DiscordFollowedChannel> FollowChannelAsync(ulong channelId, ulong webhookChannelId)
 		{
 			var pld = new FollowedChannelAddPayload
 			{
 				WebhookChannelId = webhookChannelId
 			};
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.FOLLOWERS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var response = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			return JsonConvert.DeserializeObject<DiscordFollowedChannel>(response.Response);
 		}
 
 		/// <summary>
 		/// Crossposts the message async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="messageId">The message_id.</param>
 
 		internal async Task<DiscordMessage> CrosspostMessageAsync(ulong channelId, ulong messageId)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id{Endpoints.CROSSPOST}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId, message_id = messageId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var response = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route).ConfigureAwait(false);
 			return JsonConvert.DeserializeObject<DiscordMessage>(response.Response);
 		}
 
 		#endregion
 
 		#region Member
 		/// <summary>
 		/// Gets the current user async.
 		/// </summary>
 
 		internal Task<DiscordUser> GetCurrentUserAsync()
 			=> this.GetUserAsync("@me");
 
 		/// <summary>
 		/// Gets the user async.
 		/// </summary>
 		/// <param name="userId">The user_id.</param>
 
 		internal Task<DiscordUser> GetUserAsync(ulong userId)
 			=> this.GetUserAsync(userId.ToString(CultureInfo.InvariantCulture));
 
 		/// <summary>
 		/// Gets the user async.
 		/// </summary>
 		/// <param name="userId">The user_id.</param>
 
 		internal async Task<DiscordUser> GetUserAsync(string userId)
 		{
 			var route = $"{Endpoints.USERS}/:user_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {user_id = userId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var userRaw = JsonConvert.DeserializeObject<TransportUser>(res.Response);
 			var duser = new DiscordUser(userRaw) { Discord = this.Discord };
 
 			return duser;
 		}
 
 		/// <summary>
 		/// Gets the guild member async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="userId">The user_id.</param>
 
 		internal async Task<DiscordMember> GetGuildMemberAsync(ulong guildId, ulong userId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}/:user_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId, user_id = userId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var tm = JsonConvert.DeserializeObject<TransportMember>(res.Response);
 
 			var usr = new DiscordUser(tm.User) { Discord = this.Discord };
 			usr = this.Discord.UserCache.AddOrUpdate(tm.User.Id, usr, (id, old) =>
 			{
 				old.Username = usr.Username;
 				old.Discriminator = usr.Discriminator;
 				old.AvatarHash = usr.AvatarHash;
 				return old;
 			});
 
 			return new DiscordMember(tm)
 			{
 				Discord = this.Discord,
 				GuildId = guildId
 			};
 		}
 
 		/// <summary>
 		/// Removes the guild member async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="userId">The user_id.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task RemoveGuildMemberAsync(ulong guildId, ulong userId, string reason)
 		{
 			var urlParams = new Dictionary<string, string>();
 			if (reason != null)
 				urlParams["reason"] = reason;
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}/:user_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId, user_id = userId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, BuildQueryString(urlParams), this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route);
 		}
 
 		/// <summary>
 		/// Modifies the current user async.
 		/// </summary>
 		/// <param name="username">The username.</param>
 		/// <param name="base64Avatar">The base64_avatar.</param>
 
 		internal async Task<TransportUser> ModifyCurrentUserAsync(string username, Optional<string> base64Avatar)
 		{
 			var pld = new RestUserUpdateCurrentPayload
 			{
 				Username = username,
 				AvatarBase64 = base64Avatar.ValueOrDefault(),
 				AvatarSet = base64Avatar.HasValue
 			};
 
 			var route = $"{Endpoints.USERS}{Endpoints.ME}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new { }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var userRaw = JsonConvert.DeserializeObject<TransportUser>(res.Response);
 
 			return userRaw;
 		}
 
 		/// <summary>
 		/// Gets the current user guilds async.
 		/// </summary>
 		/// <param name="limit">The limit.</param>
 		/// <param name="before">The before.</param>
 		/// <param name="after">The after.</param>
 
 		internal async Task<IReadOnlyList<DiscordGuild>> GetCurrentUserGuildsAsync(int limit = 100, ulong? before = null, ulong? after = null)
 		{
 			var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.GUILDS}";
 
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { }, out var path);
 
 			var url = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration)
 				.AddParameter($"limit", limit.ToString(CultureInfo.InvariantCulture));
 
 			if (before != null)
 				url.AddParameter("before", before.Value.ToString(CultureInfo.InvariantCulture));
 			if (after != null)
 				url.AddParameter("after", after.Value.ToString(CultureInfo.InvariantCulture));
 
 			var res = await this.DoRequestAsync(this.Discord, bucket, url.Build(), RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			if (this.Discord is DiscordClient)
 			{
 				var guildsRaw = JsonConvert.DeserializeObject<IEnumerable<RestUserGuild>>(res.Response);
-				var glds = guildsRaw.Select(xug => (this.Discord as DiscordClient)?.GuildsInternal[xug.Id]);
-				return new ReadOnlyCollection<DiscordGuild>(new List<DiscordGuild>(glds));
+				return guildsRaw.Select(xug => (this.Discord as DiscordClient)?.GuildsInternal[xug.Id])
+					.ToArray();
 			}
 			else
 			{
-				return new ReadOnlyCollection<DiscordGuild>(JsonConvert.DeserializeObject<List<DiscordGuild>>(res.Response));
+				return JsonConvert.DeserializeObject<List<DiscordGuild>>(res.Response);
 			}
 		}
 
 		/// <summary>
 		/// Modifies the guild member async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="userId">The user_id.</param>
 		/// <param name="nick">The nick.</param>
 		/// <param name="roleIds">The role_ids.</param>
 		/// <param name="mute">The mute.</param>
 		/// <param name="deaf">The deaf.</param>
 		/// <param name="voiceChannelId">The voice_channel_id.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task ModifyGuildMemberAsync(ulong guildId, ulong userId, Optional<string> nick,
 			Optional<IEnumerable<ulong>> roleIds, Optional<bool> mute, Optional<bool> deaf,
 			Optional<ulong?> voiceChannelId, string reason)
 		{
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var pld = new RestGuildMemberModifyPayload
 			{
 				Nickname = nick,
 				RoleIds = roleIds,
 				Deafen = deaf,
 				Mute = mute,
 				VoiceChannelId = voiceChannelId
 			};
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}/:user_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, user_id = userId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, payload: DiscordJson.SerializeObject(pld));
 		}
 
 		/// <summary>
 		/// Modifies the time out of a guild member.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="userId">The user_id.</param>
 		/// <param name="until">Datetime offset.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task ModifyTimeoutAsync(ulong guildId, ulong userId, DateTimeOffset? until, string reason)
 		{
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var pld = new RestGuildMemberTimeoutModifyPayload
 			{
 				CommunicationDisabledUntil = until
 			};
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}/:user_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, user_id = userId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, payload: DiscordJson.SerializeObject(pld));
 		}
 
 		/// <summary>
 		/// Modifies the current member nickname async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="nick">The nick.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task ModifyCurrentMemberNicknameAsync(ulong guildId, string nick, string reason)
 		{
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var pld = new RestGuildMemberModifyPayload
 			{
 				Nickname = nick
 			};
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.MEMBERS}{Endpoints.ME}{Endpoints.NICK}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, payload: DiscordJson.SerializeObject(pld));
 		}
 		#endregion
 
 		#region Roles
 		/// <summary>
 		/// Gets the guild roles async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 
 		internal async Task<IReadOnlyList<DiscordRole>> GetGuildRolesAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.ROLES}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-			var rolesRaw = JsonConvert.DeserializeObject<IEnumerable<DiscordRole>>(res.Response).Select(xr => { xr.Discord = this.Discord; xr.GuildId = guildId; return xr; });
-
-			return new ReadOnlyCollection<DiscordRole>(new List<DiscordRole>(rolesRaw));
+			return JsonConvert.DeserializeObject<List<DiscordRole>>(res.Response)
+				.Mutate(xr => { xr.Discord = this.Discord; xr.GuildId = guildId; });
 		}
 
 		/// <summary>
 		/// Gets the guild async.
 		/// </summary>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="withCounts">If true, with_counts.</param>
 
 		internal async Task<DiscordGuild> GetGuildAsync(ulong guildId, bool? withCounts)
 		{
 			var urlParams = new Dictionary<string, string>();
 			if (withCounts.HasValue)
 				urlParams["with_counts"] = withCounts?.ToString();
 
 			var route = $"{Endpoints.GUILDS}/:guild_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route, urlParams).ConfigureAwait(false);
 
 			var json = JObject.Parse(res.Response);
 			var rawMembers = (JArray)json["members"];
 			var guildRest = json.ToDiscordObject<DiscordGuild>();
 			foreach (var r in guildRest.RolesInternal.Values)
 				r.GuildId = guildRest.Id;
 
 			if (this.Discord is DiscordClient dc)
 			{
 				await dc.OnGuildUpdateEventAsync(guildRest, rawMembers).ConfigureAwait(false);
 				return dc.GuildsInternal[guildRest.Id];
 			}
 			else
 			{
 				guildRest.Discord = this.Discord;
 				return guildRest;
 			}
 		}
 
 		/// <summary>
 		/// Modifies the guild role async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="roleId">The role_id.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="permissions">The permissions.</param>
 		/// <param name="color">The color.</param>
 		/// <param name="hoist">If true, hoist.</param>
 		/// <param name="mentionable">If true, mentionable.</param>
 		/// <param name="iconb64">The icon.</param>
 		/// <param name="emoji">The unicode emoji icon.</param>
 		/// <param name="reason">The reason.</param>
 		internal async Task<DiscordRole> ModifyGuildRoleAsync(ulong guildId, ulong roleId, string name, Permissions? permissions, int? color, bool? hoist, bool? mentionable, Optional<string> iconb64, Optional<string> emoji, string reason)
 		{
 			var pld = new RestGuildRolePayload
 			{
 				Name = name,
 				Permissions = permissions & PermissionMethods.FullPerms,
 				Color = color,
 				Hoist = hoist,
 				Mentionable = mentionable,
 			};
 
 			if (emoji.HasValue && !iconb64.HasValue)
 				pld.UnicodeEmoji = emoji;
 
 			if (emoji.HasValue && iconb64.HasValue)
 			{
 				pld.IconBase64 = null;
 				pld.UnicodeEmoji = emoji;
 			}
 
 			if (iconb64.HasValue)
 				pld.IconBase64 = iconb64;
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.ROLES}/:role_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, role_id = roleId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordRole>(res.Response);
 			ret.Discord = this.Discord;
 			ret.GuildId = guildId;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Deletes the role async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="roleId">The role_id.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task DeleteRoleAsync(ulong guildId, ulong roleId, string reason)
 		{
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.ROLES}/:role_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId, role_id = roleId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
 		}
 
 		/// <summary>
 		/// Creates the guild role async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="permissions">The permissions.</param>
 		/// <param name="color">The color.</param>
 		/// <param name="hoist">If true, hoist.</param>
 		/// <param name="mentionable">If true, mentionable.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal async Task<DiscordRole> CreateGuildRoleAsync(ulong guildId, string name, Permissions? permissions, int? color, bool? hoist, bool? mentionable, string reason)
 		{
 			var pld = new RestGuildRolePayload
 			{
 				Name = name,
 				Permissions = permissions & PermissionMethods.FullPerms,
 				Color = color,
 				Hoist = hoist,
 				Mentionable = mentionable
 			};
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.ROLES}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordRole>(res.Response);
 			ret.Discord = this.Discord;
 			ret.GuildId = guildId;
 
 			return ret;
 		}
 		#endregion
 
 		#region Prune
 		/// <summary>
 		/// Gets the guild prune count async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="days">The days.</param>
 		/// <param name="includeRoles">The include_roles.</param>
 
 		internal async Task<int> GetGuildPruneCountAsync(ulong guildId, int days, IEnumerable<ulong> includeRoles)
 		{
 			if (days < 0 || days > 30)
 				throw new ArgumentException("Prune inactivity days must be a number between 0 and 30.", nameof(days));
 
 			var urlParams = new Dictionary<string, string>
 			{
 				["days"] = days.ToString(CultureInfo.InvariantCulture)
 			};
 
 			var sb = includeRoles?.Aggregate(new StringBuilder(),
 				         (sb, id) => sb.Append($"&include_roles={id}"))
 			         ?? new StringBuilder();
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.PRUNE}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 			var url = Utilities.GetApiUriFor(path, $"{BuildQueryString(urlParams)}{sb}", this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var pruned = JsonConvert.DeserializeObject<RestGuildPruneResultPayload>(res.Response);
 
 			return pruned.Pruned.Value;
 		}
 
 		/// <summary>
 		/// Begins the guild prune async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="days">The days.</param>
 		/// <param name="computePruneCount">If true, compute_prune_count.</param>
 		/// <param name="includeRoles">The include_roles.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal async Task<int?> BeginGuildPruneAsync(ulong guildId, int days, bool computePruneCount, IEnumerable<ulong> includeRoles, string reason)
 		{
 			if (days < 0 || days > 30)
 				throw new ArgumentException("Prune inactivity days must be a number between 0 and 30.", nameof(days));
 
 			var urlParams = new Dictionary<string, string>
 			{
 				["days"] = days.ToString(CultureInfo.InvariantCulture),
 				["compute_prune_count"] = computePruneCount.ToString()
 			};
 
 			var sb = includeRoles?.Aggregate(new StringBuilder(),
 				         (sb, id) => sb.Append($"&include_roles={id}"))
 			         ?? new StringBuilder();
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.PRUNE}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, $"{BuildQueryString(urlParams)}{sb}", this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers).ConfigureAwait(false);
 
 			var pruned = JsonConvert.DeserializeObject<RestGuildPruneResultPayload>(res.Response);
 
 			return pruned.Pruned;
 		}
 		#endregion
 
 		#region GuildVarious
 		/// <summary>
 		/// Gets the template async.
 		/// </summary>
 		/// <param name="code">The code.</param>
 
 		internal async Task<DiscordGuildTemplate> GetTemplateAsync(string code)
 		{
 			var route = $"{Endpoints.GUILDS}{Endpoints.TEMPLATES}/:code";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { code }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var templatesRaw = JsonConvert.DeserializeObject<DiscordGuildTemplate>(res.Response);
 
 			return templatesRaw;
 		}
 
 		/// <summary>
 		/// Gets the guild integrations async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 
 		internal async Task<IReadOnlyList<DiscordIntegration>> GetGuildIntegrationsAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.INTEGRATIONS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-			var integrationsRaw = JsonConvert.DeserializeObject<IEnumerable<DiscordIntegration>>(res.Response).Select(xi => { xi.Discord = this.Discord; return xi; });
-
-			return new ReadOnlyCollection<DiscordIntegration>(new List<DiscordIntegration>(integrationsRaw));
+			return JsonConvert.DeserializeObject<List<DiscordIntegration>>(res.Response)
+				.Mutate(xi => xi.Discord = this.Discord);
 		}
 
 		/// <summary>
 		/// Gets the guild preview async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 
 		internal async Task<DiscordGuildPreview> GetGuildPreviewAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.PREVIEW}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordGuildPreview>(res.Response);
 			ret.Discord = this.Discord;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Creates the guild integration async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="type">The type.</param>
 		/// <param name="id">The id.</param>
 
 		internal async Task<DiscordIntegration> CreateGuildIntegrationAsync(ulong guildId, string type, ulong id)
 		{
 			var pld = new RestGuildIntegrationAttachPayload
 			{
 				Type = type,
 				Id = id
 			};
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.INTEGRATIONS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordIntegration>(res.Response);
 			ret.Discord = this.Discord;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Modifies the guild integration async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="integrationId">The integration_id.</param>
 		/// <param name="expireBehaviour">The expire_behaviour.</param>
 		/// <param name="expireGracePeriod">The expire_grace_period.</param>
 		/// <param name="enableEmoticons">If true, enable_emoticons.</param>
 
 		internal async Task<DiscordIntegration> ModifyGuildIntegrationAsync(ulong guildId, ulong integrationId, int expireBehaviour, int expireGracePeriod, bool enableEmoticons)
 		{
 			var pld = new RestGuildIntegrationModifyPayload
 			{
 				ExpireBehavior = expireBehaviour,
 				ExpireGracePeriod = expireGracePeriod,
 				EnableEmoticons = enableEmoticons
 			};
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.INTEGRATIONS}/:integration_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, integration_id = integrationId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordIntegration>(res.Response);
 			ret.Discord = this.Discord;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Deletes the guild integration async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="integration">The integration.</param>
 
 		internal Task DeleteGuildIntegrationAsync(ulong guildId, DiscordIntegration integration)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.INTEGRATIONS}/:integration_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId, integration_id = integration.Id }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, payload: DiscordJson.SerializeObject(integration));
 		}
 
 		/// <summary>
 		/// Syncs the guild integration async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="integrationId">The integration_id.</param>
 
 		internal Task SyncGuildIntegrationAsync(ulong guildId, ulong integrationId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.INTEGRATIONS}/:integration_id{Endpoints.SYNC}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId, integration_id = integrationId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route);
 		}
 
 		/// <summary>
 		/// Gets the guild voice regions async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 
 		internal async Task<IReadOnlyList<DiscordVoiceRegion>> GetGuildVoiceRegionsAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.REGIONS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-			var regionsRaw = JsonConvert.DeserializeObject<IEnumerable<DiscordVoiceRegion>>(res.Response);
-
-			return new ReadOnlyCollection<DiscordVoiceRegion>(new List<DiscordVoiceRegion>(regionsRaw));
+			return JsonConvert.DeserializeObject<List<DiscordVoiceRegion>>(res.Response);
 		}
 
 		/// <summary>
 		/// Gets the guild invites async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 
 		internal async Task<IReadOnlyList<DiscordInvite>> GetGuildInvitesAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.INVITES}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-			var invitesRaw = JsonConvert.DeserializeObject<IEnumerable<DiscordInvite>>(res.Response).Select(xi => { xi.Discord = this.Discord; return xi; });
-
-			return new ReadOnlyCollection<DiscordInvite>(new List<DiscordInvite>(invitesRaw));
+			return JsonConvert.DeserializeObject<List<DiscordInvite>>(res.Response)
+				.Mutate(xi => xi.Discord = this.Discord );
 		}
 		#endregion
 
 		#region Invite
 		/// <summary>
 		/// Gets the invite async.
 		/// </summary>
 		/// <param name="inviteCode">The invite_code.</param>
 		/// <param name="withCounts">If true, with_counts.</param>
 		/// <param name="withExpiration">If true, with_expiration.</param>
 		/// <param name="guildScheduledEventId">The scheduled event id to get.</param>
 
 		internal async Task<DiscordInvite> GetInviteAsync(string inviteCode, bool? withCounts, bool? withExpiration, ulong? guildScheduledEventId)
 		{
 			var urlParams = new Dictionary<string, string>();
 			if (withCounts.HasValue)
 				urlParams["with_counts"] = withCounts?.ToString();
 			if (withExpiration.HasValue)
 				urlParams["with_expiration"] = withExpiration?.ToString();
 			if (guildScheduledEventId.HasValue)
 				urlParams["guild_scheduled_event_id"] = guildScheduledEventId?.ToString();
 
 			var route = $"{Endpoints.INVITES}/:invite_code";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {invite_code = inviteCode }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordInvite>(res.Response);
 			ret.Discord = this.Discord;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Deletes the invite async.
 		/// </summary>
 		/// <param name="inviteCode">The invite_code.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal async Task<DiscordInvite> DeleteInviteAsync(string inviteCode, string reason)
 		{
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var route = $"{Endpoints.INVITES}/:invite_code";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {invite_code = inviteCode }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordInvite>(res.Response);
 			ret.Discord = this.Discord;
 
 			return ret;
 		}
 
 		/*
          * Disabled due to API restrictions
          *
          * internal async Task<DiscordInvite> InternalAcceptInvite(string invite_code)
          * {
          *     this.Discord.DebugLogger.LogMessage(LogLevel.Warning, "REST API", "Invite accept endpoint was used; this account is now likely unverified", DateTime.Now);
          *
          *     var url = new Uri($"{Utils.GetApiBaseUri(this.Configuration), Endpoints.INVITES}/{invite_code));
          *     var bucket = this.Rest.GetBucket(0, MajorParameterType.Unbucketed, url, HttpRequestMethod.POST);
          *     var res = await this.DoRequestAsync(this.Discord, bucket, url, HttpRequestMethod.POST).ConfigureAwait(false);
          *
          *     var ret = JsonConvert.DeserializeObject<DiscordInvite>(res.Response);
          *     ret.Discord = this.Discord;
          *
          *     return ret;
          * }
          */
 		#endregion
 
 		#region Connections
 		/// <summary>
 		/// Gets the users connections async.
 		/// </summary>
 
 		internal async Task<IReadOnlyList<DiscordConnection>> GetUserConnectionsAsync()
 		{
 			var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.CONNECTIONS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-			var connectionsRaw = JsonConvert.DeserializeObject<IEnumerable<DiscordConnection>>(res.Response).Select(xc => { xc.Discord = this.Discord; return xc; });
-
-			return new ReadOnlyCollection<DiscordConnection>(new List<DiscordConnection>(connectionsRaw));
+			return JsonConvert.DeserializeObject<List<DiscordConnection>>(res.Response)
+				.Mutate(xc => xc.Discord = this.Discord);
 		}
 		#endregion
 
 		#region Voice
 		/// <summary>
 		/// Lists the voice regions async.
 		/// </summary>
 
 		internal async Task<IReadOnlyList<DiscordVoiceRegion>> ListVoiceRegionsAsync()
 		{
 			var route = $"{Endpoints.VOICE}{Endpoints.REGIONS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-			var regions = JsonConvert.DeserializeObject<IEnumerable<DiscordVoiceRegion>>(res.Response);
-
-			return new ReadOnlyCollection<DiscordVoiceRegion>(new List<DiscordVoiceRegion>(regions));
+			return JsonConvert.DeserializeObject<List<DiscordVoiceRegion>>(res.Response);
 		}
 		#endregion
 
 		#region Webhooks
 		/// <summary>
 		/// Creates the webhook async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="base64Avatar">The base64_avatar.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal async Task<DiscordWebhook> CreateWebhookAsync(ulong channelId, string name, Optional<string> base64Avatar, string reason)
 		{
 			var pld = new RestWebhookPayload
 			{
 				Name = name,
 				AvatarBase64 = base64Avatar.ValueOrDefault(),
 				AvatarSet = base64Avatar.HasValue
 			};
 
 			var headers = new Dictionary<string, string>();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.WEBHOOKS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordWebhook>(res.Response);
 			ret.Discord = this.Discord;
 			ret.ApiClient = this;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Gets the channel webhooks async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 
 		internal async Task<IReadOnlyList<DiscordWebhook>> GetChannelWebhooksAsync(ulong channelId)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.WEBHOOKS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-			var webhooksRaw = JsonConvert.DeserializeObject<IEnumerable<DiscordWebhook>>(res.Response).Select(xw => { xw.Discord = this.Discord; xw.ApiClient = this; return xw; });
-
-			return new ReadOnlyCollection<DiscordWebhook>(new List<DiscordWebhook>(webhooksRaw));
+			return JsonConvert.DeserializeObject<List<DiscordWebhook>>(res.Response)
+				.Mutate(xw => { xw.Discord = this.Discord; xw.ApiClient = this; });
 		}
 
 		/// <summary>
 		/// Gets the guild webhooks async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 
 		internal async Task<IReadOnlyList<DiscordWebhook>> GetGuildWebhooksAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.WEBHOOKS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-			var webhooksRaw = JsonConvert.DeserializeObject<IEnumerable<DiscordWebhook>>(res.Response).Select(xw => { xw.Discord = this.Discord; xw.ApiClient = this; return xw; });
-
-			return new ReadOnlyCollection<DiscordWebhook>(new List<DiscordWebhook>(webhooksRaw));
+			return JsonConvert.DeserializeObject<List<DiscordWebhook>>(res.Response)
+				.Mutate(xw => { xw.Discord = this.Discord; xw.ApiClient = this; });
 		}
 
 		/// <summary>
 		/// Gets the webhook async.
 		/// </summary>
 		/// <param name="webhookId">The webhook_id.</param>
 
 		internal async Task<DiscordWebhook> GetWebhookAsync(ulong webhookId)
 		{
 			var route = $"{Endpoints.WEBHOOKS}/:webhook_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {webhook_id = webhookId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordWebhook>(res.Response);
 			ret.Discord = this.Discord;
 			ret.ApiClient = this;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Gets the webhook with token async.
 		/// </summary>
 		/// <param name="webhookId">The webhook_id.</param>
 		/// <param name="webhookToken">The webhook_token.</param>
 
 		internal async Task<DiscordWebhook> GetWebhookWithTokenAsync(ulong webhookId, string webhookToken)
 		{
 			var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {webhook_id = webhookId, webhook_token = webhookToken }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordWebhook>(res.Response);
 			ret.Token = webhookToken;
 			ret.Id = webhookId;
 			ret.Discord = this.Discord;
 			ret.ApiClient = this;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Modifies the webhook async.
 		/// </summary>
 		/// <param name="webhookId">The webhook_id.</param>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="base64Avatar">The base64_avatar.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal async Task<DiscordWebhook> ModifyWebhookAsync(ulong webhookId, ulong channelId, string name, Optional<string> base64Avatar, string reason)
 		{
 			var pld = new RestWebhookPayload
 			{
 				Name = name,
 				AvatarBase64 = base64Avatar.ValueOrDefault(),
 				AvatarSet = base64Avatar.HasValue,
 				ChannelId = channelId
 			};
 
 			var headers = new Dictionary<string, string>();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var route = $"{Endpoints.WEBHOOKS}/:webhook_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {webhook_id = webhookId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordWebhook>(res.Response);
 			ret.Discord = this.Discord;
 			ret.ApiClient = this;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Modifies the webhook async.
 		/// </summary>
 		/// <param name="webhookId">The webhook_id.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="base64Avatar">The base64_avatar.</param>
 		/// <param name="webhookToken">The webhook_token.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal async Task<DiscordWebhook> ModifyWebhookAsync(ulong webhookId, string name, string base64Avatar, string webhookToken, string reason)
 		{
 			var pld = new RestWebhookPayload
 			{
 				Name = name,
 				AvatarBase64 = base64Avatar
 			};
 
 			var headers = new Dictionary<string, string>();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {webhook_id = webhookId, webhook_token = webhookToken }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordWebhook>(res.Response);
 			ret.Discord = this.Discord;
 			ret.ApiClient = this;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Deletes the webhook async.
 		/// </summary>
 		/// <param name="webhookId">The webhook_id.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task DeleteWebhookAsync(ulong webhookId, string reason)
 		{
 			var headers = new Dictionary<string, string>();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var route = $"{Endpoints.WEBHOOKS}/:webhook_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {webhook_id = webhookId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
 		}
 
 		/// <summary>
 		/// Deletes the webhook async.
 		/// </summary>
 		/// <param name="webhookId">The webhook_id.</param>
 		/// <param name="webhookToken">The webhook_token.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task DeleteWebhookAsync(ulong webhookId, string webhookToken, string reason)
 		{
 			var headers = new Dictionary<string, string>();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {webhook_id = webhookId, webhook_token = webhookToken }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
 		}
 
 		/// <summary>
 		/// Executes the webhook async.
 		/// </summary>
 		/// <param name="webhookId">The webhook_id.</param>
 		/// <param name="webhookToken">The webhook_token.</param>
 		/// <param name="builder">The builder.</param>
 		/// <param name="threadId">The thread_id.</param>
 
 		internal async Task<DiscordMessage> ExecuteWebhookAsync(ulong webhookId, string webhookToken, DiscordWebhookBuilder builder, string threadId)
 		{
 			builder.Validate();
 
 			if (builder.Embeds != null)
 				foreach (var embed in builder.Embeds)
 					if (embed.Timestamp != null)
 						embed.Timestamp = embed.Timestamp.Value.ToUniversalTime();
 
 			var values = new Dictionary<string, string>();
 			var pld = new RestWebhookExecutePayload
 			{
 				Content = builder.Content,
 				Username = builder.Username.ValueOrDefault(),
 				AvatarUrl = builder.AvatarUrl.ValueOrDefault(),
 				IsTts = builder.IsTts,
 				Embeds = builder.Embeds,
 				Components = builder.Components
 			};
 
 			if (builder.Mentions != null)
 				pld.Mentions = new DiscordMentions(builder.Mentions, builder.Mentions.Any());
 
 			if (builder.Files?.Count > 0)
 			{
 				ulong fileId = 0;
 				List<DiscordAttachment> attachments = new();
 				foreach (var file in builder.Files)
 				{
 					DiscordAttachment att = new()
 					{
 						Id = fileId,
 						Discord = this.Discord,
 						Description = file.Description,
 						FileName = file.FileName,
 						FileSize = null
 					};
 					attachments.Add(att);
 					fileId++;
 				}
 				pld.Attachments = attachments;
 			}
 
 			if (!string.IsNullOrEmpty(builder.Content) || builder.Embeds?.Count > 0 || builder.Files?.Count > 0 || builder.IsTts == true || builder.Mentions != null)
 				values["payload_json"] = DiscordJson.SerializeObject(pld);
 
 			var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {webhook_id = webhookId, webhook_token = webhookToken }, out var path);
 
 			var qub = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration).AddParameter("wait", "true");
 			if (threadId != null)
 				qub.AddParameter("thread_id", threadId);
 
 			var url = qub.Build();
 
 			var res = await this.DoMultipartAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, values: values, files: builder.Files).ConfigureAwait(false);
 			var ret = JsonConvert.DeserializeObject<DiscordMessage>(res.Response);
 
 			foreach (var att in ret.Attachments)
 				att.Discord = this.Discord;
 
 			foreach (var file in builder.Files.Where(x => x.ResetPositionTo.HasValue))
 			{
 				file.Stream.Position = file.ResetPositionTo.Value;
 			}
 
 			ret.Discord = this.Discord;
 			return ret;
 		}
 
 		/// <summary>
 		/// Executes the webhook slack async.
 		/// </summary>
 		/// <param name="webhookId">The webhook_id.</param>
 		/// <param name="webhookToken">The webhook_token.</param>
 		/// <param name="jsonPayload">The json_payload.</param>
 		/// <param name="threadId">The thread_id.</param>
 
 		internal async Task<DiscordMessage> ExecuteWebhookSlackAsync(ulong webhookId, string webhookToken, string jsonPayload, string threadId)
 		{
 			var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token{Endpoints.SLACK}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {webhook_id = webhookId, webhook_token = webhookToken }, out var path);
 
 			var qub = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration).AddParameter("wait", "true");
 			if (threadId != null)
 				qub.AddParameter("thread_id", threadId);
 			var url = qub.Build();
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: jsonPayload).ConfigureAwait(false);
 			var ret = JsonConvert.DeserializeObject<DiscordMessage>(res.Response);
 			ret.Discord = this.Discord;
 			return ret;
 		}
 
 		/// <summary>
 		/// Executes the webhook github async.
 		/// </summary>
 		/// <param name="webhookId">The webhook_id.</param>
 		/// <param name="webhookToken">The webhook_token.</param>
 		/// <param name="jsonPayload">The json_payload.</param>
 		/// <param name="threadId">The thread_id.</param>
 
 		internal async Task<DiscordMessage> ExecuteWebhookGithubAsync(ulong webhookId, string webhookToken, string jsonPayload, string threadId)
 		{
 			var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token{Endpoints.GITHUB}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {webhook_id = webhookId, webhook_token = webhookToken }, out var path);
 
 			var qub = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration).AddParameter("wait", "true");
 			if (threadId != null)
 				qub.AddParameter("thread_id", threadId);
 			var url = qub.Build();
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: jsonPayload).ConfigureAwait(false);
 			var ret = JsonConvert.DeserializeObject<DiscordMessage>(res.Response);
 			ret.Discord = this.Discord;
 			return ret;
 		}
 
 		/// <summary>
 		/// Edits the webhook message async.
 		/// </summary>
 		/// <param name="webhookId">The webhook_id.</param>
 		/// <param name="webhookToken">The webhook_token.</param>
 		/// <param name="messageId">The message_id.</param>
 		/// <param name="builder">The builder.</param>
 		/// <param name="threadId">The thread_id.</param>
 
 		internal async Task<DiscordMessage> EditWebhookMessageAsync(ulong webhookId, string webhookToken, string messageId, DiscordWebhookBuilder builder, string threadId)
 		{
 			builder.Validate(true);
 
 			var pld = new RestWebhookMessageEditPayload
 			{
 				Content = builder.Content,
 				Embeds = builder.Embeds,
 				Mentions = builder.Mentions,
 				Components = builder.Components,
 			};
 
 			if (builder.Files?.Count > 0)
 			{
 				ulong fileId = 0;
 				List<DiscordAttachment> attachments = new();
 				foreach (var file in builder.Files)
 				{
 					DiscordAttachment att = new()
 					{
 						Id = fileId,
 						Discord = this.Discord,
 						Description = file.Description,
 						FileName = file.FileName,
 						FileSize = null
 					};
 					attachments.Add(att);
 					fileId++;
 				}
 				if (builder.Attachments != null && builder.Attachments?.Count() > 0)
 					attachments.AddRange(builder.Attachments);
 
 				pld.Attachments = attachments;
 
 				var values = new Dictionary<string, string>
 				{
 					["payload_json"] = DiscordJson.SerializeObject(pld)
 				};
 				var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token{Endpoints.MESSAGES}/:message_id";
 				var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {webhook_id = webhookId, webhook_token = webhookToken, message_id = messageId }, out var path);
 
 				var qub = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration);
 				if (threadId != null)
 					qub.AddParameter("thread_id", threadId);
 
 				var url = qub.Build();
 				var res = await this.DoMultipartAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, values: values, files: builder.Files);
 
 				var ret = JsonConvert.DeserializeObject<DiscordMessage>(res.Response);
 
 				ret.Discord = this.Discord;
 
 				foreach (var att in ret.AttachmentsInternal)
 					att.Discord = this.Discord;
 
 				foreach (var file in builder.Files.Where(x => x.ResetPositionTo.HasValue))
 				{
 					file.Stream.Position = file.ResetPositionTo.Value;
 				}
 
 				return ret;
 			}
 			else
 			{
 				pld.Attachments = builder.Attachments;
 
 				var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token{Endpoints.MESSAGES}/:message_id";
 				var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {webhook_id = webhookId, webhook_token = webhookToken, message_id = messageId }, out var path);
 
 				var qub = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration);
 				if (threadId != null)
 					qub.AddParameter("thread_id", threadId);
 
 				var url = qub.Build();
 				var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld));
 
 				var ret = JsonConvert.DeserializeObject<DiscordMessage>(res.Response);
 
 				ret.Discord = this.Discord;
 
 				foreach (var att in ret.AttachmentsInternal)
 					att.Discord = this.Discord;
 
 				return ret;
 			}
 		}
 
 		/// <summary>
 		/// Edits the webhook message async.
 		/// </summary>
 		/// <param name="webhookId">The webhook_id.</param>
 		/// <param name="webhookToken">The webhook_token.</param>
 		/// <param name="messageId">The message_id.</param>
 		/// <param name="builder">The builder.</param>
 		/// <param name="threadId">The thread_id.</param>
 
 		internal Task<DiscordMessage> EditWebhookMessageAsync(ulong webhookId, string webhookToken, ulong messageId, DiscordWebhookBuilder builder, ulong threadId) =>
 			this.EditWebhookMessageAsync(webhookId, webhookToken, messageId.ToString(), builder, threadId.ToString());
 
 		/// <summary>
 		/// Gets the webhook message async.
 		/// </summary>
 		/// <param name="webhookId">The webhook_id.</param>
 		/// <param name="webhookToken">The webhook_token.</param>
 		/// <param name="messageId">The message_id.</param>
 		/// <param name="threadId">The thread_id.</param>
 
 		internal async Task<DiscordMessage> GetWebhookMessageAsync(ulong webhookId, string webhookToken, string messageId, string threadId)
 		{
 			var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token{Endpoints.MESSAGES}/:message_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {webhook_id = webhookId, webhook_token = webhookToken, message_id = messageId }, out var path);
 
 			var qub = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration);
 			if (threadId != null)
 				qub.AddParameter("thread_id", threadId);
 			var url = qub.Build();
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route);
 
 			var ret = JsonConvert.DeserializeObject<DiscordMessage>(res.Response);
 			ret.Discord = this.Discord;
 			return ret;
 		}
 
 		/// <summary>
 		/// Gets the webhook message async.
 		/// </summary>
 		/// <param name="webhookId">The webhook_id.</param>
 		/// <param name="webhookToken">The webhook_token.</param>
 		/// <param name="messageId">The message_id.</param>
 
 		internal Task<DiscordMessage> GetWebhookMessageAsync(ulong webhookId, string webhookToken, ulong messageId) =>
 			this.GetWebhookMessageAsync(webhookId, webhookToken, messageId.ToString(), null);
 
 		/// <summary>
 		/// Gets the webhook message async.
 		/// </summary>
 		/// <param name="webhookId">The webhook_id.</param>
 		/// <param name="webhookToken">The webhook_token.</param>
 		/// <param name="messageId">The message_id.</param>
 		/// <param name="threadId">The thread_id.</param>
 
 		internal Task<DiscordMessage> GetWebhookMessageAsync(ulong webhookId, string webhookToken, ulong messageId, ulong threadId) =>
 			this.GetWebhookMessageAsync(webhookId, webhookToken, messageId.ToString(), threadId.ToString());
 
 		/// <summary>
 		/// Deletes the webhook message async.
 		/// </summary>
 		/// <param name="webhookId">The webhook_id.</param>
 		/// <param name="webhookToken">The webhook_token.</param>
 		/// <param name="messageId">The message_id.</param>
 		/// <param name="threadId">The thread_id.</param>
 
 		internal async Task DeleteWebhookMessageAsync(ulong webhookId, string webhookToken, string messageId, string threadId)
 		{
 			var route = $"{Endpoints.WEBHOOKS}/:webhook_id/:webhook_token{Endpoints.MESSAGES}/:message_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {webhook_id = webhookId, webhook_token = webhookToken, message_id = messageId }, out var path);
 
 			var qub = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration);
 			if (threadId != null)
 				qub.AddParameter("thread_id", threadId);
 			var url = qub.Build();
 			await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route);
 		}
 
 		/// <summary>
 		/// Deletes the webhook message async.
 		/// </summary>
 		/// <param name="webhookId">The webhook_id.</param>
 		/// <param name="webhookToken">The webhook_token.</param>
 		/// <param name="messageId">The message_id.</param>
 
 		internal Task DeleteWebhookMessageAsync(ulong webhookId, string webhookToken, ulong messageId) =>
 			this.DeleteWebhookMessageAsync(webhookId, webhookToken, messageId.ToString(), null);
 
 		/// <summary>
 		/// Deletes the webhook message async.
 		/// </summary>
 		/// <param name="webhookId">The webhook_id.</param>
 		/// <param name="webhookToken">The webhook_token.</param>
 		/// <param name="messageId">The message_id.</param>
 		/// <param name="threadId">The thread_id.</param>
 
 		internal Task DeleteWebhookMessageAsync(ulong webhookId, string webhookToken, ulong messageId, ulong threadId) =>
 			this.DeleteWebhookMessageAsync(webhookId, webhookToken, messageId.ToString(), threadId.ToString());
 		#endregion
 
 		#region Reactions
 		/// <summary>
 		/// Creates the reaction async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="messageId">The message_id.</param>
 		/// <param name="emoji">The emoji.</param>
 
 		internal Task CreateReactionAsync(ulong channelId, ulong messageId, string emoji)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id{Endpoints.REACTIONS}/:emoji{Endpoints.ME}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {channel_id = channelId, message_id = messageId, emoji }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, ratelimitWaitOverride: this.Discord.Configuration.UseRelativeRatelimit ? null : (double?)0.26);
 		}
 
 		/// <summary>
 		/// Deletes the own reaction async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="messageId">The message_id.</param>
 		/// <param name="emoji">The emoji.</param>
 
 		internal Task DeleteOwnReactionAsync(ulong channelId, ulong messageId, string emoji)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id{Endpoints.REACTIONS}/:emoji{Endpoints.ME}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, message_id = messageId, emoji }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, ratelimitWaitOverride: this.Discord.Configuration.UseRelativeRatelimit ? null : (double?)0.26);
 		}
 
 		/// <summary>
 		/// Deletes the user reaction async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="messageId">The message_id.</param>
 		/// <param name="userId">The user_id.</param>
 		/// <param name="emoji">The emoji.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task DeleteUserReactionAsync(ulong channelId, ulong messageId, ulong userId, string emoji, string reason)
 		{
 			var headers = new Dictionary<string, string>();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id{Endpoints.REACTIONS}/:emoji/:user_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, message_id = messageId, emoji, user_id = userId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers, ratelimitWaitOverride: this.Discord.Configuration.UseRelativeRatelimit ? null : (double?)0.26);
 		}
 
 		/// <summary>
 		/// Gets the reactions async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="messageId">The message_id.</param>
 		/// <param name="emoji">The emoji.</param>
 		/// <param name="afterId">The after_id.</param>
 		/// <param name="limit">The limit.</param>
 
 		internal async Task<IReadOnlyList<DiscordUser>> GetReactionsAsync(ulong channelId, ulong messageId, string emoji, ulong? afterId = null, int limit = 25)
 		{
 			var urlParams = new Dictionary<string, string>();
 			if (afterId.HasValue)
 				urlParams["after"] = afterId.Value.ToString(CultureInfo.InvariantCulture);
 
 			urlParams["limit"] = limit.ToString(CultureInfo.InvariantCulture);
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id{Endpoints.REACTIONS}/:emoji";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId, message_id = messageId, emoji }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, BuildQueryString(urlParams), this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-			var reactersRaw = JsonConvert.DeserializeObject<IEnumerable<TransportUser>>(res.Response);
-			var reacters = new List<DiscordUser>();
-			foreach (var xr in reactersRaw)
-			{
-				var usr = new DiscordUser(xr) { Discord = this.Discord };
-				usr = this.Discord.UserCache.AddOrUpdate(xr.Id, usr, (id, old) =>
+			return JsonConvert.DeserializeObject<IEnumerable<TransportUser>>(res.Response)
+				.Select(xr =>
 				{
-					old.Username = usr.Username;
-					old.Discriminator = usr.Discriminator;
-					old.AvatarHash = usr.AvatarHash;
-					return old;
-				});
-
-				reacters.Add(usr);
-			}
+					var usr = new DiscordUser(xr) { Discord = this.Discord };
+					usr = this.Discord.UserCache.AddOrUpdate(xr.Id, usr, (id, old) =>
+					{
+						old.Username = usr.Username;
+						old.Discriminator = usr.Discriminator;
+						old.AvatarHash = usr.AvatarHash;
+						return old;
+					});
 
-			return new ReadOnlyCollection<DiscordUser>(new List<DiscordUser>(reacters));
+					return usr;
+				}).ToArray();
 		}
 
 		/// <summary>
 		/// Deletes the all reactions async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="messageId">The message_id.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task DeleteAllReactionsAsync(ulong channelId, ulong messageId, string reason)
 		{
 			var headers = new Dictionary<string, string>();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id{Endpoints.REACTIONS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, message_id = messageId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers, ratelimitWaitOverride: this.Discord.Configuration.UseRelativeRatelimit ? null : (double?)0.26);
 		}
 
 		/// <summary>
 		/// Deletes the reactions emoji async.
 		/// </summary>
 		/// <param name="channelId">The channel_id.</param>
 		/// <param name="messageId">The message_id.</param>
 		/// <param name="emoji">The emoji.</param>
 
 		internal Task DeleteReactionsEmojiAsync(ulong channelId, ulong messageId, string emoji)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.MESSAGES}/:message_id{Endpoints.REACTIONS}/:emoji";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, message_id = messageId, emoji }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, ratelimitWaitOverride: this.Discord.Configuration.UseRelativeRatelimit ? null : (double?)0.26);
 		}
 		#endregion
 
 		#region Threads
 
 		/// <summary>
 		/// Creates the thread.
 		/// </summary>
 		/// <param name="channelId">The channel id to create the thread in.</param>
 		/// <param name="messageId">The optional message id to create the thread from.</param>
 		/// <param name="name">The name of the thread.</param>
 		/// <param name="autoArchiveDuration">The auto_archive_duration for the thread.</param>
 		/// <param name="type">Can be either <see cref="ChannelType.PublicThread"/> or <see cref="ChannelType.PrivateThread"/>.</param>
 		/// <param name="rateLimitPerUser">The rate limit per user.</param>
 		/// <param name="reason">The reason.</param>
 		internal async Task<DiscordThreadChannel> CreateThreadAsync(ulong channelId, ulong? messageId, string name,
 			ThreadAutoArchiveDuration autoArchiveDuration, ChannelType type, int? rateLimitPerUser, string reason)
 		{
 			var pld = new RestThreadChannelCreatePayload
 			{
 				Name = name,
 				AutoArchiveDuration = autoArchiveDuration,
 				PerUserRateLimit = rateLimitPerUser,
 				Type = type
 			};
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id";
 			if (messageId is not null)
 				route += $"{Endpoints.MESSAGES}/:message_id";
 			route += Endpoints.THREADS;
 
 			object param = messageId is null
 				? new {channel_id = channelId}
 				: new {channel_id = channelId, message_id = messageId};
 
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, param, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld));
 
 			var threadChannel = JsonConvert.DeserializeObject<DiscordThreadChannel>(res.Response);
 
 			threadChannel.Discord = this.Discord;
 
 			return threadChannel;
 		}
 
 		/// <summary>
 		/// Gets the thread.
 		/// </summary>
 		/// <param name="threadId">The thread id.</param>
 		internal async Task<DiscordThreadChannel> GetThreadAsync(ulong threadId)
 		{
 			var route = $"{Endpoints.CHANNELS}/:thread_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {thread_id = threadId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var ret = JsonConvert.DeserializeObject<DiscordThreadChannel>(res.Response);
 			ret.Discord = this.Discord;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Joins the thread.
 		/// </summary>
 		/// <param name="channelId">The channel id.</param>
 		internal async Task JoinThreadAsync(ulong channelId)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.THREAD_MEMBERS}{Endpoints.ME}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route);
 		}
 
 		/// <summary>
 		/// Leaves the thread.
 		/// </summary>
 		/// <param name="channelId">The channel id.</param>
 		internal async Task LeaveThreadAsync(ulong channelId)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.THREAD_MEMBERS}{Endpoints.ME}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route);
 		}
 
 		/// <summary>
 		/// Adds a thread member.
 		/// </summary>
 		/// <param name="channelId">The channel id to add the member to.</param>
 		/// <param name="userId">The user id to add.</param>
 		internal async Task AddThreadMemberAsync(ulong channelId, ulong userId)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.THREAD_MEMBERS}/:user_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {channel_id = channelId, user_id = userId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route);
 		}
 
 		/// <summary>
 		/// Gets a thread member.
 		/// </summary>
 		/// <param name="channelId">The channel id to get the member from.</param>
 		/// <param name="userId">The user id to get.</param>
 		internal async Task<DiscordThreadChannelMember> GetThreadMemberAsync(ulong channelId, ulong userId)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.THREAD_MEMBERS}/:user_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId, user_id = userId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route);
 
 			var threadMember = JsonConvert.DeserializeObject<DiscordThreadChannelMember>(res.Response);
 
 			return threadMember;
 		}
 
 		/// <summary>
 		/// Removes a thread member.
 		/// </summary>
 		/// <param name="channelId">The channel id to remove the member from.</param>
 		/// <param name="userId">The user id to remove.</param>
 		internal async Task RemoveThreadMemberAsync(ulong channelId, ulong userId)
 		{
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.THREAD_MEMBERS}/:user_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {channel_id = channelId, user_id = userId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route);
 		}
 
 		/// <summary>
 		/// Gets the thread members.
 		/// </summary>
 		/// <param name="threadId">The thread id.</param>
 		internal async Task<IReadOnlyList<DiscordThreadChannelMember>> GetThreadMembersAsync(ulong threadId)
 		{
 			var route = $"{Endpoints.CHANNELS}/:thread_id{Endpoints.THREAD_MEMBERS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {thread_id = threadId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route);
 
-			var threadMembersRaw = JsonConvert.DeserializeObject<List<DiscordThreadChannelMember>>(res.Response);
-
-			return new ReadOnlyCollection<DiscordThreadChannelMember>(threadMembersRaw);
+			return JsonConvert.DeserializeObject<List<DiscordThreadChannelMember>>(res.Response);
 		}
 
 		/// <summary>
 		/// Gets the active threads in a guild.
 		/// </summary>
 		/// <param name="guildId">The guild id.</param>
 		internal async Task<DiscordThreadResult> GetActiveThreadsAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.THREADS}{Endpoints.THREAD_ACTIVE}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route);
 
 			var threadReturn = JsonConvert.DeserializeObject<DiscordThreadResult>(res.Response);
 
 			return threadReturn;
 		}
 
 		/// <summary>
 		/// Gets the joined private archived threads in a channel.
 		/// </summary>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="before">Get threads before snowflake.</param>
 		/// <param name="limit">Limit the results.</param>
 		internal async Task<DiscordThreadResult> GetJoinedPrivateArchivedThreadsAsync(ulong channelId, ulong? before, int? limit)
 		{
 			var urlParams = new Dictionary<string, string>();
 			if (before != null)
 				urlParams["before"] = before.Value.ToString(CultureInfo.InvariantCulture);
 			if (limit != null && limit > 0)
 				urlParams["limit"] = limit.Value.ToString(CultureInfo.InvariantCulture);
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.USERS}{Endpoints.ME}{Endpoints.THREADS}{Endpoints.THREAD_ARCHIVED}{Endpoints.THREAD_PRIVATE}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route);
 
 			var threadReturn = JsonConvert.DeserializeObject<DiscordThreadResult>(res.Response);
 
 			return threadReturn;
 		}
 
 		/// <summary>
 		/// Gets the public archived threads in a channel.
 		/// </summary>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="before">Get threads before snowflake.</param>
 		/// <param name="limit">Limit the results.</param>
 		internal async Task<DiscordThreadResult> GetPublicArchivedThreadsAsync(ulong channelId, ulong? before, int? limit)
 		{
 			var urlParams = new Dictionary<string, string>();
 			if (before != null)
 				urlParams["before"] = before.Value.ToString(CultureInfo.InvariantCulture);
 			if (limit != null && limit > 0)
 				urlParams["limit"] = limit.Value.ToString(CultureInfo.InvariantCulture);
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.THREADS}{Endpoints.THREAD_ARCHIVED}{Endpoints.THREAD_PUBLIC}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route);
 
 			var threadReturn = JsonConvert.DeserializeObject<DiscordThreadResult>(res.Response);
 
 			return threadReturn;
 		}
 
 		/// <summary>
 		/// Gets the private archived threads in a channel.
 		/// </summary>
 		/// <param name="channelId">The channel id.</param>
 		/// <param name="before">Get threads before snowflake.</param>
 		/// <param name="limit">Limit the results.</param>
 		internal async Task<DiscordThreadResult> GetPrivateArchivedThreadsAsync(ulong channelId, ulong? before, int? limit)
 		{
 			var urlParams = new Dictionary<string, string>();
 			if (before != null)
 				urlParams["before"] = before.Value.ToString(CultureInfo.InvariantCulture);
 			if (limit != null && limit > 0)
 				urlParams["limit"] = limit.Value.ToString(CultureInfo.InvariantCulture);
 
 			var route = $"{Endpoints.CHANNELS}/:channel_id{Endpoints.THREADS}{Endpoints.THREAD_ARCHIVED}{Endpoints.THREAD_PRIVATE}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {channel_id = channelId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, urlParams.Any() ? BuildQueryString(urlParams) : "", this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route);
 
 			var threadReturn = JsonConvert.DeserializeObject<DiscordThreadResult>(res.Response);
 
 			return threadReturn;
 		}
 
 		/// <summary>
 		/// Modifies a thread.
 		/// </summary>
 		/// <param name="threadId">The thread to modify.</param>
 		/// <param name="name">The new name.</param>
 		/// <param name="locked">The new locked state.</param>
 		/// <param name="archived">The new archived state.</param>
 		/// <param name="perUserRateLimit">The new per user rate limit.</param>
 		/// <param name="autoArchiveDuration">The new auto archive duration.</param>
 		/// <param name="invitable">The new user invitable state.</param>
 		/// <param name="reason">The reason for the modification.</param>
 		internal Task ModifyThreadAsync(ulong threadId, string name, Optional<bool?> locked, Optional<bool?> archived, Optional<int?> perUserRateLimit, Optional<ThreadAutoArchiveDuration?> autoArchiveDuration, Optional<bool?> invitable, string reason)
 		{
 			var pld = new RestThreadChannelModifyPayload
 			{
 				Name = name,
 				Archived = archived,
 				AutoArchiveDuration = autoArchiveDuration,
 				Locked = locked,
 				PerUserRateLimit = perUserRateLimit,
 				Invitable = invitable
 			};
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.CHANNELS}/:thread_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {thread_id = threadId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
 		}
 
 		/// <summary>
 		/// Deletes a thread.
 		/// </summary>
 		/// <param name="threadId">The thread to delete.</param>
 		/// <param name="reason">The reason for deletion.</param>
 		internal Task DeleteThreadAsync(ulong threadId, string reason)
 		{
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var route = $"{Endpoints.CHANNELS}/:thread_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {thread_id = threadId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
 		}
 
 		#endregion
 
 		#region Emoji
 		/// <summary>
 		/// Gets the guild emojis async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 
 		internal async Task<IReadOnlyList<DiscordGuildEmoji>> GetGuildEmojisAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.EMOJIS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-			var emojisRaw = JsonConvert.DeserializeObject<IEnumerable<JObject>>(res.Response);
-
 			this.Discord.Guilds.TryGetValue(guildId, out var gld);
 			var users = new Dictionary<ulong, DiscordUser>();
-			var emojis = new List<DiscordGuildEmoji>();
-			foreach (var rawEmoji in emojisRaw)
+
+			return JsonConvert.DeserializeObject<IEnumerable<JObject>>(res.Response).Select(rawEmoji =>
 			{
 				var xge = rawEmoji.ToObject<DiscordGuildEmoji>();
 				xge.Guild = gld;
 
 				var xtu = rawEmoji["user"]?.ToObject<TransportUser>();
 				if (xtu != null)
 				{
 					if (!users.ContainsKey(xtu.Id))
 					{
-						var user = gld != null && gld.Members.TryGetValue(xtu.Id, out var member) ? member : new DiscordUser(xtu);
+						var user = gld != null && gld.Members.TryGetValue(xtu.Id, out var member)
+							? member
+							: new DiscordUser(xtu);
 						users[user.Id] = user;
 					}
 
 					xge.User = users[xtu.Id];
 				}
 
-				emojis.Add(xge);
-			}
-
-			return new ReadOnlyCollection<DiscordGuildEmoji>(emojis);
+				return xge;
+			}).ToArray();
 		}
 
 		/// <summary>
 		/// Gets the guild emoji async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="emojiId">The emoji_id.</param>
 
 		internal async Task<DiscordGuildEmoji> GetGuildEmojiAsync(ulong guildId, ulong emojiId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.EMOJIS}/:emoji_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId, emoji_id = emojiId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			this.Discord.Guilds.TryGetValue(guildId, out var gld);
 
 			var emojiRaw = JObject.Parse(res.Response);
 			var emoji = emojiRaw.ToObject<DiscordGuildEmoji>();
 			emoji.Guild = gld;
 
 			var xtu = emojiRaw["user"]?.ToObject<TransportUser>();
 			if (xtu != null)
 				emoji.User = gld != null && gld.Members.TryGetValue(xtu.Id, out var member) ? member : new DiscordUser(xtu);
 
 			return emoji;
 		}
 
 		/// <summary>
 		/// Creates the guild emoji async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="imageb64">The imageb64.</param>
 		/// <param name="roles">The roles.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal async Task<DiscordGuildEmoji> CreateGuildEmojiAsync(ulong guildId, string name, string imageb64, IEnumerable<ulong> roles, string reason)
 		{
 			var pld = new RestGuildEmojiCreatePayload
 			{
 				Name = name,
 				ImageB64 = imageb64,
 				Roles = roles?.ToArray()
 			};
 
 			var headers = new Dictionary<string, string>();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.EMOJIS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			this.Discord.Guilds.TryGetValue(guildId, out var gld);
 
 			var emojiRaw = JObject.Parse(res.Response);
 			var emoji = emojiRaw.ToObject<DiscordGuildEmoji>();
 			emoji.Guild = gld;
 
 			var xtu = emojiRaw["user"]?.ToObject<TransportUser>();
 			emoji.User = xtu != null
 				? gld != null && gld.Members.TryGetValue(xtu.Id, out var member) ? member : new DiscordUser(xtu)
 				: this.Discord.CurrentUser;
 
 			return emoji;
 		}
 
 		/// <summary>
 		/// Modifies the guild emoji async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="emojiId">The emoji_id.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="roles">The roles.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal async Task<DiscordGuildEmoji> ModifyGuildEmojiAsync(ulong guildId, ulong emojiId, string name, IEnumerable<ulong> roles, string reason)
 		{
 			var pld = new RestGuildEmojiModifyPayload
 			{
 				Name = name,
 				Roles = roles?.ToArray()
 			};
 
 			var headers = new Dictionary<string, string>();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.EMOJIS}/:emoji_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, emoji_id = emojiId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)).ConfigureAwait(false);
 
 			this.Discord.Guilds.TryGetValue(guildId, out var gld);
 
 			var emojiRaw = JObject.Parse(res.Response);
 			var emoji = emojiRaw.ToObject<DiscordGuildEmoji>();
 			emoji.Guild = gld;
 
 			var xtu = emojiRaw["user"]?.ToObject<TransportUser>();
 			if (xtu != null)
 				emoji.User = gld != null && gld.Members.TryGetValue(xtu.Id, out var member) ? member : new DiscordUser(xtu);
 
 			return emoji;
 		}
 
 		/// <summary>
 		/// Deletes the guild emoji async.
 		/// </summary>
 		/// <param name="guildId">The guild_id.</param>
 		/// <param name="emojiId">The emoji_id.</param>
 		/// <param name="reason">The reason.</param>
 
 		internal Task DeleteGuildEmojiAsync(ulong guildId, ulong emojiId, string reason)
 		{
 			var headers = new Dictionary<string, string>();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers[REASON_HEADER_NAME] = reason;
 
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.EMOJIS}/:emoji_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId, emoji_id = emojiId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
 		}
 		#endregion
 
 		#region Stickers
 
 		/// <summary>
 		/// Gets a sticker.
 		/// </summary>
 		/// <param name="stickerId">The sticker id.</param>
 		internal async Task<DiscordSticker> GetStickerAsync(ulong stickerId)
 		{
 			var route = $"{Endpoints.STICKERS}/:sticker_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {sticker_id = stickerId}, out var path);
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 			var ret = JObject.Parse(res.Response).ToDiscordObject<DiscordSticker>();
 
 			ret.Discord = this.Discord;
 			return ret;
 		}
 
 		/// <summary>
 		/// Gets the sticker packs.
 		/// </summary>
 		internal async Task<IReadOnlyList<DiscordStickerPack>> GetStickerPacksAsync()
 		{
 			var route = $"{Endpoints.STICKERPACKS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var json = JObject.Parse(res.Response)["sticker_packs"] as JArray;
 			var ret = json.ToDiscordObject<DiscordStickerPack[]>();
 
-			return ret.ToList();
+			return ret;
 		}
 
 		/// <summary>
 		/// Gets the guild stickers.
 		/// </summary>
 		/// <param name="guildId">The guild id.</param>
 		internal async Task<IReadOnlyList<DiscordSticker>> GetGuildStickersAsync(ulong guildId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.STICKERS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId}, out var path);
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 			var json = JArray.Parse(res.Response);
 			var ret = json.ToDiscordObject<DiscordSticker[]>();
 
 			for (var i = 0; i < ret.Length; i++)
 			{
 				var stkr = ret[i];
 				stkr.Discord = this.Discord;
 
 				if (json[i]["user"] is JObject obj) // Null = Missing stickers perm //
 				{
 					var tsr = obj.ToDiscordObject<TransportUser>();
 					var usr = new DiscordUser(tsr) {Discord = this.Discord};
 					usr = this.Discord.UserCache.AddOrUpdate(tsr.Id, usr, (id, old) =>
 					{
 						old.Username = usr.Username;
 						old.Discriminator = usr.Discriminator;
 						old.AvatarHash = usr.AvatarHash;
 						return old;
 					});
 					stkr.User = usr;
 				}
 			}
 
-			return ret.ToList();
+			return ret;
 		}
 
 		/// <summary>
 		/// Gets a guild sticker.
 		/// </summary>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="stickerId">The sticker id.</param>
 		internal async Task<DiscordSticker> GetGuildStickerAsync(ulong guildId, ulong stickerId)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.STICKERS}/:sticker_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {guild_id = guildId, sticker_id = stickerId}, out var path);
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			var json = JObject.Parse(res.Response);
 			var ret = json.ToDiscordObject<DiscordSticker>();
 			if (json["user"] is not null) // Null = Missing stickers perm //
 			{
 				var tsr = json["user"].ToDiscordObject<TransportUser>();
 				var usr = new DiscordUser(tsr) {Discord = this.Discord};
 				usr = this.Discord.UserCache.AddOrUpdate(tsr.Id, usr, (id, old) =>
 				{
 					old.Username = usr.Username;
 					old.Discriminator = usr.Discriminator;
 					old.AvatarHash = usr.AvatarHash;
 					return old;
 				});
 				ret.User = usr;
 			}
 			ret.Discord = this.Discord;
 			return ret;
 		}
 
 		/// <summary>
 		/// Creates the guild sticker.
 		/// </summary>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="description">The description.</param>
 		/// <param name="tags">The tags.</param>
 		/// <param name="file">The file.</param>
 		/// <param name="reason">The reason.</param>
 		internal async Task<DiscordSticker> CreateGuildStickerAsync(ulong guildId, string name, string description, string tags, DiscordMessageFile file, string reason)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.STICKERS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {guild_id = guildId}, out var path);
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var res = await this.DoStickerMultipartAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, headers, file, name, tags, description);
 
 			var ret = JObject.Parse(res.Response).ToDiscordObject<DiscordSticker>();
 
 			ret.Discord = this.Discord;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Modifies the guild sticker.
 		/// </summary>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="stickerId">The sticker id.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="description">The description.</param>
 		/// <param name="tags">The tags.</param>
 		/// <param name="reason">The reason.</param>
 		internal async Task<DiscordSticker> ModifyGuildStickerAsync(ulong guildId, ulong stickerId, Optional<string> name, Optional<string> description, Optional<string> tags, string reason)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.STICKERS}/:sticker_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {guild_id = guildId, sticker_id = stickerId}, out var path);
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			var pld = new RestStickerModifyPayload()
 			{
 				Name = name,
 				Description = description,
 				Tags = tags
 			};
 
 			var values = new Dictionary<string, string>
 			{
 				["payload_json"] = DiscordJson.SerializeObject(pld)
 			};
 
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route);
 			var ret = JObject.Parse(res.Response).ToDiscordObject<DiscordSticker>();
 			ret.Discord = this.Discord;
 
 			return null;
 		}
 
 		/// <summary>
 		/// Deletes the guild sticker async.
 		/// </summary>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="stickerId">The sticker id.</param>
 		/// <param name="reason">The reason.</param>
 		internal async Task DeleteGuildStickerAsync(ulong guildId, ulong stickerId, string reason)
 		{
 			var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.STICKERS}/:sticker_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {guild_id = guildId, sticker_id = stickerId }, out var path);
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var headers = Utilities.GetBaseHeaders();
 			if (!string.IsNullOrWhiteSpace(reason))
 				headers.Add(REASON_HEADER_NAME, reason);
 
 			await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers);
 		}
 		#endregion
 
 		#region Application Commands
 
 		/// <summary>
 		/// Gets the global application commands.
 		/// </summary>
 		/// <param name="applicationId">The application id.</param>
 		/// <param name="withLocalizations">Whether to get the full localization dict.</param>
 		internal async Task<IReadOnlyList<DiscordApplicationCommand>> GetGlobalApplicationCommandsAsync(ulong applicationId, bool withLocalizations = false)
 		{
 			var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.COMMANDS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {application_id = applicationId }, out var path);
 
 			var querydict = new Dictionary<string, string>
 			{
 				["with_localizations"] = withLocalizations.ToString().ToLower()
 			};
 			var url = Utilities.GetApiUriFor(path, BuildQueryString(querydict), this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route);
 
-			var ret = JsonConvert.DeserializeObject<IEnumerable<DiscordApplicationCommand>>(res.Response);
+			var ret = JsonConvert.DeserializeObject<IEnumerable<DiscordApplicationCommand>>(res.Response).ToArray();
 			foreach (var app in ret)
 				app.Discord = this.Discord;
-			return ret.ToList();
+			return ret;
 		}
 
 		/// <summary>
 		/// Bulk overwrites the global application commands.
 		/// </summary>
 		/// <param name="applicationId">The application id.</param>
 		/// <param name="commands">The commands.</param>
 		internal async Task<IReadOnlyList<DiscordApplicationCommand>> BulkOverwriteGlobalApplicationCommandsAsync(ulong applicationId, IEnumerable<DiscordApplicationCommand> commands)
 		{
 			var pld = new List<RestApplicationCommandCreatePayload>();
 			foreach (var command in commands)
 			{
 				pld.Add(new RestApplicationCommandCreatePayload
 				{
 					Type = command.Type,
 					Name = command.Name,
 					Description = command.Description,
 					Options = command.Options,
 					NameLocalizations = command.NameLocalizations?.GetKeyValuePairs(),
 					DescriptionLocalizations = command.DescriptionLocalizations?.GetKeyValuePairs(),
 					DefaultMemberPermission = command.DefaultMemberPermissions,
 					DmPermission = command.DmPermission
 				});
 			}
 
 			this.Discord.Logger.LogDebug(DiscordJson.SerializeObject(pld));
 
 			var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.COMMANDS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {application_id = applicationId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, payload: DiscordJson.SerializeObject(pld));
 
-			var ret = JsonConvert.DeserializeObject<IEnumerable<DiscordApplicationCommand>>(res.Response);
+			var ret = JsonConvert.DeserializeObject<IEnumerable<DiscordApplicationCommand>>(res.Response).ToArray();
 			foreach (var app in ret)
 				app.Discord = this.Discord;
-			return ret.ToList();
+			return ret;
 		}
 
 		/// <summary>
 		/// Creates a global application command.
 		/// </summary>
 		/// <param name="applicationId">The applicationid.</param>
 		/// <param name="command">The command.</param>
 		internal async Task<DiscordApplicationCommand> CreateGlobalApplicationCommandAsync(ulong applicationId, DiscordApplicationCommand command)
 		{
 			var pld = new RestApplicationCommandCreatePayload
 			{
 				Type = command.Type,
 				Name = command.Name,
 				Description = command.Description,
 				Options = command.Options,
 				NameLocalizations = command.NameLocalizations.GetKeyValuePairs(),
 				DescriptionLocalizations = command.DescriptionLocalizations.GetKeyValuePairs(),
 				DefaultMemberPermission = command.DefaultMemberPermissions,
 				DmPermission = command.DmPermission
 			};
 
 			var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.COMMANDS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {application_id = applicationId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld));
 
 			var ret = JsonConvert.DeserializeObject<DiscordApplicationCommand>(res.Response);
 			ret.Discord = this.Discord;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Gets a global application command.
 		/// </summary>
 		/// <param name="applicationId">The application id.</param>
 		/// <param name="commandId">The command id.</param>
 		internal async Task<DiscordApplicationCommand> GetGlobalApplicationCommandAsync(ulong applicationId, ulong commandId)
 		{
 			var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.COMMANDS}/:command_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {application_id = applicationId, command_id = commandId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route);
 
 			var ret = JsonConvert.DeserializeObject<DiscordApplicationCommand>(res.Response);
 			ret.Discord = this.Discord;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Edits a global application command.
 		/// </summary>
 		/// <param name="applicationId">The application id.</param>
 		/// <param name="commandId">The command id.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="description">The description.</param>
 		/// <param name="options">The options.</param>
 		/// <param name="nameLocalization">The localizations of the name.</param>
 		/// <param name="descriptionLocalization">The localizations of the description.</param>
 		/// <param name="defaultMemberPermission">The default member permissions.</param>
 		/// <param name="dmPermission">The dm permission.</param>
-		internal async Task<DiscordApplicationCommand> EditGlobalApplicationCommandAsync(ulong applicationId, ulong commandId, Optional<string> name, Optional<string> description, Optional<IReadOnlyCollection<DiscordApplicationCommandOption>> options,
+		internal async Task<DiscordApplicationCommand> EditGlobalApplicationCommandAsync(ulong applicationId, ulong commandId, Optional<string> name, Optional<string> description, Optional<IReadOnlyList<DiscordApplicationCommandOption>> options,
 			Optional<DiscordApplicationCommandLocalization> nameLocalization, Optional<DiscordApplicationCommandLocalization> descriptionLocalization,
 			Optional<Permissions> defaultMemberPermission, Optional<bool> dmPermission)
 		{
 			var pld = new RestApplicationCommandEditPayload
 			{
 				Name = name,
 				Description = description,
 				Options = options,
 				DefaultMemberPermission = defaultMemberPermission,
 				DmPermission = dmPermission,
 				NameLocalizations = nameLocalization.Map(l => l.GetKeyValuePairs()).ValueOrDefault(),
 				DescriptionLocalizations = descriptionLocalization.Map(l => l.GetKeyValuePairs()).ValueOrDefault(),
 			};
 
 			var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.COMMANDS}/:command_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {application_id = applicationId, command_id = commandId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld));
 
 			var ret = JsonConvert.DeserializeObject<DiscordApplicationCommand>(res.Response);
 			ret.Discord = this.Discord;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Deletes a global application command.
 		/// </summary>
 		/// <param name="applicationId">The application_id.</param>
 		/// <param name="commandId">The command_id.</param>
 
 		internal async Task DeleteGlobalApplicationCommandAsync(ulong applicationId, ulong commandId)
 		{
 			var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.COMMANDS}/:command_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {application_id = applicationId, command_id = commandId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route);
 		}
 
 		/// <summary>
 		/// Gets the guild application commands.
 		/// </summary>
 		/// <param name="applicationId">The application id.</param>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="withLocalizations">Whether to get the full localization dict.</param>
 		internal async Task<IReadOnlyList<DiscordApplicationCommand>> GetGuildApplicationCommandsAsync(ulong applicationId, ulong guildId, bool withLocalizations = false)
 		{
 			var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.GUILDS}/:guild_id{Endpoints.COMMANDS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {application_id = applicationId, guild_id = guildId }, out var path);
 
 			var querydict = new Dictionary<string, string>
 			{
 				["with_localizations"] = withLocalizations.ToString().ToLower()
 			};
 			var url = Utilities.GetApiUriFor(path, BuildQueryString(querydict), this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route);
 
-			var ret = JsonConvert.DeserializeObject<IEnumerable<DiscordApplicationCommand>>(res.Response);
+			var ret = JsonConvert.DeserializeObject<IEnumerable<DiscordApplicationCommand>>(res.Response).ToArray();
 			foreach (var app in ret)
 				app.Discord = this.Discord;
-			return ret.ToList();
+			return ret;
 		}
 
 		/// <summary>
 		/// Bulk overwrites the guild application commands.
 		/// </summary>
 		/// <param name="applicationId">The application id.</param>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="commands">The commands.</param>
-		internal async Task<IReadOnlyList<DiscordApplicationCommand>> BulkOverwriteGuildApplicationCommandsAsync(ulong applicationId, ulong guildId, IEnumerable<DiscordApplicationCommand> commands)
+		internal async Task<IEnumerable<DiscordApplicationCommand>> BulkOverwriteGuildApplicationCommandsAsync(ulong applicationId, ulong guildId, IEnumerable<DiscordApplicationCommand> commands)
 		{
 			var pld = new List<RestApplicationCommandCreatePayload>();
 			foreach (var command in commands)
 			{
 				pld.Add(new RestApplicationCommandCreatePayload
 				{
 					Type = command.Type,
 					Name = command.Name,
 					Description = command.Description,
 					Options = command.Options,
 					NameLocalizations = command.NameLocalizations?.GetKeyValuePairs(),
 					DescriptionLocalizations = command.DescriptionLocalizations?.GetKeyValuePairs(),
 					DefaultMemberPermission = command.DefaultMemberPermissions,
 					DmPermission = command.DmPermission
 				});
 			}
 			this.Discord.Logger.LogDebug(DiscordJson.SerializeObject(pld));
 
 			var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.GUILDS}/:guild_id{Endpoints.COMMANDS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PUT, route, new {application_id = applicationId, guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PUT, route, payload: DiscordJson.SerializeObject(pld));
 
-			var ret = JsonConvert.DeserializeObject<IEnumerable<DiscordApplicationCommand>>(res.Response);
+			var ret = JsonConvert.DeserializeObject<IEnumerable<DiscordApplicationCommand>>(res.Response).ToArray();
 			foreach (var app in ret)
 				app.Discord = this.Discord;
-			return ret.ToList();
+			return ret;
 		}
 
 		/// <summary>
 		/// Creates a guild application command.
 		/// </summary>
 		/// <param name="applicationId">The application id.</param>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="command">The command.</param>
 		internal async Task<DiscordApplicationCommand> CreateGuildApplicationCommandAsync(ulong applicationId, ulong guildId, DiscordApplicationCommand command)
 		{
 			var pld = new RestApplicationCommandCreatePayload
 			{
 				Type = command.Type,
 				Name = command.Name,
 				Description = command.Description,
 				Options = command.Options,
 				NameLocalizations = command.NameLocalizations.GetKeyValuePairs(),
 				DescriptionLocalizations = command.DescriptionLocalizations.GetKeyValuePairs(),
 				DefaultMemberPermission = command.DefaultMemberPermissions,
 				DmPermission = command.DmPermission
 
 			};
 
 			var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.GUILDS}/:guild_id{Endpoints.COMMANDS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {application_id = applicationId, guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld));
 
 			var ret = JsonConvert.DeserializeObject<DiscordApplicationCommand>(res.Response);
 			ret.Discord = this.Discord;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Gets a guild application command.
 		/// </summary>
 		/// <param name="applicationId">The application id.</param>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="commandId">The command id.</param>
 		internal async Task<DiscordApplicationCommand> GetGuildApplicationCommandAsync(ulong applicationId, ulong guildId, ulong commandId)
 		{
 			var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.GUILDS}/:guild_id{Endpoints.COMMANDS}/:command_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {application_id = applicationId, guild_id = guildId, command_id = commandId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route);
 
 			var ret = JsonConvert.DeserializeObject<DiscordApplicationCommand>(res.Response);
 			ret.Discord = this.Discord;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Edits a guild application command.
 		/// </summary>
 		/// <param name="applicationId">The application id.</param>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="commandId">The command id.</param>
 		/// <param name="name">The name.</param>
 		/// <param name="description">The description.</param>
 		/// <param name="options">The options.</param>
 		/// <param name="nameLocalization">The localizations of the name.</param>
 		/// <param name="descriptionLocalization">The localizations of the description.</param>
 		/// <param name="defaultMemberPermission">The default member permissions.</param>
 		/// <param name="dmPermission">The dm permission.</param>
-		internal async Task<DiscordApplicationCommand> EditGuildApplicationCommandAsync(ulong applicationId, ulong guildId, ulong commandId, Optional<string> name, Optional<string> description, Optional<IReadOnlyCollection<DiscordApplicationCommandOption>> options,
+		internal async Task<DiscordApplicationCommand> EditGuildApplicationCommandAsync(ulong applicationId, ulong guildId, ulong commandId, Optional<string> name, Optional<string> description, Optional<IReadOnlyList<DiscordApplicationCommandOption>> options,
 			Optional<DiscordApplicationCommandLocalization> nameLocalization, Optional<DiscordApplicationCommandLocalization> descriptionLocalization,
 			Optional<Permissions> defaultMemberPermission, Optional<bool> dmPermission)
 		{
 			var pld = new RestApplicationCommandEditPayload
 			{
 				Name = name,
 				Description = description,
 				Options = options,
 				DefaultMemberPermission = defaultMemberPermission,
 				DmPermission = dmPermission,
 				NameLocalizations = nameLocalization.Map(l => l.GetKeyValuePairs()).ValueOrDefault(),
 				DescriptionLocalizations = descriptionLocalization.Map(l => l.GetKeyValuePairs()).ValueOrDefault(),
 			};
 
 			var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.GUILDS}/:guild_id{Endpoints.COMMANDS}/:command_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new {application_id = applicationId, guild_id = guildId, command_id = commandId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld));
 
 			var ret = JsonConvert.DeserializeObject<DiscordApplicationCommand>(res.Response);
 			ret.Discord = this.Discord;
 
 			return ret;
 		}
 
 		/// <summary>
 		/// Deletes a guild application command.
 		/// </summary>
 		/// <param name="applicationId">The application id.</param>
 		/// <param name="guildId">The guild id.</param>
 		/// <param name="commandId">The command id.</param>
 		internal async Task DeleteGuildApplicationCommandAsync(ulong applicationId, ulong guildId, ulong commandId)
 		{
 			var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.GUILDS}/:guild_id{Endpoints.COMMANDS}/:command_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.DELETE, route, new {application_id = applicationId, guild_id = guildId, command_id = commandId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route);
 		}
 
 		#region Permissions 2.1
 
 		/// <summary>
 		/// Gets the guild application command permissions.
 		/// </summary>
 		/// <param name="applicationId">The target application id.</param>
 		/// <param name="guildId">The target guild id.</param>
 		internal async Task<IReadOnlyList<DiscordGuildApplicationCommandPermission>> GetGuildApplicationCommandPermissionsAsync(ulong applicationId, ulong guildId)
 		{
 			var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.GUILDS}/:guild_id{Endpoints.COMMANDS}{Endpoints.PERMISSIONS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {application_id = applicationId, guild_id = guildId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route);
 
-			var ret = JsonConvert.DeserializeObject<IEnumerable<DiscordGuildApplicationCommandPermission>>(res.Response);
-
+			var ret = JsonConvert.DeserializeObject<IEnumerable<DiscordGuildApplicationCommandPermission>>(res.Response).ToArray();
 			foreach (var app in ret)
 				app.Discord = this.Discord;
 
-			return ret.ToList();
+			return ret;
 		}
 
 		/// <summary>
 		/// Gets a guild application command permission.
 		/// </summary>
 		/// <param name="applicationId">The target application id.</param>
 		/// <param name="guildId">The target guild id.</param>
 		/// <param name="commandId">The target command id.</param>
 		internal async Task<DiscordGuildApplicationCommandPermission> GetGuildApplicationCommandPermissionAsync(ulong applicationId, ulong guildId, ulong commandId)
 		{
 			var route = $"{Endpoints.APPLICATIONS}/:application_id{Endpoints.GUILDS}/:guild_id{Endpoints.COMMANDS}/:command_id{Endpoints.PERMISSIONS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {application_id = applicationId, guild_id = guildId, command_id = commandId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route);
 
 			var ret = JsonConvert.DeserializeObject<DiscordGuildApplicationCommandPermission>(res.Response);
 
 			ret.Discord = this.Discord;
 
 			return ret;
 		}
 
 		#endregion
 
 		/// <summary>
 		/// Creates the interaction response.
 		/// </summary>
 		/// <param name="interactionId">The interaction id.</param>
 		/// <param name="interactionToken">The interaction token.</param>
 		/// <param name="type">The type.</param>
 		/// <param name="builder">The builder.</param>
 		internal async Task CreateInteractionResponseAsync(ulong interactionId, string interactionToken, InteractionResponseType type, DiscordInteractionResponseBuilder builder)
 		{
 			if (builder?.Embeds != null)
 				foreach (var embed in builder.Embeds)
 					if (embed.Timestamp != null)
 						embed.Timestamp = embed.Timestamp.Value.ToUniversalTime();
 
 			RestInteractionResponsePayload pld;
 
 			if (type != InteractionResponseType.AutoCompleteResult)
 			{
 				var data = builder != null ? new DiscordInteractionApplicationCommandCallbackData
 				{
 					Content = builder.Content ?? null,
 					Embeds = builder.Embeds ?? null,
 					IsTts = builder.IsTts,
 					Mentions = builder.Mentions ?? null,
 					Flags = builder.IsEphemeral ? MessageFlags.Ephemeral : null,
 					Components = builder.Components ?? null,
 					Choices = null
 				} : null;
 
 
 				pld = new RestInteractionResponsePayload
 				{
 					Type = type,
 					Data = data
 				};
 
 
 				if (builder != null && builder.Files != null && builder.Files.Count > 0)
 				{
 					ulong fileId = 0;
 					List<DiscordAttachment> attachments = new();
 					foreach (var file in builder.Files)
 					{
 						DiscordAttachment att = new()
 						{
 							Id = fileId,
 							Discord = this.Discord,
 							Description = file.Description,
 							FileName = file.FileName,
 							FileSize = null
 						};
 						attachments.Add(att);
 						fileId++;
 					}
 					pld.Attachments = attachments;
 					pld.Data.Attachments = attachments;
 				}
 			}
 			else
 			{
 				pld = new RestInteractionResponsePayload
 				{
 					Type = type,
 					Data = new DiscordInteractionApplicationCommandCallbackData
 					{
 						Content = null,
 						Embeds = null,
 						IsTts = null,
 						Mentions = null,
 						Flags = null,
 						Components = null,
 						Choices = builder.Choices,
 						Attachments = null
 					},
 					Attachments = null
 				};
 			}
 
 			var values = new Dictionary<string, string>();
 
 			if (builder != null)
 				if (!string.IsNullOrEmpty(builder.Content) || builder.Embeds?.Count > 0 || builder.IsTts == true || builder.Mentions != null || builder.Files?.Count > 0)
 					values["payload_json"] = DiscordJson.SerializeObject(pld);
 
 			var route = $"{Endpoints.INTERACTIONS}/:interaction_id/:interaction_token{Endpoints.CALLBACK}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {interaction_id = interactionId, interaction_token = interactionToken }, out var path);
 
 			var url = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration).AddParameter("wait", "false").Build();
 			if (builder != null)
 			{
 				await this.DoMultipartAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, values: values, files: builder.Files);
 
 				foreach (var file in builder.Files.Where(x => x.ResetPositionTo.HasValue))
 				{
 					file.Stream.Position = file.ResetPositionTo.Value;
 				}
 			}
 			else
 			{
 				await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld));
 			}
 		}
 
 		/// <summary>
 		/// Creates the interaction response.
 		/// </summary>
 		/// <param name="interactionId">The interaction id.</param>
 		/// <param name="interactionToken">The interaction token.</param>
 		/// <param name="type">The type.</param>
 		/// <param name="builder">The builder.</param>
 		internal async Task CreateInteractionModalResponseAsync(ulong interactionId, string interactionToken, InteractionResponseType type, DiscordInteractionModalBuilder builder)
 		{
 			if (builder.ModalComponents.Any(mc => mc.Components.Any(c => c.Type != Enums.ComponentType.InputText)))
 				throw new NotSupportedException("Can't send any other type then Input Text as Modal Component.");
 
 			var pld = new RestInteractionModalResponsePayload
 			{
 				Type = type,
 				Data = new DiscordInteractionApplicationCommandModalCallbackData
 				{
 					Title = builder.Title,
 					CustomId = builder.CustomId,
 					ModalComponents = builder.ModalComponents
 				}
 			};
 
 			var values = new Dictionary<string, string>();
 
 			var route = $"{Endpoints.INTERACTIONS}/:interaction_id/:interaction_token{Endpoints.CALLBACK}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {interaction_id = interactionId, interaction_token = interactionToken }, out var path);
 
 			var url = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration).AddParameter("wait", "true").Build();
 			await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld));
 		}
 
 		/// <summary>
 		/// Gets the original interaction response.
 		/// </summary>
 		/// <param name="applicationId">The application id.</param>
 		/// <param name="interactionToken">The interaction token.</param>
 		internal Task<DiscordMessage> GetOriginalInteractionResponseAsync(ulong applicationId, string interactionToken) =>
 			this.GetWebhookMessageAsync(applicationId, interactionToken, Endpoints.ORIGINAL, null);
 
 		/// <summary>
 		/// Edits the original interaction response.
 		/// </summary>
 		/// <param name="applicationId">The application id.</param>
 		/// <param name="interactionToken">The interaction token.</param>
 		/// <param name="builder">The builder.</param>
 		internal Task<DiscordMessage> EditOriginalInteractionResponseAsync(ulong applicationId, string interactionToken, DiscordWebhookBuilder builder) =>
 			this.EditWebhookMessageAsync(applicationId, interactionToken, Endpoints.ORIGINAL, builder, null);
 
 		/// <summary>
 		/// Deletes the original interaction response.
 		/// </summary>
 		/// <param name="applicationId">The application id.</param>
 		/// <param name="interactionToken">The interaction token.</param>
 		internal Task DeleteOriginalInteractionResponseAsync(ulong applicationId, string interactionToken) =>
 			this.DeleteWebhookMessageAsync(applicationId, interactionToken, Endpoints.ORIGINAL, null);
 
 		/// <summary>
 		/// Creates the followup message.
 		/// </summary>
 		/// <param name="applicationId">The application id.</param>
 		/// <param name="interactionToken">The interaction token.</param>
 		/// <param name="builder">The builder.</param>
 		internal async Task<DiscordMessage> CreateFollowupMessageAsync(ulong applicationId, string interactionToken, DiscordFollowupMessageBuilder builder)
 		{
 			builder.Validate();
 
 			if (builder.Embeds != null)
 				foreach (var embed in builder.Embeds)
 					if (embed.Timestamp != null)
 						embed.Timestamp = embed.Timestamp.Value.ToUniversalTime();
 
 			var values = new Dictionary<string, string>();
 			var pld = new RestFollowupMessageCreatePayload
 			{
 				Content = builder.Content,
 				IsTts = builder.IsTts,
 				Embeds = builder.Embeds,
 				Flags = builder.Flags,
 				Components = builder.Components
 			};
 
 
 			if (builder.Files != null && builder.Files.Count > 0)
 			{
 				ulong fileId = 0;
 				List<DiscordAttachment> attachments = new();
 				foreach (var file in builder.Files)
 				{
 					DiscordAttachment att = new()
 					{
 						Id = fileId,
 						Discord = this.Discord,
 						Description = file.Description,
 						FileName = file.FileName,
 						FileSize = null
 					};
 					attachments.Add(att);
 					fileId++;
 				}
 				pld.Attachments = attachments;
 			}
 
 			if (builder.Mentions != null)
 				pld.Mentions = new DiscordMentions(builder.Mentions, builder.Mentions.Any());
 
 			if (!string.IsNullOrEmpty(builder.Content) || builder.Embeds?.Count > 0 || builder.IsTts == true || builder.Mentions != null || builder.Files?.Count > 0)
 				values["payload_json"] = DiscordJson.SerializeObject(pld);
 
 			var route = $"{Endpoints.WEBHOOKS}/:application_id/:interaction_token";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new {application_id = applicationId, interaction_token = interactionToken }, out var path);
 
 			var url = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration).AddParameter("wait", "true").Build();
 			var res = await this.DoMultipartAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, values: values, files: builder.Files).ConfigureAwait(false);
 			var ret = JsonConvert.DeserializeObject<DiscordMessage>(res.Response);
 
 			foreach (var att in ret.AttachmentsInternal)
 			{
 				att.Discord = this.Discord;
 			}
 
 			foreach (var file in builder.Files.Where(x => x.ResetPositionTo.HasValue))
 			{
 				file.Stream.Position = file.ResetPositionTo.Value;
 			}
 
 			ret.Discord = this.Discord;
 			return ret;
 		}
 
 		/// <summary>
 		/// Gets the followup message.
 		/// </summary>
 		/// <param name="applicationId">The application id.</param>
 		/// <param name="interactionToken">The interaction token.</param>
 		/// <param name="messageId">The message id.</param>
 		internal Task<DiscordMessage> GetFollowupMessageAsync(ulong applicationId, string interactionToken, ulong messageId) =>
 			this.GetWebhookMessageAsync(applicationId, interactionToken, messageId);
 
 		/// <summary>
 		/// Edits the followup message.
 		/// </summary>
 		/// <param name="applicationId">The application id.</param>
 		/// <param name="interactionToken">The interaction token.</param>
 		/// <param name="messageId">The message id.</param>
 		/// <param name="builder">The builder.</param>
 		internal Task<DiscordMessage> EditFollowupMessageAsync(ulong applicationId, string interactionToken, ulong messageId, DiscordWebhookBuilder builder) =>
 			this.EditWebhookMessageAsync(applicationId, interactionToken, messageId.ToString(), builder, null);
 
 		/// <summary>
 		/// Deletes the followup message.
 		/// </summary>
 		/// <param name="applicationId">The application id.</param>
 		/// <param name="interactionToken">The interaction token.</param>
 		/// <param name="messageId">The message id.</param>
 		internal Task DeleteFollowupMessageAsync(ulong applicationId, string interactionToken, ulong messageId) =>
 			this.DeleteWebhookMessageAsync(applicationId, interactionToken, messageId);
 		#endregion
 
 		#region Misc
 		/// <summary>
 		/// Gets the current application info async.
 		/// </summary>
-
 		internal Task<TransportApplication> GetCurrentApplicationInfoAsync()
 			=> this.GetApplicationInfoAsync("@me");
 
 		/// <summary>
 		/// Gets the application info async.
 		/// </summary>
 		/// <param name="applicationId">The application_id.</param>
-
 		internal Task<TransportApplication> GetApplicationInfoAsync(ulong applicationId)
 			=> this.GetApplicationInfoAsync(applicationId.ToString(CultureInfo.InvariantCulture));
 
 		/// <summary>
 		/// Gets the application info async.
 		/// </summary>
 		/// <param name="applicationId">The application_id.</param>
-
 		private async Task<TransportApplication> GetApplicationInfoAsync(string applicationId)
 		{
 			var route = $"{Endpoints.OAUTH2}{Endpoints.APPLICATIONS}/:application_id";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new {application_id = applicationId }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
 			return JsonConvert.DeserializeObject<TransportApplication>(res.Response);
 		}
 
 		/// <summary>
 		/// Gets the application assets async.
 		/// </summary>
 		/// <param name="application">The application.</param>
-
 		internal async Task<IReadOnlyList<DiscordApplicationAsset>> GetApplicationAssetsAsync(DiscordApplication application)
 		{
 			var route = $"{Endpoints.OAUTH2}{Endpoints.APPLICATIONS}/:application_id{Endpoints.ASSETS}";
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { application_id = application.Id }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false);
 
-			var assets = JsonConvert.DeserializeObject<IEnumerable<DiscordApplicationAsset>>(res.Response);
-			foreach (var asset in assets)
-			{
-				asset.Discord = application.Discord;
-				asset.Application = application;
-			}
-
-			return new ReadOnlyCollection<DiscordApplicationAsset>(new List<DiscordApplicationAsset>(assets));
+			return JsonConvert.DeserializeObject<List<DiscordApplicationAsset>>(res.Response)
+				.Mutate(asset => { asset.Discord = application.Discord; asset.Application = application; });
 		}
 
 		/// <summary>
 		/// Gets the gateway info async.
 		/// </summary>
-
 		internal async Task<GatewayInfo> GetGatewayInfoAsync()
 		{
 			var headers = Utilities.GetBaseHeaders();
 			var route = Endpoints.GATEWAY;
 			if (this.Discord.Configuration.TokenType == TokenType.Bot)
 				route += Endpoints.BOT;
 			var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new { }, out var path);
 
 			var url = Utilities.GetApiUriFor(path, this.Discord.Configuration);
 			var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route, headers).ConfigureAwait(false);
 
 			var info = JObject.Parse(res.Response).ToObject<GatewayInfo>();
 			info.SessionBucket.ResetAfter = DateTimeOffset.UtcNow + TimeSpan.FromMilliseconds(info.SessionBucket.ResetAfterInternal);
 			return info;
 		}
 		#endregion
 	}
 }
diff --git a/DisCatSharp/Net/Rest/MultipartWebRequest.cs b/DisCatSharp/Net/Rest/MultipartWebRequest.cs
index 6dbd25487..fb0e7d4e9 100644
--- a/DisCatSharp/Net/Rest/MultipartWebRequest.cs
+++ b/DisCatSharp/Net/Rest/MultipartWebRequest.cs
@@ -1,125 +1,125 @@
 // 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 System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
 using DisCatSharp.Entities;
 
 namespace DisCatSharp.Net
 {
 	/// <summary>
 	/// Represents a multipart HTTP request.
 	/// </summary>
 	internal sealed class MultipartWebRequest : BaseRestRequest
 	{
 		/// <summary>
 		/// Gets the dictionary of values attached to this request.
 		/// </summary>
 		public IReadOnlyDictionary<string, string> Values { get; }
 
 		/// <summary>
 		/// Gets the dictionary of files attached to this request.
 		/// </summary>
 		public IReadOnlyDictionary<string, Stream> Files { get; }
 
 		/// <summary>
 		/// Overwrites the file id start.
 		/// </summary>
 		public int? OverwriteFileIdStart { get; }
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="MultipartWebRequest"/> class.
 		/// </summary>
 		/// <param name="client">The client.</param>
 		/// <param name="bucket">The bucket.</param>
 		/// <param name="url">The url.</param>
 		/// <param name="method">The method.</param>
 		/// <param name="route">The route.</param>
 		/// <param name="headers">The headers.</param>
 		/// <param name="values">The values.</param>
 		/// <param name="files">The files.</param>
 		/// <param name="ratelimitWaitOverride">The ratelimit_wait_override.</param>
 		/// <param name="overwriteFileIdStart">The file id start.</param>
 		internal MultipartWebRequest(BaseDiscordClient client, RateLimitBucket bucket, Uri url, RestRequestMethod method, string route, IReadOnlyDictionary<string, string> headers = null, IReadOnlyDictionary<string, string> values = null,
-			IReadOnlyCollection<DiscordMessageFile> files = null, double? ratelimitWaitOverride = null, int? overwriteFileIdStart = null)
+			IEnumerable<DiscordMessageFile> files = null, double? ratelimitWaitOverride = null, int? overwriteFileIdStart = null)
 			: base(client, bucket, url, method, route, headers, ratelimitWaitOverride)
 		{
 			this.Values = values;
 			this.OverwriteFileIdStart = overwriteFileIdStart;
 			this.Files = files.ToDictionary(x => x.FileName, x => x.Stream);
 		}
 	}
 
 
 	/// <summary>
 	/// Represents a multipart HTTP request for stickers.
 	/// </summary>
 	internal sealed class MultipartStickerWebRequest : BaseRestRequest
 	{
 		/// <summary>
 		/// Gets the file.
 		/// </summary>
 		public DiscordMessageFile File { get; }
 
 		/// <summary>
 		/// Gets the name.
 		/// </summary>
 		public string Name { get; }
 
 		/// <summary>
 		/// Gets the description.
 		/// </summary>
 		public string Description { get; }
 
 		/// <summary>
 		/// Gets the tags.
 		/// </summary>
 		public string Tags { get; }
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="MultipartStickerWebRequest"/> class.
 		/// </summary>
 		/// <param name="client">The client.</param>
 		/// <param name="bucket">The bucket.</param>
 		/// <param name="url">The url.</param>
 		/// <param name="method">The method.</param>
 		/// <param name="route">The route.</param>
 		/// <param name="headers">The headers.</param>
 		/// <param name="file">The file.</param>
 		/// <param name="name">The sticker name.</param>
 		/// <param name="tags">The sticker tag.</param>
 		/// <param name="description">The sticker description.</param>
 		/// <param name="ratelimitWaitOverride">The ratelimit_wait_override.</param>
 		internal MultipartStickerWebRequest(BaseDiscordClient client, RateLimitBucket bucket, Uri url, RestRequestMethod method, string route, IReadOnlyDictionary<string, string> headers = null,
 			DiscordMessageFile file = null, string name = "", string tags = "", string description = "", double? ratelimitWaitOverride = null)
 			: base(client, bucket, url, method, route, headers, ratelimitWaitOverride)
 		{
 			this.File = file;
 			this.Name = name;
 			this.Description = description;
 			this.Tags = tags;
 		}
 	}
 }