diff --git a/mappings/diff/mapping-1.20.3to1.20.5.json b/mappings/diff/mapping-1.20.3to1.20.5.json
index 3aaa05f..70f43a6 100644
--- a/mappings/diff/mapping-1.20.3to1.20.5.json
+++ b/mappings/diff/mapping-1.20.3to1.20.5.json
@@ -1,5 +1,5 @@
 {
   "items": {
-    "scute": ""
+    "scute": "turtle_scute"
   }
 }
\ No newline at end of file
diff --git a/mappings/diff/mapping-1.20.5to1.20.3.json b/mappings/diff/mapping-1.20.5to1.20.3.json
index e3956db..70e6b01 100644
--- a/mappings/diff/mapping-1.20.5to1.20.3.json
+++ b/mappings/diff/mapping-1.20.5to1.20.3.json
@@ -1,9 +1,15 @@
 {
   "items": {
-    "turtle_scute": "",
-    "armadillo_scute": "",
-    "wolf_armor": "",
-    "armadillo_spawn_egg": ""
+    "turtle_scute": "scute",
+    "armadillo_scute": "scute",
+    "wolf_armor": "leather_horse_armor",
+    "armadillo_spawn_egg": "horse_spawn_egg"
+  },
+  "itemnames": {
+    "turtle_scute": "1.20.5 Turtle Scute",
+    "armadillo_scute": "1.20.5 Armadillo Scute",
+    "wolf_armor": "1.20.5 Wolf Armor",
+    "armadillo_spawn_egg": "1.20.5 Armadillo Spawn Egg"
   },
   "sounds": {
     "entity.armadillo.eat": "",
@@ -23,6 +29,15 @@
     "entity.breeze.whirl": ""
   },
   "entities": {
-    "armadillo": ""
+    "armadillo": "cow"
+  },
+  "entitynames": {
+    "armadillo": "Armadillo"
+  },
+  "attributes": {
+    "generic.block_interaction_range": "",
+    "generic.entity_interaction_range": "",
+    "generic.scale": "",
+    "generic.step_height": ""
   }
 }
\ No newline at end of file
diff --git a/mappings/mapping-1.20.3.json b/mappings/mapping-1.20.3.json
index abae630..d874331 100644
--- a/mappings/mapping-1.20.3.json
+++ b/mappings/mapping-1.20.3.json
@@ -30987,5 +30987,21 @@
     "smoker",
     "cartography_table",
     "stonecutter"
+  ],
+  "attributes": [
+    "generic.armor",
+    "generic.armor_toughness",
+    "generic.attack_damage",
+    "generic.attack_knockback",
+    "generic.attack_speed",
+    "generic.flying_speed",
+    "generic.follow_range",
+    "horse.jump_strength",
+    "generic.knockback_resistance",
+    "generic.luck",
+    "generic.max_absorption",
+    "generic.max_health",
+    "generic.movement_speed",
+    "zombie.spawn_reinforcements"
   ]
 }
\ No newline at end of file
diff --git a/mappings/mapping-1.20.5.json b/mappings/mapping-1.20.5.json
index f662187..569cd8c 100644
--- a/mappings/mapping-1.20.5.json
+++ b/mappings/mapping-1.20.5.json
@@ -31006,5 +31006,25 @@
     "smoker",
     "cartography_table",
     "stonecutter"
+  ],
+  "attributes": [
+    "generic.armor",
+    "generic.armor_toughness",
+    "generic.attack_damage",
+    "generic.attack_knockback",
+    "generic.attack_speed",
+    "generic.block_interaction_range",
+    "generic.entity_interaction_range",
+    "generic.flying_speed",
+    "generic.follow_range",
+    "horse.jump_strength",
+    "generic.knockback_resistance",
+    "generic.luck",
+    "generic.max_absorption",
+    "generic.max_health",
+    "generic.movement_speed",
+    "generic.scale",
+    "zombie.spawn_reinforcements",
+    "generic.step_height"
   ]
 }
