diff --git a/api/src/main/kotlin/us/teaminceptus/plasmaenchants/api/PlasmaConfig.kt b/api/src/main/kotlin/us/teaminceptus/plasmaenchants/api/PlasmaConfig.kt
index 34f04bb..0c95586 100644
--- a/api/src/main/kotlin/us/teaminceptus/plasmaenchants/api/PlasmaConfig.kt
+++ b/api/src/main/kotlin/us/teaminceptus/plasmaenchants/api/PlasmaConfig.kt
@@ -284,7 +284,7 @@ interface PlasmaConfig {
          * Fetches a list of mobs that should not drop naturally occuring enchantments.
          * @return List of Mobs
          */
-        get() = "enchantments.spawn.drops.blacklisted-mobs"[configuration, List::class.java, listOf<String>()].mapNotNull { type -> EntityType.values().first { it.name == type.toString().uppercase() } }
+        get() = "enchantments.spawn.drops.blacklisted-mobs"[configuration, List::class.java, listOf<String>()].mapNotNull { type -> EntityType.entries.first { it.name == type.toString().uppercase() } }
         /**
          * Sets the list of mobs that should not drop naturally occuring enchantments.
          * @param value List of Mobs
@@ -296,7 +296,7 @@ interface PlasmaConfig {
          * Fetches a list of mobs that should only drop naturally occuring enchantments.
          * @return List of Mobs
          */
-        get() = "enchantments.spawn.drops.whitelisted-mobs"[configuration, List::class.java, listOf<String>()].mapNotNull { type -> EntityType.values().first { it.name == type.toString().uppercase() } }
+        get() = "enchantments.spawn.drops.whitelisted-mobs"[configuration, List::class.java, listOf<String>()].mapNotNull { type -> EntityType.entries.first { it.name == type.toString().uppercase() } }
         /**
          * Sets the list of mobs that should only drop naturally occuring enchantments.
          * @param value List of Mobs
@@ -372,7 +372,7 @@ interface PlasmaConfig {
          * Fetches an immutable copy of list of loot tables that should not include naturally spawned enchantments.
          * @return List of Blacklisted Loot Tables
          */
-        get() = "enchantments.spawn.loot.blacklisted-loottables"[configuration, List::class.java, listOf<String>()].mapNotNull { table -> LootTables.values().first { it.name == table.toString().uppercase() } }
+        get() = "enchantments.spawn.loot.blacklisted-loottables"[configuration, List::class.java, listOf<String>()].mapNotNull { table -> LootTables.entries.first { it.name == table.toString().uppercase() } }
         /**
          * Sets the list of loot tables that should not include naturally spawned enchantments.
          * @param value List of Blacklisted Loot Tables
@@ -384,7 +384,7 @@ interface PlasmaConfig {
          * Fetches an immutable copy of list of loot tables that should only include naturally spawned enchantments.
          * @return List of Whitelisted Loot Tables
          */
-        get() = "enchantments.spawn.loot.whitelisted-loottables"[configuration, List::class.java, listOf<String>()].mapNotNull { table -> LootTables.values().first { it.name == table.toString().uppercase() } }
+        get() = "enchantments.spawn.loot.whitelisted-loottables"[configuration, List::class.java, listOf<String>()].mapNotNull { table -> LootTables.entries.first { it.name == table.toString().uppercase() } }
         /**
          * Sets the list of loot tables that should only include naturally spawned enchantments.
          * @param value List of Whitelisted Loot Tables
@@ -1091,7 +1091,7 @@ interface PlasmaConfig {
          * Fetches the list of professions that can trade artifacts.
          * @return List of Villager Professions
          */
-        get() = "artifacts.trades.professions"[configuration, List::class.java, listOf<String>()].mapNotNull { profession -> Villager.Profession.values().firstOrNull { it.name.equals(profession.toString(), ignoreCase = true) } }
+        get() = "artifacts.trades.professions"[configuration, List::class.java, listOf<String>()].mapNotNull { profession -> Villager.Profession.entries.firstOrNull { it.name.equals(profession.toString(), ignoreCase = true) } }
         /**
          * Sets the list of professions that can trade artifacts.
          * @param value List of Villager Professions
@@ -1115,7 +1115,7 @@ interface PlasmaConfig {
          * Fetches the list of professions that can trade crafted artifacts.
          * @return List of Villager Professions
          */
-        get() = "artifacts.trades.craftable-artifacts.professions"[configuration, List::class.java, listOf<String>()].mapNotNull { profession -> Villager.Profession.values().firstOrNull { it.name.equals(profession.toString(), ignoreCase = true) } }.ifEmpty { artifactTradesProfessions }
+        get() = "artifacts.trades.craftable-artifacts.professions"[configuration, List::class.java, listOf<String>()].mapNotNull { profession -> Villager.Profession.entries.firstOrNull { it.name.equals(profession.toString(), ignoreCase = true) } }.ifEmpty { artifactTradesProfessions }
         /**
          * Sets the list of professions that can trade crafted artifacts.
          * @param value List of Villager Professions
diff --git a/api/src/main/kotlin/us/teaminceptus/plasmaenchants/api/config/configUtil.kt b/api/src/main/kotlin/us/teaminceptus/plasmaenchants/api/config/configUtil.kt
index 0d1cfc2..06f2cca 100644
--- a/api/src/main/kotlin/us/teaminceptus/plasmaenchants/api/config/configUtil.kt
+++ b/api/src/main/kotlin/us/teaminceptus/plasmaenchants/api/config/configUtil.kt
@@ -31,12 +31,12 @@ internal val CONFIG_MAP = ImmutableMap.builder<String, ConfigData>()
 
     .putSection("enchantments.spawn.drops")
     .put("enchantments.spawn.drops.blacklisted-mobs", FileConfiguration::isList, listOf<String>(),
-        { value -> EntityType.values().map { it.name.lowercase() }.containsAll(value.map { it.lowercase() }) },
-        { old -> old.filter { type -> EntityType.values().map { it.name.lowercase() }.contains(type.lowercase()) } }
+        { value -> EntityType.entries.map { it.name.lowercase() }.containsAll(value.map { it.lowercase() }) },
+        { old -> old.filter { type -> EntityType.entries.map { it.name.lowercase() }.contains(type.lowercase()) } }
     )
     .put("enchantments.spawn.drops.whitelisted-mobs", FileConfiguration::isList, listOf<String>(),
-        { value -> EntityType.values().map { it.name.lowercase() }.containsAll(value.map { it.lowercase() }) },
-        { old -> old.filter { type -> EntityType.values().map { it.name.lowercase() }.contains(type.lowercase()) } }
+        { value -> EntityType.entries.map { it.name.lowercase() }.containsAll(value.map { it.lowercase() }) },
+        { old -> old.filter { type -> EntityType.entries.map { it.name.lowercase() }.contains(type.lowercase()) } }
     )
     .put("enchantments.spawn.drops.min-level", FileConfiguration::isSet, "default",
         { value -> value.isChildLevel() }
@@ -49,7 +49,7 @@ internal val CONFIG_MAP = ImmutableMap.builder<String, ConfigData>()
     .put("enchantments.spawn.drops.chance.global", isNumber, 0.007)
     .put("enchantments.spawn.drops.chance.looting-modifier", isNumber, 0.01)
     .put("enchantments.spawn.drops.chance.config", FileConfiguration::isList, listOf<Map<String, Any>>(),
-        { value -> value.all { map -> map.keyNotNull("bukkit") { enchant -> Enchantment.values().map { it.key.key.lowercase() }.contains(enchant.toString().lowercase()) } &&
+        { value -> value.all { map -> map.keyNotNull("bukkit") { enchant -> Enchantment.entries.map { it.key.key.lowercase() }.contains(enchant.toString().lowercase()) } &&
                 map.keyNotNull("plasma") { it.isEnchantment() } &&
                 map.keyNotNull("min-bukkit-level") { it.isChildLevel() } &&
                 map.keyNotNull("max-bukkit-level") { it.isChildLevel() } && map.keyNotNull("min-plasma-level") { it.isChildLevel() } &&
@@ -59,11 +59,11 @@ internal val CONFIG_MAP = ImmutableMap.builder<String, ConfigData>()
 
     .putSection("enchantments.spawn.loot")
     .put("enchantments.spawn.loot.blacklisted-loottables", FileConfiguration::isList, listOf<String>(),
-        { value -> LootTables.values().map { it.name.lowercase() }.containsAll(value.map { it.lowercase() }) })
-    { old -> old.filter { type -> LootTables.values().map { it.name.lowercase() }.contains(type.lowercase()) } }
+        { value -> LootTables.entries.map { it.name.lowercase() }.containsAll(value.map { it.lowercase() }) })
+    { old -> old.filter { type -> LootTables.entries.map { it.name.lowercase() }.contains(type.lowercase()) } }
     .put("enchantments.spawn.loot.whitelisted-loottables", FileConfiguration::isList, listOf<String>(),
-        { value -> EntityType.values().map { it.name.lowercase() }.containsAll(value.map { it.lowercase() }) },
-        { old -> old.filter { type -> EntityType.values().map { it.name.lowercase() }.contains(type.lowercase()) } }
+        { value -> EntityType.entries.map { it.name.lowercase() }.containsAll(value.map { it.lowercase() }) },
+        { old -> old.filter { type -> EntityType.entries.map { it.name.lowercase() }.contains(type.lowercase()) } }
     )
     .put("enchantments.spawn.loot.min-level", FileConfiguration::isSet, "default",
         { value -> value.isChildLevel() }
@@ -74,7 +74,7 @@ internal val CONFIG_MAP = ImmutableMap.builder<String, ConfigData>()
     .putSection("enchantments.spawn.loot.chance")
     .put("enchantments.spawn.loot.chance.global", isNumber, 0.3)
     .put("enchantments.spawn.loot.chance.config", FileConfiguration::isList, listOf<Map<String, Any>>(),
-        { value -> value.all { map -> map.keyNotNull("table") { table -> LootTables.values().map { it.name }.contains(table.toString().uppercase())}
+        { value -> value.all { map -> map.keyNotNull("table") { table -> LootTables.entries.map { it.name }.contains(table.toString().uppercase())}
             map.keyNotNull("chance") { it.isNumber() } &&
                     map.keyNotNull("min-level") { it.isChildLevel() } &&
                     map.keyNotNull("max-level") { it.isChildLevel() } &&
@@ -130,16 +130,16 @@ internal val CONFIG_MAP = ImmutableMap.builder<String, ConfigData>()
     .putSection("enchantments.trades")
     .put("enchantments.trades.include-wandering-traders", FileConfiguration::isBoolean, true)
     .put("enchantments.trades.professions", FileConfiguration::isList, listOf<String>(),
-        { value -> value.all { profession -> Villager.Profession.values().map { it.name.lowercase() }.contains(profession.lowercase()) } },
-        { old -> old.filter { profession -> Villager.Profession.values().map { it.name.lowercase() }.contains(profession.lowercase()) } }
+        { value -> value.all { profession -> Villager.Profession.entries.map { it.name.lowercase() }.contains(profession.lowercase()) } },
+        { old -> old.filter { profession -> Villager.Profession.entries.map { it.name.lowercase() }.contains(profession.lowercase()) } }
     )
     .put("enchantments.trades.blacklisted-types", FileConfiguration::isList, listOf<String>(),
-        { value -> value.all { type -> Villager.Type.values().map { it.name.lowercase() }.contains(type.lowercase()) } },
-        { old -> old.filter { type -> Villager.Type.values().map { it.name.lowercase() }.contains(type.lowercase()) } }
+        { value -> value.all { type -> Villager.Type.entries.map { it.name.lowercase() }.contains(type.lowercase()) } },
+        { old -> old.filter { type -> Villager.Type.entries.map { it.name.lowercase() }.contains(type.lowercase()) } }
     )
     .put("enchantments.trades.whitelisted-types", FileConfiguration::isList, listOf<String>(),
-        { value -> value.all { type -> Villager.Type.values().map { it.name.lowercase() }.contains(type.lowercase()) } },
-        { old -> old.filter { type -> Villager.Type.values().map { it.name.lowercase() }.contains(type.lowercase()) } }
+        { value -> value.all { type -> Villager.Type.entries.map { it.name.lowercase() }.contains(type.lowercase()) } },
+        { old -> old.filter { type -> Villager.Type.entries.map { it.name.lowercase() }.contains(type.lowercase()) } }
     )
     .put("enchantments.trades.min-villager-level", FileConfiguration::isInt, 1)
     .put("enchantments.trades.max-villager-level", FileConfiguration::isInt, 5)
@@ -180,7 +180,7 @@ internal val CONFIG_MAP = ImmutableMap.builder<String, ConfigData>()
     .put("enchantments.trades.enchants.replace.only-enchantment-books", FileConfiguration::isBoolean, false)
     .put("enchantments.trades.enchants.replace.chance", isNumber, 0.25)
     .put("enchantments.trades.enchants.replace.config", FileConfiguration::isSet, listOf<Map<String, Any>>(),
-        { value -> value.all { map -> map.keyNotNull("bukkit") { enchant -> Enchantment.values().map { it.key.key.lowercase() }.contains(enchant.toString().lowercase()) } &&
+        { value -> value.all { map -> map.keyNotNull("bukkit") { enchant -> Enchantment.entries.map { it.key.key.lowercase() }.contains(enchant.toString().lowercase()) } &&
                 map.keyNotNull("plasma") { it.isEnchantment() } &&
                 map.keyNotNull("min-bukkit-level") { it.isChildLevel() } &&
                 map.keyNotNull("max-bukkit-level") { it.isChildLevel() } && map.keyNotNull("min-plasma-level") { it.isChildLevel() } &&
@@ -216,8 +216,8 @@ internal val CONFIG_MAP = ImmutableMap.builder<String, ConfigData>()
     .putSection("artifacts.trades")
     .put("artifacts.trades.include-wandering-traders", FileConfiguration::isBoolean, true)
     .put("artifacts.trades.professions", FileConfiguration::isList, listOf<String>(),
-        { value -> value.all { profession -> Villager.Profession.values().map { it.name.lowercase() }.contains(profession.lowercase()) } },
-        { old -> old.filter { profession -> Villager.Profession.values().map { it.name.lowercase() }.contains(profession.lowercase()) } }
+        { value -> value.all { profession -> Villager.Profession.entries.map { it.name.lowercase() }.contains(profession.lowercase()) } },
+        { old -> old.filter { profession -> Villager.Profession.entries.map { it.name.lowercase() }.contains(profession.lowercase()) } }
     )
     .put("artifacts.trades.min-villager-level", FileConfiguration::isInt, 1)
     .put("artifacts.trades.max-villager-level", FileConfiguration::isInt, 5)
@@ -231,8 +231,8 @@ internal val CONFIG_MAP = ImmutableMap.builder<String, ConfigData>()
     .putSection("artifacts.trades.craftable-artifacts")
     .put("artifacts.trades.craftable-artifacts.enabled", FileConfiguration::isBoolean, true)
     .put("artifacts.trades.craftable-artifacts.professions", FileConfiguration::isList, listOf<String>(),
-        { value -> value.all { profession -> Villager.Profession.values().map { it.name.lowercase() }.contains(profession.lowercase()) } },
-        { old -> old.filter { profession -> Villager.Profession.values().map { it.name.lowercase() }.contains(profession.lowercase()) } }
+        { value -> value.all { profession -> Villager.Profession.entries.map { it.name.lowercase() }.contains(profession.lowercase()) } },
+        { old -> old.filter { profession -> Villager.Profession.entries.map { it.name.lowercase() }.contains(profession.lowercase()) } }
     )
     .put("artifacts.trades.craftable-artifacts.blacklisted-artifacts", FileConfiguration::isList, listOf<String>(),
         { value -> value.all { it.isArtifact() } },
diff --git a/plugin/src/main/kotlin/us/teaminceptus/plasmaenchants/PlasmaEnchants.kt b/plugin/src/main/kotlin/us/teaminceptus/plasmaenchants/PlasmaEnchants.kt
index ba2c455..306711a 100644
--- a/plugin/src/main/kotlin/us/teaminceptus/plasmaenchants/PlasmaEnchants.kt
+++ b/plugin/src/main/kotlin/us/teaminceptus/plasmaenchants/PlasmaEnchants.kt
@@ -115,8 +115,8 @@ class PlasmaEnchants : JavaPlugin(), PlasmaConfig, PlasmaRegistry {
     }
 
     private fun loadClasses() {
-        PEnchantments.values().forEach(::register)
-        PArtifacts.values().forEach(::register)
+        PEnchantments.entries.forEach(::register)
+        PArtifacts.entries.forEach(::register)
         registerVersionClasses()
 
         logger.info("Loaded ${artifacts.size} Artifacts")
diff --git a/plugin/src/main/kotlin/us/teaminceptus/plasmaenchants/events/SpawnEvents.kt b/plugin/src/main/kotlin/us/teaminceptus/plasmaenchants/events/SpawnEvents.kt
index 42670f2..c00d891 100644
--- a/plugin/src/main/kotlin/us/teaminceptus/plasmaenchants/events/SpawnEvents.kt
+++ b/plugin/src/main/kotlin/us/teaminceptus/plasmaenchants/events/SpawnEvents.kt
@@ -228,7 +228,7 @@ class SpawnEvents(private val plugin: PlasmaEnchants) : Listener {
 
         if (lootable.lootTable == null) return
         val tableI = lootable.lootTable!!
-        val table = LootTables.values().firstOrNull { it.key == tableI.key } ?: return
+        val table = LootTables.entries.firstOrNull { it.key == tableI.key } ?: return
 
         val artifactChance = plugin.artifactSpawnGlobalLootChance + (luckAmp * plugin.artifactSpawnLuckModifier)
         if (r.nextDouble() < artifactChance)
diff --git a/version/1_15/src/main/kotlin/us/teaminceptus/plasmaenchants/v1_15/PEnchantments1_15.kt b/version/1_15/src/main/kotlin/us/teaminceptus/plasmaenchants/v1_15/PEnchantments1_15.kt
index 88becb7..c1c8629 100644
--- a/version/1_15/src/main/kotlin/us/teaminceptus/plasmaenchants/v1_15/PEnchantments1_15.kt
+++ b/version/1_15/src/main/kotlin/us/teaminceptus/plasmaenchants/v1_15/PEnchantments1_15.kt
@@ -52,7 +52,7 @@ enum class PEnchantments1_15(
         get() = info.type
 
     override val conflicts
-        get() = PEnchantments.values().filter { conflictsP.test(it) }.toList()
+        get() = PEnchantments.entries.filter { conflictsP.test(it) }.toList()
 
     override fun accept(e: Event, level: Int) = info.action(e, level)
 
diff --git a/version/1_16/src/main/kotlin/us/teaminceptus/plasmaenchants/v1_16/PEnchantments1_16.kt b/version/1_16/src/main/kotlin/us/teaminceptus/plasmaenchants/v1_16/PEnchantments1_16.kt
index 8b7d39c..abbc83f 100644
--- a/version/1_16/src/main/kotlin/us/teaminceptus/plasmaenchants/v1_16/PEnchantments1_16.kt
+++ b/version/1_16/src/main/kotlin/us/teaminceptus/plasmaenchants/v1_16/PEnchantments1_16.kt
@@ -53,7 +53,7 @@ enum class PEnchantments1_16(
         get() = info.type
 
     override val conflicts
-        get() = PEnchantments.values().filter { conflictsP.test(it) }.toList()
+        get() = PEnchantments.entries.filter { conflictsP.test(it) }.toList()
 
     override fun accept(e: Event, level: Int) = info.action(e, level)
 
diff --git a/version/1_17/src/main/kotlin/us/teaminceptus/plasmaenchants/v1_17/PEnchantments1_17.kt b/version/1_17/src/main/kotlin/us/teaminceptus/plasmaenchants/v1_17/PEnchantments1_17.kt
index 1d0cdb5..cea1521 100644
--- a/version/1_17/src/main/kotlin/us/teaminceptus/plasmaenchants/v1_17/PEnchantments1_17.kt
+++ b/version/1_17/src/main/kotlin/us/teaminceptus/plasmaenchants/v1_17/PEnchantments1_17.kt
@@ -61,7 +61,7 @@ enum class PEnchantments1_17(
         get() = info.type
 
     override val conflicts
-        get() = PEnchantments.values().filter { conflictsP.test(it) }.toList()
+        get() = PEnchantments.entries.filter { conflictsP.test(it) }.toList()
 
     override fun accept(e: Event, level: Int) = info.action(e, level)