diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 6b234768e4..b6e044c1f4 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private int _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 6b234768e4..b6e044c1f4 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private int _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 6b234768e4..b6e044c1f4 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private int _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 6b234768e4..b6e044c1f4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private int _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 1099b77054..7ee35acf35 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private long _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 1099b77054..7ee35acf35 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private long _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 1099b77054..7ee35acf35 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private long _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 1099b77054..7ee35acf35 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private long _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 1099b77054..7ee35acf35 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private long _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 1099b77054..7ee35acf35 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private long _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 1099b77054..7ee35acf35 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private long _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 1099b77054..7ee35acf35 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private long _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index 66db85b3e3..f47180f059 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -124,7 +124,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 6b234768e4..b6e044c1f4 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private int _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index 66db85b3e3..f47180f059 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -124,7 +124,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 6b234768e4..b6e044c1f4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private int _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index 66db85b3e3..f47180f059 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -124,7 +124,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 6b234768e4..b6e044c1f4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private int _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 6b234768e4..b6e044c1f4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private int _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 6b234768e4..b6e044c1f4 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private int _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 1099b77054..7ee35acf35 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private long _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 1099b77054..7ee35acf35 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private long _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 1099b77054..7ee35acf35 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private long _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 1099b77054..7ee35acf35 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private long _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 6b234768e4..b6e044c1f4 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private int _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 1099b77054..7ee35acf35 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private long _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 1099b77054..7ee35acf35 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private long _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 1099b77054..7ee35acf35 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private long _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
index aec0b34a74..d5c9f812b6 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java
@@ -126,7 +126,7 @@ public class EnchantItemGroupsData implements IXmlReader
 										}
 										if (attrs.getNamedItem("itemId") != null)
 										{
-											rateGroup.setItemId(parseInteger(attrs, "itemId"));
+											rateGroup.addItemId(parseInteger(attrs, "itemId"));
 										}
 									}
 								}
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
index 1099b77054..7ee35acf35 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java
@@ -16,15 +16,18 @@
  */
 package org.l2jmobius.gameserver.model.item.enchant;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class EnchantRateItem
 {
 	private final String _name;
-	private int _itemId;
+	private final Set<Integer> _items = new HashSet<>();
 	private long _slot;
 	private Boolean _isMagicWeapon = null;
 	
@@ -45,9 +48,9 @@ public class EnchantRateItem
 	 * Adds item id verification.
 	 * @param id
 	 */
-	public void setItemId(int id)
+	public void addItemId(int id)
 	{
-		_itemId = id;
+		_items.add(id);
 	}
 	
 	/**
@@ -74,7 +77,7 @@ public class EnchantRateItem
 	 */
 	public boolean validate(ItemTemplate item)
 	{
-		if ((_itemId != 0) && (_itemId != item.getId()))
+		if (!_items.isEmpty() && !_items.contains(item.getId()))
 		{
 			return false;
 		}