diff --git a/build.gradle b/build.gradle
index 4678fdf8..e9b141a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,9 +21,9 @@ dependencies {
     compileOnly "me.clip:placeholderapi:2.11.6"
     compileOnly "com.arcaniax:HeadDatabase-API:1.3.2"
 
-    implementation "org.bstats:bstats-bukkit:3.0.2"
-    implementation "de.tr7zw:item-nbt-api:2.14.0"
-    implementation "com.github.cryptomorin:XSeries:10.0.0"
+    implementation "org.bstats:bstats-bukkit:3.1.0"
+    implementation "de.tr7zw:item-nbt-api:2.14.1-SNAPSHOT"
+    implementation "com.github.cryptomorin:XSeries:12.0.0"
 
     compileOnly "org.projectlombok:lombok:1.18.34"
     annotationProcessor "org.projectlombok:lombok:1.18.34"
@@ -66,4 +66,8 @@ publishing {
             artifactId = "decentholograms"
         }
     }
+}
+
+tasks.withType(Javadoc) {
+    enabled = false
 }
\ No newline at end of file
diff --git a/src/main/java/eu/decentsoftware/holograms/api/nms/versions/NMS_1_17.java b/src/main/java/eu/decentsoftware/holograms/api/nms/versions/NMS_1_17.java
index 3514dc39..3a1c15b3 100644
--- a/src/main/java/eu/decentsoftware/holograms/api/nms/versions/NMS_1_17.java
+++ b/src/main/java/eu/decentsoftware/holograms/api/nms/versions/NMS_1_17.java
@@ -181,7 +181,12 @@ public class NMS_1_17 extends NMS {
         }
         // DATA WATCHER OBJECT
         if (Version.afterOrEqual(18)) {
-			if (Version.afterOrEqual(Version.v1_21_R2)) {
+            if (Version.afterOrEqual(Version.v1_21_R3)) {
+                DWO_ENTITY_DATA = new ReflectField<>(ENTITY_CLASS, "am").getValue(null);
+                DWO_CUSTOM_NAME = new ReflectField<>(ENTITY_CLASS, "aO").getValue(null);
+                DWO_CUSTOM_NAME_VISIBLE = new ReflectField<>(ENTITY_CLASS, "aP").getValue(null);
+                DWO_ARMOR_STAND_DATA = new ReflectField<>(ENTITY_ARMOR_STAND_CLASS, "bI").getValue(null);
+            } else if (Version.afterOrEqual(Version.v1_21_R2)) {
 				DWO_ENTITY_DATA = new ReflectField<>(ENTITY_CLASS, "am").getValue(null);
 				DWO_CUSTOM_NAME = new ReflectField<>(ENTITY_CLASS, "aO").getValue(null);
 				DWO_CUSTOM_NAME_VISIBLE = new ReflectField<>(ENTITY_CLASS, "aP").getValue(null);
diff --git a/src/main/java/eu/decentsoftware/holograms/api/utils/entity/DecentEntityType.java b/src/main/java/eu/decentsoftware/holograms/api/utils/entity/DecentEntityType.java
index 859f1cd5..824ab36d 100644
--- a/src/main/java/eu/decentsoftware/holograms/api/utils/entity/DecentEntityType.java
+++ b/src/main/java/eu/decentsoftware/holograms/api/utils/entity/DecentEntityType.java
@@ -85,7 +85,7 @@ public static EntityType parseEntityType(String string) {
         }
         XEntityType entityType = ENTITY_TYPE_ALIASES.get(Common.removeSpacingChars(string).toLowerCase());
         if (entityType == null) {
-            entityType = XEntityType.of(string);
+            entityType = XEntityType.of(string).orElse(null);
         }
         if (entityType != null && isAllowed(entityType)) {
             return entityType.get();
diff --git a/src/main/java/eu/decentsoftware/holograms/api/utils/reflect/Version.java b/src/main/java/eu/decentsoftware/holograms/api/utils/reflect/Version.java
index 6e80bcfb..5f483071 100644
--- a/src/main/java/eu/decentsoftware/holograms/api/utils/reflect/Version.java
+++ b/src/main/java/eu/decentsoftware/holograms/api/utils/reflect/Version.java
@@ -37,6 +37,7 @@ public enum Version {
     v1_20_R4(20, "1.20.5", "1.20.6"),
     v1_21_R1(21, "1.21", "1.21.1"),
     v1_21_R2(21, "1.21.2", "1.21.3"),
+    v1_21_R3(21, "1.21.4"),
     ;
 
     /*