diff --git a/Library-of-Exile-Rework b/Library-of-Exile-Rework
index 9ff11cbf7..bb4731c5b 160000
--- a/Library-of-Exile-Rework
+++ b/Library-of-Exile-Rework
@@ -1 +1 @@
-Subproject commit 9ff11cbf72c80f4f562e6f622481d2744d368fb7
+Subproject commit bb4731c5bc7cf229c4fe28ec3e6283a487681074
diff --git a/src/main/java/com/robertx22/mine_and_slash/database/data/aura/AuraGem.java b/src/main/java/com/robertx22/mine_and_slash/database/data/aura/AuraGem.java
index 2ab51b7a9..2b7bca176 100644
--- a/src/main/java/com/robertx22/mine_and_slash/database/data/aura/AuraGem.java
+++ b/src/main/java/com/robertx22/mine_and_slash/database/data/aura/AuraGem.java
@@ -18,7 +18,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class AuraGem implements JsonExileRegistry<SupportGem>, ISkillGem, IAutoGson<AuraGem> {
+public class AuraGem implements JsonExileRegistry<AuraGem>, ISkillGem, IAutoGson<AuraGem> {
 
     public static AuraGem SERIALIZER = new AuraGem(AuraGems.summon_dmg, PlayStyle.STR, 0, Arrays.asList());
 
diff --git a/src/main/java/com/robertx22/mine_and_slash/database/data/map_affix/MapAffix.java b/src/main/java/com/robertx22/mine_and_slash/database/data/map_affix/MapAffix.java
index e3c67fcc8..cd12707ef 100644
--- a/src/main/java/com/robertx22/mine_and_slash/database/data/map_affix/MapAffix.java
+++ b/src/main/java/com/robertx22/mine_and_slash/database/data/map_affix/MapAffix.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class MapAffix implements JsonExileRegistry<MobAffix>, IAutoGson<MapAffix> {
+public class MapAffix implements JsonExileRegistry<MapAffix>, IAutoGson<MapAffix> {
 
     public static MapAffix SER = new MapAffix("");
 
diff --git a/src/main/java/com/robertx22/mine_and_slash/database/data/rarities/BaseRarity.java b/src/main/java/com/robertx22/mine_and_slash/database/data/rarities/BaseRarity.java
index a6de394c4..5a4a4dfcf 100644
--- a/src/main/java/com/robertx22/mine_and_slash/database/data/rarities/BaseRarity.java
+++ b/src/main/java/com/robertx22/mine_and_slash/database/data/rarities/BaseRarity.java
@@ -5,7 +5,7 @@
 import com.robertx22.mine_and_slash.uncommon.interfaces.data_items.IRarity;
 import net.minecraft.ChatFormatting;
 
-public abstract class BaseRarity implements Rarity {
+public abstract class BaseRarity<Self extends BaseRarity<Self>> implements Rarity<Self> {
 
     public BaseRarity() {
     }
diff --git a/src/main/java/com/robertx22/mine_and_slash/database/data/rarities/GearRarity.java b/src/main/java/com/robertx22/mine_and_slash/database/data/rarities/GearRarity.java
index ddf3df6ac..190aedef4 100644
--- a/src/main/java/com/robertx22/mine_and_slash/database/data/rarities/GearRarity.java
+++ b/src/main/java/com/robertx22/mine_and_slash/database/data/rarities/GearRarity.java
@@ -17,7 +17,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 
-public final class GearRarity extends BaseRarity implements IGearRarity, IAutoGson<GearRarity> {
+public final class GearRarity extends BaseRarity<GearRarity> implements IGearRarity<GearRarity>, IAutoGson<GearRarity> {
     public static GearRarity SERIALIZER = new GearRarity();
 
     public GearRarity() {
diff --git a/src/main/java/com/robertx22/mine_and_slash/database/data/rarities/IGearRarity.java b/src/main/java/com/robertx22/mine_and_slash/database/data/rarities/IGearRarity.java
index 79bccc5e9..5d3a436c5 100644
--- a/src/main/java/com/robertx22/mine_and_slash/database/data/rarities/IGearRarity.java
+++ b/src/main/java/com/robertx22/mine_and_slash/database/data/rarities/IGearRarity.java
@@ -2,7 +2,7 @@
 
 import com.robertx22.mine_and_slash.saveclasses.gearitem.gear_bases.Rarity;
 
-public interface IGearRarity extends Rarity, SalvagableItem {
+public interface IGearRarity<Self extends IGearRarity<Self>> extends Rarity<Self>, SalvagableItem {
   
 
     float valueMulti();
diff --git a/src/main/java/com/robertx22/mine_and_slash/database/data/stats/Stat.java b/src/main/java/com/robertx22/mine_and_slash/database/data/stats/Stat.java
index 46a6c060b..79d7bf5d3 100644
--- a/src/main/java/com/robertx22/mine_and_slash/database/data/stats/Stat.java
+++ b/src/main/java/com/robertx22/mine_and_slash/database/data/stats/Stat.java
@@ -36,7 +36,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public abstract class Stat implements IGUID, IAutoLocName, IWeighted, IAutoLocDesc, JsonExileRegistry<BaseDatapackStat> {
+public abstract class Stat implements IGUID, IAutoLocName, IWeighted, IAutoLocDesc, JsonExileRegistry<Stat> {
 
     public static String VAL1 = "[VAL1]";
     static ChatFormatting FORMAT = ChatFormatting.GRAY;
diff --git a/src/main/java/com/robertx22/mine_and_slash/database/registry/ExileDB.java b/src/main/java/com/robertx22/mine_and_slash/database/registry/ExileDB.java
index b4539ed8d..cc243c195 100644
--- a/src/main/java/com/robertx22/mine_and_slash/database/registry/ExileDB.java
+++ b/src/main/java/com/robertx22/mine_and_slash/database/registry/ExileDB.java
@@ -102,7 +102,7 @@ public static EntityConfig getEntityConfig(LivingEntity entity, EntityData data)
     }
 
     public static ExileRegistryContainer<GearSlot> GearSlots() {
-        return Database.getRegistry(ExileRegistryTypes.GEAR_SLOT);
+        return Database.<GearSlot>getRegistry(ExileRegistryTypes.GEAR_SLOT);
     }
 
     public static ExileRegistryContainer<UniqueGear> UniqueGears() {
diff --git a/src/main/java/com/robertx22/mine_and_slash/database/registry/ExileRegistryTypes.java b/src/main/java/com/robertx22/mine_and_slash/database/registry/ExileRegistryTypes.java
index a3604fe30..545f72f9d 100644
--- a/src/main/java/com/robertx22/mine_and_slash/database/registry/ExileRegistryTypes.java
+++ b/src/main/java/com/robertx22/mine_and_slash/database/registry/ExileRegistryTypes.java
@@ -4,8 +4,10 @@
 import com.robertx22.library_of_exile.registry.ExileRegistryType;
 import com.robertx22.library_of_exile.registry.SyncTime;
 import com.robertx22.library_of_exile.registry.loaders.BaseDataPackLoader;
+import com.robertx22.mine_and_slash.aoe_data.database.ailments.Ailment;
 import com.robertx22.mine_and_slash.database.Serializers;
 import com.robertx22.mine_and_slash.database.data.DimensionConfig;
+import com.robertx22.mine_and_slash.database.data.EntityConfig;
 import com.robertx22.mine_and_slash.database.data.affixes.Affix;
 import com.robertx22.mine_and_slash.database.data.aura.AuraGem;
 import com.robertx22.mine_and_slash.database.data.auto_item.AutoItem;
@@ -32,6 +34,7 @@
 import com.robertx22.mine_and_slash.database.data.spell_school.SpellSchool;
 import com.robertx22.mine_and_slash.database.data.spells.components.Spell;
 import com.robertx22.mine_and_slash.database.data.stat_compat.StatCompat;
+import com.robertx22.mine_and_slash.database.data.stats.Stat;
 import com.robertx22.mine_and_slash.database.data.stats.datapacks.base.BaseDatapackStat;
 import com.robertx22.mine_and_slash.database.data.stats.layers.StatLayer;
 import com.robertx22.mine_and_slash.database.data.support_gem.SupportGem;
@@ -54,35 +57,35 @@ public class ExileRegistryTypes {
 
      */
 
-    public static ExileRegistryType GEAR_RARITY = ExileRegistryType.register(SlashRef.MODID, "gear_rarity", 0, GearRarity.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType WEAPON_TYPE = ExileRegistryType.register(SlashRef.MODID, "weapon_type", 0, WeaponTypes.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType STAT_LAYER = ExileRegistryType.register(SlashRef.MODID, "stat_layer", 0, StatLayer.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<GearRarity> GEAR_RARITY = ExileRegistryType.register(SlashRef.MODID, "gear_rarity", 0, GearRarity.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<WeaponTypes> WEAPON_TYPE = ExileRegistryType.register(SlashRef.MODID, "weapon_type", 0, WeaponTypes.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<StatLayer> STAT_LAYER = ExileRegistryType.register(SlashRef.MODID, "stat_layer", 0, StatLayer.SERIALIZER, SyncTime.ON_LOGIN);
 
-    public static ExileRegistryType STAT = ExileRegistryType.register(SlashRef.MODID, "stat", 1, BaseDatapackStat.MAIN_SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType GEAR_SLOT = ExileRegistryType.register(SlashRef.MODID, "gear_slot", 3, GearSlot.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType EXILE_EFFECT = ExileRegistryType.register(SlashRef.MODID, "exile_effect", 3, ExileEffect.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType GEAR_TYPE = ExileRegistryType.register(SlashRef.MODID, "base_gear_types", 4, BaseGearType.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType GEM = ExileRegistryType.register(SlashRef.MODID, "gems", 6, Gem.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType RUNE = ExileRegistryType.register(SlashRef.MODID, "runes", 7, Rune.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType MOB_AFFIX = ExileRegistryType.register(SlashRef.MODID, "mob_affix", 8, new MobAffix("empty", "empty", ChatFormatting.AQUA, Affix.AffixSlot.prefix), SyncTime.ON_LOGIN);
-    public static ExileRegistryType AFFIX = ExileRegistryType.register(SlashRef.MODID, "affixes", 10, AffixSerializer.getInstance(), SyncTime.ON_LOGIN);
-    public static ExileRegistryType UNIQUE_GEAR = ExileRegistryType.register(SlashRef.MODID, "unique_gears", 11, UniqueGear.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType RUNEWORDS = ExileRegistryType.register(SlashRef.MODID, "runeword", 12, RuneWord.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType DIMENSION_CONFIGS = ExileRegistryType.register(SlashRef.MODID, "dimension", 13, DimensionConfig.EMPTY, SyncTime.ON_LOGIN);
-    public static ExileRegistryType ENTITY_CONFIGS = ExileRegistryType.register(SlashRef.MODID, "entity", 14, Serializers.ENTITY_CONFIG_SER, SyncTime.NEVER);
-    public static ExileRegistryType SPELL = ExileRegistryType.register(SlashRef.MODID, "spells", 17, Spell.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType PERK = ExileRegistryType.register(SlashRef.MODID, "perk", 18, Perk.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType TALENT_TREE = ExileRegistryType.register(SlashRef.MODID, "talent_tree", 19, TalentTree.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType BASE_STATS = ExileRegistryType.register(SlashRef.MODID, "base_stats", 22, BaseStatsConfig.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType VALUE_CALC = ExileRegistryType.register(SlashRef.MODID, "value_calc", 40, ValueCalculation.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType STAT_EFFECT = ExileRegistryType.register(SlashRef.MODID, "stat_effect", 32, StatEffect.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType STAT_CONDITION = ExileRegistryType.register(SlashRef.MODID, "stat_condition", 32, StatCondition.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType GAME_BALANCE = ExileRegistryType.register(SlashRef.MODID, "game_balance", 26, GameBalanceConfig.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType SPELL_SCHOOL = ExileRegistryType.register(SlashRef.MODID, "spell_school", 26, SpellSchool.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType AILMENT = ExileRegistryType.register(SlashRef.MODID, "ailment", 27, null, SyncTime.NEVER);
-    public static ExileRegistryType AURA = ExileRegistryType.register(SlashRef.MODID, "aura", 28, AuraGem.SERIALIZER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType SUPPORT_GEM = ExileRegistryType.register(SlashRef.MODID, "support_gem", 29, SupportGem.SER, SyncTime.ON_LOGIN);
-    public static ExileRegistryType MAP_AFFIX = ExileRegistryType.register(SlashRef.MODID, "map_affix", 30, MapAffix.SER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<Stat> STAT = ExileRegistryType.register(SlashRef.MODID, "stat", 1, BaseDatapackStat.MAIN_SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<GearSlot> GEAR_SLOT = ExileRegistryType.register(SlashRef.MODID, "gear_slot", 3, GearSlot.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<ExileEffect> EXILE_EFFECT = ExileRegistryType.register(SlashRef.MODID, "exile_effect", 3, ExileEffect.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<BaseGearType> GEAR_TYPE = ExileRegistryType.register(SlashRef.MODID, "base_gear_types", 4, BaseGearType.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<Gem> GEM = ExileRegistryType.register(SlashRef.MODID, "gems", 6, Gem.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<Rune> RUNE = ExileRegistryType.register(SlashRef.MODID, "runes", 7, Rune.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<MobAffix> MOB_AFFIX = ExileRegistryType.register(SlashRef.MODID, "mob_affix", 8, new MobAffix("empty", "empty", ChatFormatting.AQUA, Affix.AffixSlot.prefix), SyncTime.ON_LOGIN);
+    public static ExileRegistryType<Affix> AFFIX = ExileRegistryType.register(SlashRef.MODID, "affixes", 10, AffixSerializer.getInstance(), SyncTime.ON_LOGIN);
+    public static ExileRegistryType<UniqueGear> UNIQUE_GEAR = ExileRegistryType.register(SlashRef.MODID, "unique_gears", 11, UniqueGear.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<RuneWord> RUNEWORDS = ExileRegistryType.register(SlashRef.MODID, "runeword", 12, RuneWord.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<DimensionConfig> DIMENSION_CONFIGS = ExileRegistryType.register(SlashRef.MODID, "dimension", 13, DimensionConfig.EMPTY, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<EntityConfig> ENTITY_CONFIGS = ExileRegistryType.register(SlashRef.MODID, "entity", 14, Serializers.ENTITY_CONFIG_SER, SyncTime.NEVER);
+    public static ExileRegistryType<Spell> SPELL = ExileRegistryType.register(SlashRef.MODID, "spells", 17, Spell.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<Perk> PERK = ExileRegistryType.register(SlashRef.MODID, "perk", 18, Perk.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<TalentTree> TALENT_TREE = ExileRegistryType.register(SlashRef.MODID, "talent_tree", 19, TalentTree.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<BaseStatsConfig> BASE_STATS = ExileRegistryType.register(SlashRef.MODID, "base_stats", 22, BaseStatsConfig.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<ValueCalculation> VALUE_CALC = ExileRegistryType.register(SlashRef.MODID, "value_calc", 40, ValueCalculation.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<StatEffect> STAT_EFFECT = ExileRegistryType.register(SlashRef.MODID, "stat_effect", 32, StatEffect.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<StatCondition> STAT_CONDITION = ExileRegistryType.register(SlashRef.MODID, "stat_condition", 32, StatCondition.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<GameBalanceConfig> GAME_BALANCE = ExileRegistryType.register(SlashRef.MODID, "game_balance", 26, GameBalanceConfig.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<SpellSchool> SPELL_SCHOOL = ExileRegistryType.register(SlashRef.MODID, "spell_school", 26, SpellSchool.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<Ailment> AILMENT = ExileRegistryType.register(SlashRef.MODID, "ailment", 27, null, SyncTime.NEVER);
+    public static ExileRegistryType<AuraGem> AURA = ExileRegistryType.register(SlashRef.MODID, "aura", 28, AuraGem.SERIALIZER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<SupportGem> SUPPORT_GEM = ExileRegistryType.register(SlashRef.MODID, "support_gem", 29, SupportGem.SER, SyncTime.ON_LOGIN);
+    public static ExileRegistryType<MapAffix> MAP_AFFIX = ExileRegistryType.register(SlashRef.MODID, "map_affix", 30, MapAffix.SER, SyncTime.ON_LOGIN);
 
 
     public static ExileRegistryType LOOT_CHEST = ExileRegistryType.register(new ExileRegistryType(SlashRef.MODID, "loot_chest", 33, null, SyncTime.NEVER) {
diff --git a/src/main/java/com/robertx22/mine_and_slash/saveclasses/gearitem/gear_bases/Rarity.java b/src/main/java/com/robertx22/mine_and_slash/saveclasses/gearitem/gear_bases/Rarity.java
index d3d213de8..58f78f955 100644
--- a/src/main/java/com/robertx22/mine_and_slash/saveclasses/gearitem/gear_bases/Rarity.java
+++ b/src/main/java/com/robertx22/mine_and_slash/saveclasses/gearitem/gear_bases/Rarity.java
@@ -5,7 +5,7 @@
 import com.robertx22.library_of_exile.registry.JsonExileRegistry;
 import net.minecraft.ChatFormatting;
 
-public interface Rarity extends IWeighted, IAutoLocName, JsonExileRegistry<Rarity> {
+public interface Rarity<Self extends Rarity<Self>> extends IWeighted, IAutoLocName, JsonExileRegistry<Self> {
 
     String GUID();