diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 2c0452e4f..d5af6c845 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -1,95 +1,95 @@
 name: "Documentation"
 on:
   push:
     branches: [ main ]
   workflow_dispatch:
 jobs:
   build:
     runs-on: windows-latest
     name: Build documentation
     steps:
     - name: Checkout repository
       uses: actions/checkout@v3
       with:
         path: DisCatSharp
     - name: Setup .NET
       uses: actions/setup-dotnet@v2
       with:
         dotnet-version: 6.0.202
     - name: Restore packages
       working-directory: DisCatSharp
       run: dotnet restore
     - name: Build library
       working-directory: DisCatSharp
       run: dotnet build -c Release
     - name: Test library
       working-directory: DisCatSharp
       run: dotnet test -c Release
       continue-on-error: true
     - name: Build Docs
       working-directory: DisCatSharp
       shell: pwsh
       run: ./rebuild-docs.ps1 -DocsPath "./DisCatSharp.Docs" -Output ".." -PackageName "dcs-docs"
     - name: Upload packed docs
       uses: actions/upload-artifact@v3
       with:
         name: dcs-docs.zip
         path: dcs-docs.zip
         retention-days: 30
   documentation:
     runs-on: windows-latest
     name: Upload documentation
     needs: build
     steps:
     - name: Checkout docs repository
       uses: actions/checkout@v3
       with:
         repository: Aiko-IT-Systems/DisCatSharp.Docs
         path: DisCatSharp.Docs
         token: ${{ secrets.NYUW_TOKEN_GH }}
     - name: Download packed docs
       uses: actions/download-artifact@v3
       with:
         name: dcs-docs.zip
     - name: Purge old docs
       working-directory: DisCatSharp.Docs
       shell: pwsh
       run: Get-ChildItem -Exclude .git* | Remove-Item -Recurse -Force
     - name: Extract new docs
       shell: pwsh
       run: Expand-Archive -Path dcs-docs.zip DisCatSharp.Docs/
     - name: Commit and push changes
       uses: EndBug/add-and-commit@main
       with:
         cwd: DisCatSharp.Docs
         default_author: user_info
         author_name: DisCatSharp
         author_email: team@aitsys.dev
         committer_name: NyuwBot
         committer_email: nyuw@aitsys.dev
         commit: --signoff
         message: 'Docs update for commit ${{ github.repository }} (${{ github.sha }})'
   publish-main:
     runs-on: ubuntu-latest
     name: Publish documentation on main server
     needs: documentation
     steps:
     - name: Get SSH Agent
       uses: webfactory/ssh-agent@v0.5.4
       with:
         ssh-private-key: ${{ secrets.AITSYS_SSH }}
     - name: Publish on server
       continue-on-error: true
-      run: ssh -o StrictHostKeyChecking=no -T root@80.153.182.68 -f 'cd /var/www/dcs/docs && git pull -f'
+      run: ssh -o StrictHostKeyChecking=no -T root@80.153.182.68 -f 'cd /var/www/dcs.aitsys.dev/docs && git pull -f'
   publish-backup:
     runs-on: ubuntu-latest
     name: Publish documentation on backup server
     needs: documentation
     steps:
     - name: Get SSH Agent
       uses: webfactory/ssh-agent@v0.5.4
       with:
         ssh-private-key: ${{ secrets.AITSYS_SSH }}
     - name: Publish on server
       continue-on-error: true
       run: ssh -o StrictHostKeyChecking=no -T root@207.180.240.241 -f 'cd /var/www/dcsdocs && git pull -f'
