diff --git a/common/src/main/resources/assets/wildernature/lang/en_us.json b/common/src/main/resources/assets/wildernature/lang/en_us.json
index 2f47c14..626165c 100644
--- a/common/src/main/resources/assets/wildernature/lang/en_us.json
+++ b/common/src/main/resources/assets/wildernature/lang/en_us.json
@@ -203,6 +203,9 @@
   "subtitles.wildernature.termite_ambient": "Termites rustle",
   "subtitles.wildernature.termite_hurt": "Termite squeaks",
   "subtitles.wildernature.termite_death": "Termite crunches",
+  "text.autoconfig.wildernature.option.BeaverMaxGroupSize": "Beaver Max Group Size:",
+  "text.autoconfig.wildernature.option.BeaverMinGroupSize": "Beaver Min Group Size:",
+  "text.autoconfig.wildernature.option.BeaverSpawnWeight": "Beaver Spawn Weight:",
   "text.autoconfig.wildernature.option.BisonMaxGroupSize": "Bison Max Group Size:",
   "text.autoconfig.wildernature.option.BisonMinGroupSize": "Bison Min Group Size:",
   "text.autoconfig.wildernature.option.BisonSpawnWeight": "Bison Spawn Weight:",
@@ -218,15 +221,30 @@
   "text.autoconfig.wildernature.option.DogMaxGroupSize": "Dog Max Group Size:",
   "text.autoconfig.wildernature.option.DogMinGroupSize": "Dog Min Group Size:",
   "text.autoconfig.wildernature.option.DogSpawnWeight": "Dog Spawn Weight:",
+  "text.autoconfig.wildernature.option.ElephantMaxGroupSize": "Elephant Max Group Size:",
+  "text.autoconfig.wildernature.option.ElephantMinGroupSize": "Elephant Min Group Size:",
+  "text.autoconfig.wildernature.option.ElephantSpawnWeight": "Elephant Spawn Weight:",
+  "text.autoconfig.wildernature.option.GiraffeMaxGroupSize": "Giraffe Max Group Size:",
+  "text.autoconfig.wildernature.option.GiraffeMinGroupSize": "Giraffe Min Group Size:",
+  "text.autoconfig.wildernature.option.GiraffeSpawnWeight": "Giraffe Spawn Weight:",
   "text.autoconfig.wildernature.option.HedgehogMaxGroupSize": "Hedgehog Max Group Size:",
   "text.autoconfig.wildernature.option.HedgehogMinGroupSize": "Hedgehog Min Group Size:",
   "text.autoconfig.wildernature.option.HedgehogSpawnWeight": "Hedgehog Spawn Weight:",
+  "text.autoconfig.wildernature.option.HippoMaxGroupSize": "Hippo Max Group Size:",
+  "text.autoconfig.wildernature.option.HippoMinGroupSize": "Hippo Min Group Size:",
+  "text.autoconfig.wildernature.option.HippoSpawnWeight": "Hippo Spawn Weight:",
+  "text.autoconfig.wildernature.option.LionMaxGroupSize": "Lion Max Group Size:",
+  "text.autoconfig.wildernature.option.LionMinGroupSize": "Lion Min Group Size:",
+  "text.autoconfig.wildernature.option.LionSpawnWeight": "Lion Spawn Weight:",
   "text.autoconfig.wildernature.option.MiniSheepMaxGroupSize": "Mini Sheep Max Group Size:",
   "text.autoconfig.wildernature.option.MiniSheepMinGroupSize": "Mini Sheep Min Group Size:",
   "text.autoconfig.wildernature.option.MiniSheepSpawnWeight": "Mini Sheep Spawn Weight:",
   "text.autoconfig.wildernature.option.RaccoonMaxGroupSize": "Raccoon Max Group Size:",
   "text.autoconfig.wildernature.option.RaccoonMinGroupSize": "Raccoon Min Group Size:",
   "text.autoconfig.wildernature.option.RaccoonSpawnWeight": "Raccoon Spawn Weight:",
+  "text.autoconfig.wildernature.option.ScorpionMaxGroupSize": "Scorpion Max Group Size:",
+  "text.autoconfig.wildernature.option.ScorpionMinGroupSize": "Scorpion Min Group Size:",
+  "text.autoconfig.wildernature.option.ScorpionSpawnWeight": "Scorpion Spawn Weight:",
   "text.autoconfig.wildernature.option.SquirrelMaxGroupSize": "Squirrel Max Group Size:",
   "text.autoconfig.wildernature.option.SquirrelMinGroupSize": "Squirrel Min Group Size:",
   "text.autoconfig.wildernature.option.SquirrelSpawnWeight": "Squirrel Spawn Weight:",
@@ -242,6 +260,8 @@
   "text.autoconfig.wildernature.option.removeSavannaAnimals": "Remove Farm Animals from Savannas:",
   "text.autoconfig.wildernature.option.removeSwampAnimals": "Remove Farm Animals from Swamps:",
   "text.autoconfig.wildernature.option.spawnHazelnutBush": "Should Hazelnut Bushes spawn:",
+  "text.autoconfig.wildernature.option.spawnHollowCache": "Should Hollow Caches spawn:",
+  "text.autoconfig.wildernature.option.spawnTermiteMound": "Should Termite Mounds spawn:",
   "text.autoconfig.wildernature.title": "WilderNature Config",
   "tooltip.wildernature.ammunition": "Damage: %d",
   "tooltip.wildernature.breedable": "Can be bred",
