diff --git a/README.md b/README.md
index 13bf18ab..cc2d9bf5 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ Check out **[images section](#images)** down below.
 
 ## Installation
 
-Paper **1.19.4** - **1.21** with **Java 21** (or higher) is required. Plugin should also work on **Paper** forks.
+Paper **1.19.4** - **1.21.1** with **Java 21** (or higher) is required. Plugin should also work on **Paper** forks.
 
 **Spigot** is **not** supported.
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 291ba5c3..2f0255dd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,6 +15,9 @@ plugins {
 
 runPaper.folia.registerTask()
 
+val supportedVersions =
+    listOf("1.19.4", "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21", "1.21.1")
+
 allprojects {
     group = "de.oliver"
     val buildId = System.getenv("BUILD_ID")
@@ -34,7 +37,7 @@ dependencies {
     compileOnly("io.papermc.paper:paper-api:${findProperty("minecraftVersion")}-R0.1-SNAPSHOT")
 
     implementation(project(":api"))
-    implementation(project(":implementation_1_21"))
+    implementation(project(":implementation_1_21_1"))
     implementation(project(":implementation_1_20_6"))
     implementation(project(":implementation_1_20_4", configuration = "reobf"))
     implementation(project(":implementation_1_20_2", configuration = "reobf"))
@@ -83,9 +86,10 @@ tasks {
 //        minecraftVersion("1.20.6")
 
         downloadPlugins {
-            hangar("ViaVersion", "5.0.2")
-            hangar("ViaBackwards", "5.0.2")
-//            hangar("PlaceholderAPI", "2.11.5")
+            hangar("ViaVersion", "5.0.3")
+            hangar("ViaBackwards", "5.0.3")
+            hangar("PlaceholderAPI", "2.11.6")
+            modrinth("multiverse-core", "4.3.11")
         }
     }
 
@@ -196,8 +200,7 @@ hangarPublish {
         platforms {
             paper {
                 jar = tasks.shadowJar.flatMap { it.archiveFile }
-                platformVersions =
-                    listOf("1.19.4", "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21")
+                platformVersions.set(supportedVersions)
             }
         }
     }
@@ -209,6 +212,6 @@ modrinth {
     versionNumber.set(project.version.toString())
     versionType.set("alpha")
     uploadFile.set(file("build/libs/${project.name}-${project.version}.jar"))
-    gameVersions.addAll(listOf("1.19.4", "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21"))
+    gameVersions.addAll(supportedVersions)
     loaders.add("paper")
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index e32782a7..5ef8268b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-minecraftVersion=1.21
+minecraftVersion=1.21.1
 fancyLibVersion=1.0.31
 fancyAnalyticsVersion=0.0.7
 plotsquaredVersion=7.2.0
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/MappingKeys1_21.java b/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/MappingKeys1_21.java
deleted file mode 100644
index c7338b3d..00000000
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/MappingKeys1_21.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package de.oliver.fancynpcs.v1_21;
-
-public enum MappingKeys1_21 {
-
-    ENTITY_TYPE__FACTORY("factory"),
-    SYNCHED_ENTITY_DATA__ITEMS_BY_ID("itemsById"),
-    CLIENTBOUND_TELEPORT_ENTITY_PACKET__X("x"),
-    CLIENTBOUND_TELEPORT_ENTITY_PACKET__Y("y"),
-    CLIENTBOUND_TELEPORT_ENTITY_PACKET__Z("z"),
-    PANDA__DATA_ID_FLAGS("DATA_ID_FLAGS"),
-    ;
-
-    private final String mapping;
-
-    MappingKeys1_21(String mapping) {
-        this.mapping = mapping;
-    }
-
-    public String getMapping() {
-        return mapping;
-    }
-}
diff --git a/implementation_1_21/build.gradle.kts b/implementation_1_21_1/build.gradle.kts
similarity index 95%
rename from implementation_1_21/build.gradle.kts
rename to implementation_1_21_1/build.gradle.kts
index cd27e17a..a26ddec6 100644
--- a/implementation_1_21/build.gradle.kts
+++ b/implementation_1_21_1/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("io.papermc.paperweight.userdev") version "1.7.1"
 }
 
-val minecraftVersion = "1.21"
+val minecraftVersion = "1.21.1"
 
 paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/Npc_1_21.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/Npc_1_21_1.java
similarity index 95%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/Npc_1_21.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/Npc_1_21_1.java
index b71a98b4..c1137aa0 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/Npc_1_21.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/Npc_1_21_1.java
@@ -1,4 +1,4 @@
-package de.oliver.fancynpcs.v1_21;
+package de.oliver.fancynpcs.v1_21_1;
 
 import com.google.common.collect.ImmutableList;
 import com.mojang.authlib.GameProfile;
@@ -46,14 +46,14 @@
 
 import java.util.*;
 
-public class Npc_1_21 extends Npc {
+public class Npc_1_21_1 extends Npc {
 
     private final String localName;
     private final UUID uuid;
     private Entity npc;
     private Display.TextDisplay sittingVehicle;
 
-    public Npc_1_21(NpcData data) {
+    public Npc_1_21_1(NpcData data) {
         super(data);
 
         this.localName = generateLocalName();
@@ -76,7 +76,7 @@ public void create() {
             }
         } else {
             EntityType<?> nmsType = BuiltInRegistries.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(data.getType().getKey()));
-            EntityType.EntityFactory factory = (EntityType.EntityFactory) ReflectionUtils.getValue(nmsType, MappingKeys1_21.ENTITY_TYPE__FACTORY.getMapping()); // EntityType.factory
+            EntityType.EntityFactory factory = (EntityType.EntityFactory) ReflectionUtils.getValue(nmsType, "factory"); // EntityType.factory
             npc = factory.create(nmsType, serverLevel);
         }
     }
@@ -297,7 +297,7 @@ protected void refreshEntityData(Player player) {
 
         ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
 
-        SynchedEntityData.DataItem<?>[] itemsById = (SynchedEntityData.DataItem<?>[]) ReflectionUtils.getValue(npc.getEntityData(), MappingKeys1_21.SYNCHED_ENTITY_DATA__ITEMS_BY_ID.getMapping()); // itemsById
+        SynchedEntityData.DataItem<?>[] itemsById = (SynchedEntityData.DataItem<?>[]) ReflectionUtils.getValue(npc.getEntityData(), "itemsById"); // itemsById
         List<SynchedEntityData.DataValue<?>> entityData = new ArrayList<>();
         for (SynchedEntityData.DataItem<?> dataItem : itemsById) {
             entityData.add(dataItem.value());
@@ -320,9 +320,9 @@ public void move(Player player, boolean swingArm) {
         npc.setYRot(data.getLocation().getYaw());
 
         ClientboundTeleportEntityPacket teleportEntityPacket = new ClientboundTeleportEntityPacket(npc);
-        ReflectionUtils.setValue(teleportEntityPacket, MappingKeys1_21.CLIENTBOUND_TELEPORT_ENTITY_PACKET__X.getMapping(), data.getLocation().x()); // 'x'
-        ReflectionUtils.setValue(teleportEntityPacket, MappingKeys1_21.CLIENTBOUND_TELEPORT_ENTITY_PACKET__Y.getMapping(), data.getLocation().y()); // 'y'
-        ReflectionUtils.setValue(teleportEntityPacket, MappingKeys1_21.CLIENTBOUND_TELEPORT_ENTITY_PACKET__Z.getMapping(), data.getLocation().z()); // 'z'
+        ReflectionUtils.setValue(teleportEntityPacket, "x", data.getLocation().x()); // 'x'
+        ReflectionUtils.setValue(teleportEntityPacket, "y", data.getLocation().y()); // 'y'
+        ReflectionUtils.setValue(teleportEntityPacket, "z", data.getLocation().z()); // 'z'
         serverPlayer.connection.send(teleportEntityPacket);
 
         float angelMultiplier = 256f / 360f;
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/ReflectionHelper.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/ReflectionHelper.java
similarity index 88%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/ReflectionHelper.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/ReflectionHelper.java
index dd537142..8e370ee8 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/ReflectionHelper.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/ReflectionHelper.java
@@ -1,4 +1,4 @@
-package de.oliver.fancynpcs.v1_21;
+package de.oliver.fancynpcs.v1_21_1;
 
 import de.oliver.fancylib.ReflectionUtils;
 import de.oliver.fancynpcs.api.Npc;
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/AgeableMobAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/AgeableMobAttributes.java
similarity index 91%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/AgeableMobAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/AgeableMobAttributes.java
index 4a162f9a..4c2979d1 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/AgeableMobAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/AgeableMobAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.AgeableMob;
 import org.bukkit.entity.Ageable;
 import org.bukkit.entity.EntityType;
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/AllayAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/AllayAttributes.java
similarity index 89%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/AllayAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/AllayAttributes.java
index 00475082..e2c16845 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/AllayAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/AllayAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.allay.Allay;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/ArmadilloAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/ArmadilloAttributes.java
similarity index 90%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/ArmadilloAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/ArmadilloAttributes.java
index 468ef4ce..71d81651 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/ArmadilloAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/ArmadilloAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.armadillo.Armadillo;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/ArmorStandAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/ArmorStandAttributes.java
similarity index 89%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/ArmorStandAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/ArmorStandAttributes.java
index c01b3b2e..b958e94a 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/ArmorStandAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/ArmorStandAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.decoration.ArmorStand;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/Attributes_1_21.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/Attributes_1_21_1.java
similarity index 96%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/Attributes_1_21.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/Attributes_1_21_1.java
index afcc8e37..17ffa0a7 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/Attributes_1_21.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/Attributes_1_21_1.java
@@ -1,11 +1,11 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.NpcAttribute;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class Attributes_1_21 {
+public class Attributes_1_21_1 {
 
     public static List<NpcAttribute> getAllAttributes() {
         List<NpcAttribute> attributes = new ArrayList<>();
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/AxolotlAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/AxolotlAttributes.java
similarity index 93%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/AxolotlAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/AxolotlAttributes.java
index a21a96af..d822fe16 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/AxolotlAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/AxolotlAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.axolotl.Axolotl;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/BeeAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/BeeAttributes.java
similarity index 95%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/BeeAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/BeeAttributes.java
index 454274d9..36644d13 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/BeeAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/BeeAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.Bee;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/BlockDisplayAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/BlockDisplayAttributes.java
similarity index 92%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/BlockDisplayAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/BlockDisplayAttributes.java
index b122ddc6..3d459a71 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/BlockDisplayAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/BlockDisplayAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.Display;
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/CamelAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/CamelAttributes.java
similarity index 92%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/CamelAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/CamelAttributes.java
index bdbfd367..79a73489 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/CamelAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/CamelAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.camel.Camel;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/CatAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/CatAttributes.java
similarity index 94%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/CatAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/CatAttributes.java
index c4b0f689..340d8366 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/CatAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/CatAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.animal.Cat;
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/DisplayAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/DisplayAttributes.java
similarity index 91%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/DisplayAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/DisplayAttributes.java
index 52646c62..e787b51a 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/DisplayAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/DisplayAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.Display;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/EntityAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/EntityAttributes.java
similarity index 96%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/EntityAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/EntityAttributes.java
index 9d4072f1..85ba6723 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/EntityAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/EntityAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.Entity;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/FoxAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/FoxAttributes.java
similarity index 94%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/FoxAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/FoxAttributes.java
index 1440e3e5..af46cd0c 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/FoxAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/FoxAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.Fox;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/FrogAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/FrogAttributes.java
similarity index 81%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/FrogAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/FrogAttributes.java
index d9d877e0..532c5df7 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/FrogAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/FrogAttributes.java
@@ -1,13 +1,10 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
-import io.papermc.paper.registry.RegistryAccess;
-import io.papermc.paper.registry.RegistryKey;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.animal.FrogVariant;
 import net.minecraft.world.entity.animal.frog.Frog;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/GoatAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/GoatAttributes.java
similarity index 92%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/GoatAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/GoatAttributes.java
index 0cf82684..1ad49a28 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/GoatAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/GoatAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.goat.Goat;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/HorseAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/HorseAttributes.java
similarity index 96%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/HorseAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/HorseAttributes.java
index 26d7c722..efa5b23c 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/HorseAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/HorseAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.horse.Horse;
 import net.minecraft.world.entity.animal.horse.Markings;
 import net.minecraft.world.entity.animal.horse.Variant;
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/IllagerAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/IllagerAttributes.java
similarity index 91%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/IllagerAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/IllagerAttributes.java
index 590b5ee4..6b7e08bd 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/IllagerAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/IllagerAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.raid.Raider;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Illager;
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/InteractionAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/InteractionAttributes.java
similarity index 93%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/InteractionAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/InteractionAttributes.java
index e617bcdf..28646a6d 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/InteractionAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/InteractionAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.Interaction;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/LivingEntityAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/LivingEntityAttributes.java
similarity index 95%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/LivingEntityAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/LivingEntityAttributes.java
index 70c54777..933f6e61 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/LivingEntityAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/LivingEntityAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.InteractionHand;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/PandaAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/PandaAttributes.java
similarity index 92%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/PandaAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/PandaAttributes.java
index 2435e13d..ca9c50c2 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/PandaAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/PandaAttributes.java
@@ -1,10 +1,9 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancylib.ReflectionUtils;
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.MappingKeys1_21;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.world.entity.animal.Panda;
 import org.bukkit.entity.EntityType;
@@ -87,7 +86,7 @@ private static void setEating(Npc npc, String value) {
     }
 
     private static void setFlag(Panda panda, int mask, boolean value) {
-        EntityDataAccessor<Byte> DATA_ID_FLAGS = (EntityDataAccessor<Byte>) ReflectionUtils.getValue(panda, MappingKeys1_21.PANDA__DATA_ID_FLAGS.getMapping());
+        EntityDataAccessor<Byte> DATA_ID_FLAGS = (EntityDataAccessor<Byte>) ReflectionUtils.getValue(panda, "DATA_ID_FLAGS");
 
         byte b0 = panda.getEntityData().get(DATA_ID_FLAGS);
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/ParrotAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/ParrotAttributes.java
similarity index 94%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/ParrotAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/ParrotAttributes.java
index 744c2570..d3f355a4 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/ParrotAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/ParrotAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.Parrot;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/PigAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/PigAttributes.java
similarity index 89%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/PigAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/PigAttributes.java
index a5a405bb..53b5946b 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/PigAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/PigAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.Pig;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/PiglinAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/PiglinAttributes.java
similarity index 89%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/PiglinAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/PiglinAttributes.java
index d0676d03..a6fd80b2 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/PiglinAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/PiglinAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.monster.piglin.Piglin;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/PlayerAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/PlayerAttributes.java
similarity index 92%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/PlayerAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/PlayerAttributes.java
index 1855cd3d..9baa88ab 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/PlayerAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/PlayerAttributes.java
@@ -1,9 +1,9 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancylib.ReflectionUtils;
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.Pose;
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/RabbitAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/RabbitAttributes.java
similarity index 90%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/RabbitAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/RabbitAttributes.java
index ab86569a..76cf652e 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/RabbitAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/RabbitAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.Rabbit;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/SheepAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/SheepAttributes.java
similarity index 93%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/SheepAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/SheepAttributes.java
index f912de1a..39b8e272 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/SheepAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/SheepAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.Sheep;
 import net.minecraft.world.item.DyeColor;
 import org.bukkit.entity.EntityType;
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/ShulkerAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/ShulkerAttributes.java
similarity index 93%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/ShulkerAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/ShulkerAttributes.java
index 97f7043e..d0a22d23 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/ShulkerAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/ShulkerAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.monster.Shulker;
 import net.minecraft.world.item.DyeColor;
 import org.bukkit.entity.EntityType;
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/SlimeAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/SlimeAttributes.java
similarity index 90%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/SlimeAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/SlimeAttributes.java
index ff4403bc..4819bd3a 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/SlimeAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/SlimeAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.monster.Slime;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/SpellCasterAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/SpellCasterAttributes.java
similarity index 92%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/SpellCasterAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/SpellCasterAttributes.java
index c28b5566..89db6e4f 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/SpellCasterAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/SpellCasterAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.monster.SpellcasterIllager;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Spellcaster;
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/TextDisplayAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/TextDisplayAttributes.java
similarity index 91%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/TextDisplayAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/TextDisplayAttributes.java
index cf1bc7a7..0d8a87c9 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/TextDisplayAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/TextDisplayAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import io.papermc.paper.adventure.PaperAdventure;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/TropicalFishAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/TropicalFishAttributes.java
similarity index 96%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/TropicalFishAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/TropicalFishAttributes.java
index 39109145..55d76920 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/TropicalFishAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/TropicalFishAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.TropicalFish;
 import net.minecraft.world.item.DyeColor;
 import org.bukkit.entity.EntityType;
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/VexAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/VexAttributes.java
similarity index 89%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/VexAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/VexAttributes.java
index 0650e9b0..16254e60 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/VexAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/VexAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.monster.Vex;
 import org.bukkit.entity.EntityType;
 
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/VillagerAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/VillagerAttributes.java
similarity index 94%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/VillagerAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/VillagerAttributes.java
index 38923788..6a568ba5 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/VillagerAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/VillagerAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.npc.Villager;
diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/WolfAttributes.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/WolfAttributes.java
similarity index 95%
rename from implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/WolfAttributes.java
rename to implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/WolfAttributes.java
index feb4d432..7b240e33 100644
--- a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/attributes/WolfAttributes.java
+++ b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/WolfAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0d4df054..a5a37f33 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,7 +1,7 @@
 rootProject.name = "FancyNpcs"
 
 include("api")
-include("implementation_1_21")
+include("implementation_1_21_1")
 include("implementation_1_20_6")
 include("implementation_1_20_4")
 include("implementation_1_20_2")
diff --git a/src/main/java/de/oliver/fancynpcs/AttributeManagerImpl.java b/src/main/java/de/oliver/fancynpcs/AttributeManagerImpl.java
index be075590..f216cec6 100644
--- a/src/main/java/de/oliver/fancynpcs/AttributeManagerImpl.java
+++ b/src/main/java/de/oliver/fancynpcs/AttributeManagerImpl.java
@@ -7,7 +7,7 @@
 import de.oliver.fancynpcs.v1_20_2.attributes.Attributes_1_20_2;
 import de.oliver.fancynpcs.v1_20_4.attributes.Attributes_1_20_4;
 import de.oliver.fancynpcs.v1_20_6.attributes.Attributes_1_20_5;
-import de.oliver.fancynpcs.v1_21.attributes.Attributes_1_21;
+import de.oliver.fancynpcs.v1_21_1.attributes.Attributes_1_21_1;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.EntityType;
 
@@ -26,7 +26,7 @@ public AttributeManagerImpl() {
     private void init() {
         String mcVersion = Bukkit.getMinecraftVersion();
         switch (mcVersion) {
-            case "1.21" -> attributes = Attributes_1_21.getAllAttributes();
+            case "1.21", "1.21.1" -> attributes = Attributes_1_21_1.getAllAttributes();
             case "1.20.5", "1.20.6" -> attributes = Attributes_1_20_5.getAllAttributes();
             case "1.20.3", "1.20.4" -> attributes = Attributes_1_20_4.getAllAttributes();
             case "1.20.2" -> attributes = Attributes_1_20_2.getAllAttributes();
diff --git a/src/main/java/de/oliver/fancynpcs/FancyNpcs.java b/src/main/java/de/oliver/fancynpcs/FancyNpcs.java
index 1b965116..0c791073 100644
--- a/src/main/java/de/oliver/fancynpcs/FancyNpcs.java
+++ b/src/main/java/de/oliver/fancynpcs/FancyNpcs.java
@@ -31,7 +31,7 @@
 import de.oliver.fancynpcs.v1_20_2.Npc_1_20_2;
 import de.oliver.fancynpcs.v1_20_4.Npc_1_20_4;
 import de.oliver.fancynpcs.v1_20_6.Npc_1_20_6;
-import de.oliver.fancynpcs.v1_21.Npc_1_21;
+import de.oliver.fancynpcs.v1_21_1.Npc_1_21_1;
 import org.apache.maven.artifact.versioning.ComparableVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.EntityType;
@@ -90,7 +90,7 @@ public void onLoad() {
         String mcVersion = Bukkit.getMinecraftVersion();
 
         switch (mcVersion) {
-            case "1.21" -> npcAdapter = Npc_1_21::new;
+            case "1.21", "1.21.1" -> npcAdapter = Npc_1_21_1::new;
             case "1.20.5", "1.20.6" -> npcAdapter = Npc_1_20_6::new;
             case "1.20.3", "1.20.4" -> npcAdapter = Npc_1_20_4::new;
             case "1.20.2" -> npcAdapter = Npc_1_20_2::new;
@@ -147,7 +147,7 @@ public void onEnable() {
                     }
 
                     getLogger().warning("""
-                                                                    
+                            
                             -------------------------------------------------------
                             You are not using the latest version the FancyNpcs plugin.
                             Please update to the newest version (%s).
diff --git a/src/main/java/de/oliver/fancynpcs/commands/CloudCommandManager.java b/src/main/java/de/oliver/fancynpcs/commands/CloudCommandManager.java
index efb2caff..2dac8724 100644
--- a/src/main/java/de/oliver/fancynpcs/commands/CloudCommandManager.java
+++ b/src/main/java/de/oliver/fancynpcs/commands/CloudCommandManager.java
@@ -191,7 +191,7 @@ else if (exceptionContext.exception().enumClass() == GlowingColor.class)
 
 
         String mcVersion = Bukkit.getMinecraftVersion();
-        if (mcVersion.equals("1.20.5") || mcVersion.equals("1.20.6") || mcVersion.equals("1.21")) {
+        if (mcVersion.equals("1.20.5") || mcVersion.equals("1.20.6") || mcVersion.equals("1.21") || mcVersion.equals("1.21.1")) {
             annotationParser.parse(ScaleCMD.INSTANCE);
         }