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 4e40fe94..9e5f150f 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
@@ -141,7 +141,12 @@ public class NMS_1_17 extends NMS {
                 int[].class);
         // DATA WATCHER OBJECT
         if (Version.afterOrEqual(18)) {
-            if (Version.afterOrEqual(Version.v1_19_R3)) {
+            if (Version.afterOrEqual(Version.v1_20_R1)) {
+                DWO_ENTITY_DATA = new ReflectField<>(ENTITY_CLASS, "an").getValue(null);
+                DWO_CUSTOM_NAME = new ReflectField<>(ENTITY_CLASS, "aU").getValue(null);
+                DWO_CUSTOM_NAME_VISIBLE = new ReflectField<>(ENTITY_CLASS, "aV").getValue(null);
+                DWO_ARMOR_STAND_DATA = new ReflectField<>(ENTITY_ARMOR_STAND_CLASS, "bC").getValue(null);
+            } else if (Version.afterOrEqual(Version.v1_19_R3)) {
                 DWO_ENTITY_DATA = new ReflectField<>(ENTITY_CLASS, "an").getValue(null);
                 DWO_CUSTOM_NAME = new ReflectField<>(ENTITY_CLASS, "aR").getValue(null);
                 DWO_CUSTOM_NAME_VISIBLE = new ReflectField<>(ENTITY_CLASS, "aS").getValue(null);
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 c30993d0..14068133 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
@@ -29,6 +29,7 @@ public enum Version {
     v1_19_R1(19),
     v1_19_R2(19),
     v1_19_R3(19),
+    v1_20_R1(20),
     ;
 
     /*