diff --git a/DisCatSharp.Common/Types/LinqMethods.cs b/DisCatSharp.Common/Types/LinqMethods.cs
index 43c0e2069..9e9d8c02e 100644
--- a/DisCatSharp.Common/Types/LinqMethods.cs
+++ b/DisCatSharp.Common/Types/LinqMethods.cs
@@ -1,78 +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 System.Linq;
 
 namespace DisCatSharp.Common;
 
 /// <summary>
 /// Various Methods for Linq
 /// </summary>
 public static class LinqMethods
 {
 	/// <summary>
 	/// Safely tries to get the first match out of a list.
 	/// </summary>
 	/// <typeparam name="TSource">Value type of list.</typeparam>
 	/// <param name="list">The list to use.</param>
 	/// <param name="predicate">The predicate.</param>
 	/// <param name="value">The value to get if succeeded</param>
 	/// <returns>Whether a value was found.</returns>
-#nullable enable
 	public static bool GetFirstValueWhere<TSource>(this List<TSource?>? list, Func<TSource?, bool> predicate, out TSource? value)
 	{
-		if (list == null || !list.Any())
+		if (list.EmptyOrNull())
 		{
 			value = default;
 			return false;
 		}
 
 		value = list.Where(predicate).FirstOrDefault();
 
 		return value is not null;
 	}
-#nullable disable
 
 	/// <summary>
 	/// Safely tries to extract the value of the first match where target key is found, otherwise null.
 	/// </summary>
 	/// <typeparam name="TKey">Key type of dictionary.</typeparam>
 	/// <typeparam name="TValue">Value type of dictionary.</typeparam>
 	/// <param name="dict">The dictionary to use.</param>
 	/// <param name="key">The key to search for.</param>
 	/// <param name="value">The value to get if succeeded.</param>
 	/// <returns>Whether a value was found through the key.</returns>
-#nullable enable
-	public static bool GetFirstValueByKey<TKey, TValue>(this Dictionary<TKey?, TValue?>? dict, TKey? key, out TValue? value)
+	public static bool GetFirstValueByKey<TKey, TValue>(this Dictionary<TKey, TValue?>? dict, TKey? key, out TValue? value)
+		where TKey : notnull
 	{
 		if (dict == null)
 		{
 			value = default;
 			return false;
 		}
 
 		return dict.TryGetValue(key, out value);
 	}
-#nullable disable
 }
diff --git a/DisCatSharp.Common/Utilities/EnsureObjectStates.cs b/DisCatSharp.Common/Utilities/EnsureObjectStates.cs
index 4573c9441..0e71821a7 100644
--- a/DisCatSharp.Common/Utilities/EnsureObjectStates.cs
+++ b/DisCatSharp.Common/Utilities/EnsureObjectStates.cs
@@ -1,78 +1,70 @@
 // 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;
 
 namespace DisCatSharp.Common;
 
 /// <summary>
 /// Ensures that certain objects have the target state.
 /// </summary>
 public static class EnsureObjectStates
 {
 	/// <summary>
 	/// Checks whether the dictionary is null or empty.
 	/// </summary>
 	/// <typeparam name="T1">Any key type.</typeparam>
 	/// <typeparam name="T2">Any value type.</typeparam>
 	/// <param name="dictionary">The dictionary to check on.</param>
 	/// <returns>True if satisfied, false otherwise.</returns>
-#nullable enable
-	public static bool EmptyOrNull<T1, T2>(this Dictionary<T1?, T2?>? dictionary)
-		=> dictionary == null || !dictionary.Any() || dictionary.Keys == null || !dictionary.Keys.Any();
-#nullable disable
+	public static bool EmptyOrNull<T1, T2>(this Dictionary<T1, T2?>? dictionary) where T1 : notnull
+		=> dictionary == null || !dictionary.Any() || !dictionary.Keys.Any();
 
 	/// <summary>
 	/// Checks whether the dictionary is not null and not empty.
 	/// </summary>
 	/// <typeparam name="T1">Any key type.</typeparam>
 	/// <typeparam name="T2">Any value type.</typeparam>
 	/// <param name="dictionary">The dictionary to check on.</param>
 	/// <returns>True if satisfied, false otherwise.</returns>
-#nullable enable
-	public static bool NotEmptyAndNotNull<T1, T2>(this Dictionary<T1?, T2?>? dictionary)
-		=> dictionary != null && dictionary.Any() && dictionary.Keys != null && dictionary.Keys.Any();
-#nullable disable
+	public static bool NotEmptyAndNotNull<T1, T2>(this Dictionary<T1, T2?>? dictionary) where T1 : notnull
+		=> dictionary != null && dictionary.Any() && dictionary.Keys.Any();
 
 	/// <summary>
 	/// Checks whether the list is null or empty.
 	/// </summary>
 	/// <typeparam name="T">Any value type.</typeparam>
 	/// <param name="list">The list to check on.</param>
 	/// <returns>True if satisfied, false otherwise.</returns>
-#nullable enable
 	public static bool EmptyOrNull<T>(this List<T?>? list)
 		=> list == null || !list.Any();
-#nullable disable
 
 	/// <summary>
 	/// Checks whether the list is not null and not empty.
 	/// </summary>
 	/// <typeparam name="T">Any value type.</typeparam>
 	/// <param name="list">The list to check on.</param>
 	/// <returns>True if satisfied, false otherwise.</returns>
-#nullable enable
 	public static bool NotEmptyAndNotNull<T>(this List<T?>? list)
 		=> list != null && list.Any();
-#nullable disable
 }
