diff --git a/bukkit/src/main/java/net/william278/husksync/data/BukkitData.java b/bukkit/src/main/java/net/william278/husksync/data/BukkitData.java
index ecf3bf61..3c515d08 100644
--- a/bukkit/src/main/java/net/william278/husksync/data/BukkitData.java
+++ b/bukkit/src/main/java/net/william278/husksync/data/BukkitData.java
@@ -636,7 +636,7 @@ public abstract class BukkitData implements Data {
                     Objects.requireNonNull(NamespacedKey.fromString(modifier.name())),
                     modifier.amount(),
                     AttributeModifier.Operation.values()[modifier.operation()],
-                    modifier.equipmentSlotGroup().map(EquipmentSlotGroup::getByName).orElse(EquipmentSlotGroup.ANY)
+                    Optional.ofNullable(EquipmentSlotGroup.getByName(modifier.slotGroup())).orElse(EquipmentSlotGroup.ANY)
             );
         }
 
diff --git a/common/src/main/java/net/william278/husksync/data/Data.java b/common/src/main/java/net/william278/husksync/data/Data.java
index b951a42e..3c7926af 100644
--- a/common/src/main/java/net/william278/husksync/data/Data.java
+++ b/common/src/main/java/net/william278/husksync/data/Data.java
@@ -23,7 +23,6 @@ import com.google.common.collect.Sets;
 import com.google.gson.annotations.SerializedName;
 import lombok.AccessLevel;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.Accessors;
 import net.kyori.adventure.key.Key;
@@ -342,15 +341,13 @@ public interface Data {
         @Getter
         @Accessors(fluent = true)
         @RequiredArgsConstructor
-        @NoArgsConstructor
         final class Modifier {
             final static String ANY_EQUIPMENT_SLOT_GROUP = "any";
 
             @Getter(AccessLevel.NONE)
             @Nullable
             @SerializedName("uuid")
-            @Deprecated(since = "3.7")
-            private UUID uuid;
+            private UUID uuid = null;
 
             // Since 1.21.1: Name, amount, operation, slotGroup
             @SerializedName("name")
@@ -366,10 +363,8 @@ public interface Data {
             @Deprecated(since = "3.7")
             private int equipmentSlot;
 
-            @Getter(AccessLevel.NONE)
             @SerializedName("equipment_slot_group")
-            @Nullable
-            private String slotGroup;
+            private String slotGroup = ANY_EQUIPMENT_SLOT_GROUP;
 
             public Modifier(@NotNull String name, double amount, int operation, @NotNull String slotGroup) {
                 this.name = name;
@@ -378,14 +373,6 @@ public interface Data {
                 this.slotGroup = slotGroup;
             }
 
-            @Deprecated(since = "3.7")
-            public Modifier(@NotNull String name, double amount, int operation, int equipmentSlot) {
-                this.name = name;
-                this.amount = amount;
-                this.operation = operation;
-                this.equipmentSlot = equipmentSlot;
-            }
-
             @Deprecated(since = "3.7")
             public Modifier(@NotNull UUID uuid, @NotNull String name, double amount, int operation, int equipmentSlot) {
                 this.name = name;
@@ -423,10 +410,6 @@ public interface Data {
                 return uuid != null ? uuid : UUID.nameUUIDFromBytes(name.getBytes());
             }
 
-            Optional<String> equipmentSlotGroup() {
-                return Optional.ofNullable(slotGroup);
-            }
-
         }
 
         default Optional<Attribute> getAttribute(@NotNull Key key) {