diff --git a/src/main/java/net/Indyuce/mmocore/guild/compat/FactionsGuildModule.java b/src/main/java/net/Indyuce/mmocore/guild/compat/FactionsGuildModule.java
index f7470a10..066b6181 100644
--- a/src/main/java/net/Indyuce/mmocore/guild/compat/FactionsGuildModule.java
+++ b/src/main/java/net/Indyuce/mmocore/guild/compat/FactionsGuildModule.java
@@ -6,6 +6,7 @@ import com.massivecraft.factions.Faction;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.guild.AbstractGuild;
 import net.Indyuce.mmocore.guild.GuildModule;
+import org.jetbrains.annotations.NotNull;
 
 public class FactionsGuildModule implements GuildModule {
 
@@ -16,6 +17,8 @@ public class FactionsGuildModule implements GuildModule {
     }
 
     class CustomGuild implements AbstractGuild {
+
+        @NotNull
         private final Faction faction;
 
         CustomGuild(Faction faction) {
diff --git a/src/main/java/net/Indyuce/mmocore/guild/compat/GuildsGuildModule.java b/src/main/java/net/Indyuce/mmocore/guild/compat/GuildsGuildModule.java
index d1fdb2ae..bfeca8ce 100644
--- a/src/main/java/net/Indyuce/mmocore/guild/compat/GuildsGuildModule.java
+++ b/src/main/java/net/Indyuce/mmocore/guild/compat/GuildsGuildModule.java
@@ -5,6 +5,7 @@ import me.glaremasters.guilds.guild.Guild;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.guild.AbstractGuild;
 import net.Indyuce.mmocore.guild.GuildModule;
+import org.jetbrains.annotations.NotNull;
 
 public class GuildsGuildModule implements GuildModule {
 
@@ -15,6 +16,8 @@ public class GuildsGuildModule implements GuildModule {
     }
 
     class CustomGuild implements AbstractGuild {
+
+        @NotNull
         private final Guild guild;
 
         CustomGuild(Guild guild) {
diff --git a/src/main/java/net/Indyuce/mmocore/guild/compat/KingdomsXGuildModule.java b/src/main/java/net/Indyuce/mmocore/guild/compat/KingdomsXGuildModule.java
index 40579976..21487d76 100644
--- a/src/main/java/net/Indyuce/mmocore/guild/compat/KingdomsXGuildModule.java
+++ b/src/main/java/net/Indyuce/mmocore/guild/compat/KingdomsXGuildModule.java
@@ -3,16 +3,28 @@ package net.Indyuce.mmocore.guild.compat;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.guild.AbstractGuild;
 import net.Indyuce.mmocore.guild.GuildModule;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.kingdoms.constants.kingdom.Kingdom;
+import org.kingdoms.constants.player.KingdomPlayer;
+import org.kingdoms.main.Kingdoms;
 
 public class KingdomsXGuildModule implements GuildModule {
 
     @Override
     public AbstractGuild getGuild(PlayerData playerData) {
-        throw new RuntimeException("Not supported");
+        KingdomPlayer kPlayer = Kingdoms.get().getDataHandlers().getKingdomPlayerManager().getData(playerData.getUniqueId());
+        Kingdom kingdom = kPlayer == null ? null : kPlayer.getKingdom();
+        return kingdom == null ? null : new CustomGuild(kingdom);
     }
 
     class CustomGuild implements AbstractGuild {
-        CustomGuild() {
+
+        @NotNull
+        private final Kingdom kingdom;
+
+        CustomGuild(Kingdom kingdom) {
+            this.kingdom = kingdom;
         }
     }
 }
diff --git a/src/main/java/net/Indyuce/mmocore/guild/compat/UltimateClansGuildModule.java b/src/main/java/net/Indyuce/mmocore/guild/compat/UltimateClansGuildModule.java
index 7b9bd060..1005db38 100644
--- a/src/main/java/net/Indyuce/mmocore/guild/compat/UltimateClansGuildModule.java
+++ b/src/main/java/net/Indyuce/mmocore/guild/compat/UltimateClansGuildModule.java
@@ -6,6 +6,7 @@ import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.guild.AbstractGuild;
 import net.Indyuce.mmocore.guild.GuildModule;
 import org.bukkit.Bukkit;
+import org.jetbrains.annotations.NotNull;
 
 public class UltimateClansGuildModule implements GuildModule {
     private static final UClans API = (UClans) Bukkit.getPluginManager().getPlugin("UltimateCLans");
@@ -15,8 +16,9 @@ public class UltimateClansGuildModule implements GuildModule {
         return API.getPlayerAPI().hasClan(playerData.getUniqueId()) ? new CustomGuild(API.getClanAPI().getClan(API.getPlayerAPI().getClanID(playerData.getUniqueId()))) : null;
     }
 
-
     class CustomGuild implements AbstractGuild {
+
+        @NotNull
         private final ClanData clan;
 
         CustomGuild(ClanData clan) {
diff --git a/src/main/java/net/Indyuce/mmocore/party/compat/DungeonsPartyModule.java b/src/main/java/net/Indyuce/mmocore/party/compat/DungeonsPartyModule.java
index ff193674..a2992622 100644
--- a/src/main/java/net/Indyuce/mmocore/party/compat/DungeonsPartyModule.java
+++ b/src/main/java/net/Indyuce/mmocore/party/compat/DungeonsPartyModule.java
@@ -7,6 +7,7 @@ import org.bukkit.entity.Player;
 
 import java.util.List;
 
+@Deprecated
 public class DungeonsPartyModule implements PartyModule {
 
     @Override