diff --git a/common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/common/src/main/resources/data/minecraft/tags/block/mineable/axe.json
similarity index 100%
rename from common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json
rename to common/src/main/resources/data/minecraft/tags/block/mineable/axe.json
diff --git a/common/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json b/common/src/main/resources/data/minecraft/tags/block/mineable/shovel.json
similarity index 100%
rename from common/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json
rename to common/src/main/resources/data/minecraft/tags/block/mineable/shovel.json
diff --git a/common/src/main/resources/data/wildernature/loot_table/entities/bison.json b/common/src/main/resources/data/wildernature/loot_table/entities/bison.json
index ca78c06..f0daa7a 100644
--- a/common/src/main/resources/data/wildernature/loot_table/entities/bison.json
+++ b/common/src/main/resources/data/wildernature/loot_table/entities/bison.json
@@ -49,13 +49,35 @@
             {
               "conditions": [
                 {
-                  "condition": "minecraft:entity_properties",
-                  "entity": "this",
-                  "predicate": {
-                    "flags": {
-                      "is_on_fire": true
+                  "condition": "minecraft:any_of",
+                  "terms": [
+                    {
+                      "condition": "minecraft:entity_properties",
+                      "entity": "this",
+                      "predicate": {
+                        "flags": {
+                          "is_on_fire": true
+                        }
+                      }
+                    },
+                    {
+                      "condition": "minecraft:entity_properties",
+                      "entity": "direct_attacker",
+                      "predicate": {
+                        "equipment": {
+                          "mainhand": {
+                            "predicates": {
+                              "minecraft:enchantments": [
+                                {
+                                  "enchantments": "#minecraft:smelts_loot"
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      }
                     }
-                  }
+                  ]
                 }
               ],
               "function": "minecraft:furnace_smelt"
diff --git a/common/src/main/resources/data/wildernature/loot_table/entities/cassowary.json b/common/src/main/resources/data/wildernature/loot_table/entities/cassowary.json
index 4900536..5279091 100644
--- a/common/src/main/resources/data/wildernature/loot_table/entities/cassowary.json
+++ b/common/src/main/resources/data/wildernature/loot_table/entities/cassowary.json
@@ -21,13 +21,35 @@
               "function": "minecraft:furnace_smelt",
               "conditions": [
                 {
-                  "condition": "minecraft:entity_properties",
-                  "predicate": {
-                    "flags": {
-                      "is_on_fire": true
+                  "condition": "minecraft:any_of",
+                  "terms": [
+                    {
+                      "condition": "minecraft:entity_properties",
+                      "entity": "this",
+                      "predicate": {
+                        "flags": {
+                          "is_on_fire": true
+                        }
+                      }
+                    },
+                    {
+                      "condition": "minecraft:entity_properties",
+                      "entity": "direct_attacker",
+                      "predicate": {
+                        "equipment": {
+                          "mainhand": {
+                            "predicates": {
+                              "minecraft:enchantments": [
+                                {
+                                  "enchantments": "#minecraft:smelts_loot"
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      }
                     }
-                  },
-                  "entity": "this"
+                  ]
                 }
               ]
             },
diff --git a/common/src/main/resources/data/wildernature/loot_table/entities/deer.json b/common/src/main/resources/data/wildernature/loot_table/entities/deer.json
index 4283733..0a76fcc 100644
--- a/common/src/main/resources/data/wildernature/loot_table/entities/deer.json
+++ b/common/src/main/resources/data/wildernature/loot_table/entities/deer.json
@@ -49,13 +49,35 @@
             {
               "conditions": [
                 {
-                  "condition": "minecraft:entity_properties",
-                  "entity": "this",
-                  "predicate": {
-                    "flags": {
-                      "is_on_fire": true
+                  "condition": "minecraft:any_of",
+                  "terms": [
+                    {
+                      "condition": "minecraft:entity_properties",
+                      "entity": "this",
+                      "predicate": {
+                        "flags": {
+                          "is_on_fire": true
+                        }
+                      }
+                    },
+                    {
+                      "condition": "minecraft:entity_properties",
+                      "entity": "direct_attacker",
+                      "predicate": {
+                        "equipment": {
+                          "mainhand": {
+                            "predicates": {
+                              "minecraft:enchantments": [
+                                {
+                                  "enchantments": "#minecraft:smelts_loot"
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      }
                     }
-                  }
+                  ]
                 }
               ],
               "function": "minecraft:furnace_smelt"
diff --git a/common/src/main/resources/data/wildernature/loot_table/entities/turkey.json b/common/src/main/resources/data/wildernature/loot_table/entities/turkey.json
index 0427415..a0b6ba3 100644
--- a/common/src/main/resources/data/wildernature/loot_table/entities/turkey.json
+++ b/common/src/main/resources/data/wildernature/loot_table/entities/turkey.json
@@ -49,13 +49,35 @@
             {
               "conditions": [
                 {
-                  "condition": "minecraft:entity_properties",
-                  "entity": "this",
-                  "predicate": {
-                    "flags": {
-                      "is_on_fire": true
+                  "condition": "minecraft:any_of",
+                  "terms": [
+                    {
+                      "condition": "minecraft:entity_properties",
+                      "entity": "this",
+                      "predicate": {
+                        "flags": {
+                          "is_on_fire": true
+                        }
+                      }
+                    },
+                    {
+                      "condition": "minecraft:entity_properties",
+                      "entity": "direct_attacker",
+                      "predicate": {
+                        "equipment": {
+                          "mainhand": {
+                            "predicates": {
+                              "minecraft:enchantments": [
+                                {
+                                  "enchantments": "#minecraft:smelts_loot"
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      }
                     }
-                  }
+                  ]
                 }
               ],
               "function": "minecraft:furnace_smelt"