\ No newline at end of file
diff --git a/output/backwards/mappings-1.20.5to1.20.3.nbt b/output/backwards/mappings-1.20.5to1.20.3.nbt
index 3b73e5c..422c61f 100644
Binary files a/output/backwards/mappings-1.20.5to1.20.3.nbt and b/output/backwards/mappings-1.20.5to1.20.3.nbt differ
diff --git a/output/mappings-1.20.3to1.20.5.nbt b/output/mappings-1.20.3to1.20.5.nbt
index 196c4b1..0cbf9fb 100644
Binary files a/output/mappings-1.20.3to1.20.5.nbt and b/output/mappings-1.20.3to1.20.5.nbt differ
diff --git a/src/main/java/com/viaversion/mappingsgenerator/ManualRunner.java b/src/main/java/com/viaversion/mappingsgenerator/ManualRunner.java
index 6dbc31b..dca5b29 100644
--- a/src/main/java/com/viaversion/mappingsgenerator/ManualRunner.java
+++ b/src/main/java/com/viaversion/mappingsgenerator/ManualRunner.java
@@ -106,6 +106,6 @@ public final class ManualRunner {
             mainClass.getDeclaredMethod("main", String[].class).invoke(null, (Object) new String[]{"--reports"});
         }
 
-        MappingsGenerator.collectMappings("1.20");
+        MappingsGenerator.collectMappings("1.20.5");
     }
 }
diff --git a/src/main/java/com/viaversion/mappingsgenerator/MappingsGenerator.java b/src/main/java/com/viaversion/mappingsgenerator/MappingsGenerator.java
index 3f4b8c3..0d033d3 100644
--- a/src/main/java/com/viaversion/mappingsgenerator/MappingsGenerator.java
+++ b/src/main/java/com/viaversion/mappingsgenerator/MappingsGenerator.java
@@ -160,6 +160,7 @@ public final class MappingsGenerator {
         addArray(viaMappings, registries, "minecraft:motive", "paintings");
         addArray(viaMappings, registries, "minecraft:painting_variant", "paintings");
         addArray(viaMappings, registries, "minecraft:menu", "menus");
+        addArray(viaMappings, registries, "minecraft:attribute", "attributes");
 
         // Save
         new File("mappings").mkdir();
diff --git a/src/main/java/com/viaversion/mappingsgenerator/MappingsOptimizer.java b/src/main/java/com/viaversion/mappingsgenerator/MappingsOptimizer.java
index 2b8f55d..43c7ef6 100644
--- a/src/main/java/com/viaversion/mappingsgenerator/MappingsOptimizer.java
+++ b/src/main/java/com/viaversion/mappingsgenerator/MappingsOptimizer.java
@@ -63,7 +63,22 @@ public final class MappingsOptimizer {
     public static final String OUTPUT_IDENTIFIERS_FILE_FORMAT = "identifiers-%s.nbt";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MappingsOptimizer.class.getSimpleName());
-    private static final Set<String> STANDARD_FIELDS = Set.of("blockstates", "blocks", "items", "menus", "sounds", "blockentities", "enchantments", "paintings", "entities", "particles", "argumenttypes", "statistics", "tags");
+    private static final Set<String> STANDARD_FIELDS = Set.of(
+            "blockstates",
+            "blocks",
+            "items",
+            "menus",
+            "sounds",
+            "blockentities",
+            "enchantments",
+            "paintings",
+            "entities",
+            "particles",
+            "argumenttypes",
+            "statistics",
+            "tags",
+            "attributes"
+    );
     private static final Set<String> SAVED_IDENTIFIER_FILES = new HashSet<>();
 
     private final Set<String> ignoreMissing = new HashSet<>(Arrays.asList("blocks", "statistics"));
@@ -146,6 +161,7 @@ public final class MappingsOptimizer {
         mappings(false, "argumenttypes");
         mappings(false, "statistics");
         mappings(false, "menus");
+        mappings(false, "attributes");
 
         if (diffObject != null) {
             names("items", "itemnames");