diff --git a/DisCatSharp/Entities/Interaction/DiscordInteractionModalBuilder.cs b/DisCatSharp/Entities/Interaction/DiscordInteractionModalBuilder.cs
index 5dde3d4b5..403d16848 100644
--- a/DisCatSharp/Entities/Interaction/DiscordInteractionModalBuilder.cs
+++ b/DisCatSharp/Entities/Interaction/DiscordInteractionModalBuilder.cs
@@ -1,157 +1,161 @@
 // 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;
 
 namespace DisCatSharp.Entities;
 
 /// <summary>
 /// Constructs an interaction modal response.
 /// </summary>
 public sealed class DiscordInteractionModalBuilder
 {
 	/// <summary>
 	/// Title of modal.
 	/// </summary>
 	public string Title
 	{
 		get => this._title;
 		set
 		{
 			if (value != null && value.Length > 128)
 				throw new ArgumentException("Title length cannot exceed 128 characters.", nameof(value));
 			this._title = value;
 		}
 	}
 	private string _title;
 
 	/// <summary>
 	/// Custom id of modal.
 	/// </summary>
 	public string CustomId { get; set; }
 
 	/// <summary>
 	/// Components to send on this interaction response.
 	/// </summary>
 	public IReadOnlyList<DiscordActionRowComponent> ModalComponents => this._components;
 	private readonly List<DiscordActionRowComponent> _components = new();
 
 	/// <summary>
 	/// Constructs a new empty interaction modal builder.
 	/// </summary>
-	public DiscordInteractionModalBuilder() { }
+	public DiscordInteractionModalBuilder(string title = null, string customId = null)
+	{
+		this.Title = title ?? "Title";
+		this.CustomId = customId ?? Guid.NewGuid().ToString();
+	}
 
 	public DiscordInteractionModalBuilder WithTitle(string title)
 	{
 		this.Title = title;
 		return this;
 	}
 
 	public DiscordInteractionModalBuilder WithCustomId(string customId)
 	{
 		this.CustomId = customId;
 		return this;
 	}
 
 	/// <summary>
 	/// Appends a collection of components to the builder. Each call will append to a new row.
 	/// </summary>
 	/// <param name="components">The components to append. Up to five.</param>
 	/// <returns>The current builder to chain calls with.</returns>
 	/// <exception cref="System.ArgumentException">Thrown when passing more than 5 components.</exception>
 	public DiscordInteractionModalBuilder AddModalComponents(params DiscordTextComponent[] components)
 		=> this.AddModalComponents((IEnumerable<DiscordTextComponent>)components);
 
 	/// <summary>
 	/// Appends a text component to the builder.
 	/// </summary>
 	/// <param name="component">The component to append.</param>
 	/// <returns>The current builder to chain calls with.</returns>
 	public DiscordInteractionModalBuilder AddTextComponent(DiscordTextComponent component)
 	{
 		List<DiscordTextComponent> comp = new(1)
 		{
 			component
 		};
 
 		return this.AddModalComponents(comp);
 	}
 
 	/// <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 DiscordInteractionModalBuilder AddModalComponents(IEnumerable<DiscordActionRowComponent> components)
 	{
 		var ara = components.ToArray();
 
 		if (ara.Length + this._components.Count > 5)
 			throw new ArgumentException("ActionRow count exceeds maximum of five.");
 
 		foreach (var ar in ara)
 			this._components.Add(ar);
 
 		return this;
 	}
 
 	/// <summary>
 	/// Appends a collection of components to the builder. Each call will append to a new row.
 	/// If you add a <see cref="DiscordTextComponent"></see> you can only add one.
 	/// </summary>
 	/// <param name="components">The components to append. Up to five.</param>
 	/// <returns>The current builder to chain calls with.</returns>
 	/// <exception cref="System.ArgumentException">Thrown when passing more than 5 components.</exception>
 	public DiscordInteractionModalBuilder AddModalComponents(IEnumerable<DiscordTextComponent> components)
 	{
 		var compArr = components.ToArray();
 		var count = compArr.Length;
 
 		if (count > 5)
 			throw new ArgumentException("Cannot add more than 5 components per action row!");
 
 		if (components.Where(c => c.Type == Enums.ComponentType.InputText).Any() && count < 1)
 			throw new ArgumentException("Cannot add more than 1 text components per action row!");
 
 		var arc = new DiscordActionRowComponent(compArr);
 		this._components.Add(arc);
 		return this;
 	}
 
 	/// <summary>
 	/// Clears all message components on this builder.
 	/// </summary>
 	public void ClearComponents()
 		=> this._components.Clear();
 
 	/// <summary>
 	/// Allows for clearing the Interaction Response Builder so that it can be used again to send a new response.
 	/// </summary>
 	public void Clear()
 	{
 		this._components.Clear();
 		this.Title = null;
 		this.CustomId = null;
 	}
 }