diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DarkWaterDragon.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DarkWaterDragon.java
index cc645eade28817326fb7518f165dc739a4548303..573b52cc329c41efa0f601af3f25a4a01f43c54d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DarkWaterDragon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DarkWaterDragon.java
@@ -20,6 +20,7 @@ package ai.individual;
 
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javolution.util.FastSet;
 import ai.npc.AbstractNpcAI;
@@ -31,7 +32,6 @@ import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.util.L2FastMap;
 
 /**
  * Dark Water Dragon's AI.
@@ -46,7 +46,7 @@ public final class DarkWaterDragon extends AbstractNpcAI
 	private static final int DETRACTOR2 = 22271;
 	private static Set<Integer> SECOND_SPAWN = new FastSet<>(); // Used to track if second Shades were already spawned
 	private static Set<Integer> MY_TRACKING_SET = new FastSet<>(); // Used to track instances of npcs
-	private static Map<Integer, L2PcInstance> ID_MAP = new L2FastMap<>(true); // Used to track instances of npcs
+	private static Map<Integer, L2PcInstance> ID_MAP = new ConcurrentHashMap<>(); // Used to track instances of npcs
 	
 	private DarkWaterDragon()
 	{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Epidos.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Epidos.java
index 326367a6bc2a467084e19d49c7f2505413dff3fc..c1953b3579ea5c25d0f7d17626087d4c148f72fb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Epidos.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Epidos.java
@@ -20,6 +20,7 @@ package ai.individual;
 
 import java.util.Arrays;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import ai.npc.AbstractNpcAI;
 
@@ -28,7 +29,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.util.MinionList;
-import com.l2jserver.util.L2FastMap;
 
 /**
  * Manages minion's spawn, idle despawn and Teleportation Cube spawn.
@@ -59,7 +59,7 @@ public final class Epidos extends AbstractNpcAI
 		11
 	};
 	
-	private final Map<Integer, Double> _lastHp = new L2FastMap<>(true);
+	private final Map<Integer, Double> _lastHp = new ConcurrentHashMap<>();
 	
 	private Epidos()
 	{