diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/flowering_zap_leaves.json b/src/main/resources/data/unicopia/loot_tables/blocks/flowering_zap_leaves.json
index fca666d6..6e55a32c 100644
--- a/src/main/resources/data/unicopia/loot_tables/blocks/flowering_zap_leaves.json
+++ b/src/main/resources/data/unicopia/loot_tables/blocks/flowering_zap_leaves.json
@@ -11,7 +11,7 @@
               "type": "minecraft:item",
               "conditions": [
                 {
-                  "condition": "minecraft:alternative",
+                  "condition": "minecraft:any_of",
                   "terms": [
                     {
                       "condition": "minecraft:match_tool",
@@ -50,7 +50,7 @@
         {
           "condition": "minecraft:inverted",
           "term": {
-            "condition": "minecraft:alternative",
+            "condition": "minecraft:any_of",
             "terms": [
               {
                 "condition": "minecraft:match_tool",
diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/green_apple_leaves.json b/src/main/resources/data/unicopia/loot_tables/blocks/green_apple_leaves.json
index 01dc262b..f31c928e 100644
--- a/src/main/resources/data/unicopia/loot_tables/blocks/green_apple_leaves.json
+++ b/src/main/resources/data/unicopia/loot_tables/blocks/green_apple_leaves.json
@@ -11,7 +11,7 @@
               "type": "minecraft:item",
               "conditions": [
                 {
-                  "condition": "minecraft:alternative",
+                  "condition": "minecraft:any_of",
                   "terms": [
                     {
                       "condition": "minecraft:match_tool",
@@ -50,7 +50,7 @@
         {
           "condition": "minecraft:inverted",
           "term": {
-            "condition": "minecraft:alternative",
+            "condition": "minecraft:any_of",
             "terms": [
               {
                 "condition": "minecraft:match_tool",
diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/palm_leaves.json b/src/main/resources/data/unicopia/loot_tables/blocks/palm_leaves.json
index fc7a7f84..2e12cbe2 100644
--- a/src/main/resources/data/unicopia/loot_tables/blocks/palm_leaves.json
+++ b/src/main/resources/data/unicopia/loot_tables/blocks/palm_leaves.json
@@ -11,7 +11,7 @@
               "type": "minecraft:item",
               "conditions": [
                 {
-                  "condition": "minecraft:alternative",
+                  "condition": "minecraft:any_of",
                   "terms": [
                     {
                       "condition": "minecraft:match_tool",
@@ -69,7 +69,7 @@
         {
           "condition": "minecraft:inverted",
           "term": {
-            "condition": "minecraft:alternative",
+            "condition": "minecraft:any_of",
             "terms": [
               {
                 "condition": "minecraft:match_tool",
diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/sour_apple_leaves.json b/src/main/resources/data/unicopia/loot_tables/blocks/sour_apple_leaves.json
index 08eab347..94406ba9 100644
--- a/src/main/resources/data/unicopia/loot_tables/blocks/sour_apple_leaves.json
+++ b/src/main/resources/data/unicopia/loot_tables/blocks/sour_apple_leaves.json
@@ -11,7 +11,7 @@
               "type": "minecraft:item",
               "conditions": [
                 {
-                  "condition": "minecraft:alternative",
+                  "condition": "minecraft:any_of",
                   "terms": [
                     {
                       "condition": "minecraft:match_tool",
@@ -50,7 +50,7 @@
         {
           "condition": "minecraft:inverted",
           "term": {
-            "condition": "minecraft:alternative",
+            "condition": "minecraft:any_of",
             "terms": [
               {
                 "condition": "minecraft:match_tool",
diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple_leaves.json b/src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple_leaves.json
index 551be586..cec41e60 100644
--- a/src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple_leaves.json
+++ b/src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple_leaves.json
@@ -11,7 +11,7 @@
               "type": "minecraft:item",
               "conditions": [
                 {
-                  "condition": "minecraft:alternative",
+                  "condition": "minecraft:any_of",
                   "terms": [
                     {
                       "condition": "minecraft:match_tool",
@@ -50,7 +50,7 @@
         {
           "condition": "minecraft:inverted",
           "term": {
-            "condition": "minecraft:alternative",
+            "condition": "minecraft:any_of",
             "terms": [
               {
                 "condition": "minecraft:match_tool",
diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/zap_leaves.json b/src/main/resources/data/unicopia/loot_tables/blocks/zap_leaves.json
index 4405e063..48082b36 100644
--- a/src/main/resources/data/unicopia/loot_tables/blocks/zap_leaves.json
+++ b/src/main/resources/data/unicopia/loot_tables/blocks/zap_leaves.json
@@ -11,7 +11,7 @@
               "type": "minecraft:item",
               "conditions": [
                 {
-                  "condition": "minecraft:alternative",
+                  "condition": "minecraft:any_of",
                   "terms": [
                     {
                       "condition": "minecraft:match_tool",
@@ -50,7 +50,7 @@
         {
           "condition": "minecraft:inverted",
           "term": {
-            "condition": "minecraft:alternative",
+            "condition": "minecraft:any_of",
             "terms": [
               {
                 "condition": "minecraft:match_tool",
diff --git a/src/main/resources/data/unicopia/recipes/netherite_polearm_smithing.json b/src/main/resources/data/unicopia/recipes/netherite_polearm_smithing.json
index 37635070..39fc0414 100644
--- a/src/main/resources/data/unicopia/recipes/netherite_polearm_smithing.json
+++ b/src/main/resources/data/unicopia/recipes/netherite_polearm_smithing.json
@@ -1,5 +1,5 @@
 {
-  "type": "minecraft:smithing",
+  "type": "minecraft:smithing_transform",
   "addition": {
     "item": "minecraft:netherite_ingot"
   },
@@ -8,5 +8,8 @@
   },
   "result": {
     "item": "unicopia:netherite_polearm"
+  },
+  "template": {
+    "item": "minecraft:netherite_upgrade_smithing_template"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/tags/damage_types/breaks_sunglasses.json b/src/main/resources/data/unicopia/tags/damage_type/breaks_sunglasses.json
similarity index 100%
rename from src/main/resources/data/unicopia/tags/damage_types/breaks_sunglasses.json
rename to src/main/resources/data/unicopia/tags/damage_type/breaks_sunglasses.json