diff --git a/L2J_DataPack_BETA/build.xml b/L2J_DataPack_BETA/build.xml
index 57ba9a898937a060d65158fab7c0e54ad401c410..4b231a39bdbbfd6e3d0a6dcc7013a50e2034369f 100644
--- a/L2J_DataPack_BETA/build.xml
+++ b/L2J_DataPack_BETA/build.xml
@@ -25,7 +25,7 @@
 	<property name="build.dist.game" location="${build.dist}/game" />
 	<property name="build.dist.login" location="${build.dist}/login" />
 
-	<target name="init" depends="checkRequirements,getChangelogDateVersion" description="Create the output directories.">
+	<target name="init" depends="checkRequirements,getDateAndVersion" description="Create the output directories.">
 		<mkdir dir="${build}" />
 	</target>
 
@@ -33,7 +33,6 @@
 		<sync todir="${build.dist}" includeemptydirs="true">
 			<fileset dir="dist" />
 		</sync>
-		<concat destfile="${build.dist.doc}/L2J_DataPack_CHANGELOG.txt">${l2j.changelog}</concat>
 		<concat destfile="${build.dist.game}/config/l2jdp-version.properties">version=${l2j.version}${line.separator}builddate=${build.tstamp}</concat>
 	</target>
 
@@ -51,11 +50,7 @@
 		</fail>
 	</target>
 
-	<target name="getChangelogDateVersion" description="Get Changelog, Date, Version.">
-		<exec dir="${basedir}" executable="svn" outputproperty="l2j.changelog">
-			<arg value="log" />
-			<arg value="--stop-on-copy" />
-		</exec>
+	<target name="getDateAndVersion" description="Get Date and Version.">
 		<tstamp>
 			<format property="build.tstamp" pattern="dd/MM/yyyy HH:mm" />
 		</tstamp>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java
index cca33f49f1071924c042651b17629fe4ba400f9d..6a20886064fb70bfba5ef6584a0a5d878c7e2d02 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java
@@ -42,19 +42,19 @@ import com.l2jserver.gameserver.handler.VoicedCommandHandler;
 import handlers.actionhandlers.L2ArtefactInstanceAction;
 import handlers.actionhandlers.L2DecoyAction;
 import handlers.actionhandlers.L2DoorInstanceAction;
-import handlers.actionhandlers.L2DoorInstanceActionShift;
 import handlers.actionhandlers.L2ItemInstanceAction;
-import handlers.actionhandlers.L2ItemInstanceActionShift;
 import handlers.actionhandlers.L2NpcAction;
-import handlers.actionhandlers.L2NpcActionShift;
 import handlers.actionhandlers.L2PcInstanceAction;
-import handlers.actionhandlers.L2PcInstanceActionShift;
 import handlers.actionhandlers.L2PetInstanceAction;
 import handlers.actionhandlers.L2StaticObjectInstanceAction;
-import handlers.actionhandlers.L2StaticObjectInstanceActionShift;
 import handlers.actionhandlers.L2SummonAction;
-import handlers.actionhandlers.L2SummonActionShift;
 import handlers.actionhandlers.L2TrapAction;
+import handlers.actionshifthandlers.L2DoorInstanceActionShift;
+import handlers.actionshifthandlers.L2ItemInstanceActionShift;
+import handlers.actionshifthandlers.L2NpcActionShift;
+import handlers.actionshifthandlers.L2PcInstanceActionShift;
+import handlers.actionshifthandlers.L2StaticObjectInstanceActionShift;
+import handlers.actionshifthandlers.L2SummonActionShift;
 import handlers.admincommandhandlers.AdminAdmin;
 import handlers.admincommandhandlers.AdminAnnouncements;
 import handlers.admincommandhandlers.AdminBBS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2DoorInstanceActionShift.java
similarity index 91%
rename from L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java
rename to L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2DoorInstanceActionShift.java
index 708acfc592e9a999df4517deddfa0a612ecaf3d6..cabdf8e5019bcc94a17ea4a93f0c70f2d4670838 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2DoorInstanceActionShift.java
@@ -16,17 +16,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package handlers.actionhandlers;
+package handlers.actionshifthandlers;
 
 import com.l2jserver.gameserver.enums.InstanceType;
-import com.l2jserver.gameserver.handler.IActionHandler;
+import com.l2jserver.gameserver.handler.IActionShiftHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.StaticObject;
 
-public class L2DoorInstanceActionShift implements IActionHandler
+public class L2DoorInstanceActionShift implements IActionShiftHandler
 {
 	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2ItemInstanceActionShift.java
similarity index 90%
rename from L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java
rename to L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2ItemInstanceActionShift.java
index c6e0d7b6b3243fdb3dc358327ebd15ea770431f5..a9e54f0d7112ab6c8ab093cc8a10a0b8a0ad8e8d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2ItemInstanceActionShift.java
@@ -16,17 +16,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package handlers.actionhandlers;
+package handlers.actionshifthandlers;
 
 import com.l2jserver.gameserver.enums.InstanceType;
-import com.l2jserver.gameserver.handler.IActionHandler;
+import com.l2jserver.gameserver.handler.IActionShiftHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.util.StringUtil;
 
-public class L2ItemInstanceActionShift implements IActionHandler
+public class L2ItemInstanceActionShift implements IActionShiftHandler
 {
 	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
similarity index 93%
rename from L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java
rename to L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
index a49b90e1913d9f3a326c670c007aa07d2eff5805..c57bda7437a551743191a1cb63e22064126118c7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java
@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package handlers.actionhandlers;
+package handlers.actionshifthandlers;
 
 import java.util.Set;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.enums.InstanceType;
-import com.l2jserver.gameserver.handler.IActionHandler;
+import com.l2jserver.gameserver.handler.IActionShiftHandler;
 import com.l2jserver.gameserver.instancemanager.WalkingManager;
 import com.l2jserver.gameserver.model.Elementals;
 import com.l2jserver.gameserver.model.L2Object;
@@ -36,7 +36,7 @@ import com.l2jserver.gameserver.util.Util;
 
 import handlers.bypasshandlers.NpcViewMod;
 
-public class L2NpcActionShift implements IActionHandler
+public class L2NpcActionShift implements IActionShiftHandler
 {
 	/**
 	 * Manage and Display the GM console to modify the L2NpcInstance (GM only).<BR>
@@ -154,15 +154,15 @@ public class L2NpcActionShift implements IActionHandler
 			if (((L2Npc) target).hasAI())
 			{
 				Set<Integer> clans = ((L2Npc) target).getTemplate().getClans();
-				Set<Integer> enemyClans = ((L2Npc) target).getTemplate().getEnemyClans();
+				Set<Integer> ignoreClanNpcIds = ((L2Npc) target).getTemplate().getIgnoreClanNpcIds();
 				String clansString = clans != null ? Util.implode(clans.toArray(), ", ") : "";
-				String enemyClansString = enemyClans != null ? Util.implode(enemyClans.toArray(), ", ") : "";
+				String ignoreClanNpcIdsString = ignoreClanNpcIds != null ? Util.implode(ignoreClanNpcIds.toArray(), ", ") : "";
 				
 				html.replace("%ai_intention%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Intention:</font></td><td align=right width=170>" + String.valueOf(((L2Npc) target).getAI().getIntention().name()) + "</td></tr></table></td></tr>");
 				html.replace("%ai%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>AI</font></td><td align=right width=170>" + ((L2Npc) target).getAI().getClass().getSimpleName() + "</td></tr></table></td></tr>");
 				html.replace("%ai_type%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>AIType</font></td><td align=right width=170>" + String.valueOf(((L2Npc) target).getAiType()) + "</td></tr></table></td></tr>");
 				html.replace("%ai_clan%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>Clan & Range:</font></td><td align=right width=170>" + clansString + " " + String.valueOf(((L2Npc) target).getTemplate().getClanHelpRange()) + "</td></tr></table></td></tr>");
-				html.replace("%ai_enemy_clan%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Enemy & Range:</font></td><td align=right width=170>" + enemyClansString + " " + String.valueOf(((L2Npc) target).getTemplate().getAggroRange()) + "</td></tr></table></td></tr>");
+				html.replace("%ai_enemy_clan%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Ignore & Range:</font></td><td align=right width=170>" + ignoreClanNpcIdsString + " " + String.valueOf(((L2Npc) target).getTemplate().getAggroRange()) + "</td></tr></table></td></tr>");
 			}
 			else
 			{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
similarity index 88%
rename from L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceActionShift.java
rename to L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
index 1520abf8c88e7f8440cd75fceddd12c1cded8c18..8176f628d8b10b0affa01fece6dece4db95e37dd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
@@ -16,16 +16,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package handlers.actionhandlers;
+package handlers.actionshifthandlers;
 
 import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.handler.AdminCommandHandler;
-import com.l2jserver.gameserver.handler.IActionHandler;
+import com.l2jserver.gameserver.handler.IActionShiftHandler;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-public class L2PcInstanceActionShift implements IActionHandler
+public class L2PcInstanceActionShift implements IActionShiftHandler
 {
 	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2StaticObjectInstanceActionShift.java
similarity index 93%
rename from L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java
rename to L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2StaticObjectInstanceActionShift.java
index 157cabd1d72b82151503548e4c8553504f1472a2..e784d5fc76f55ab0d071ec9332b695770c525bd4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2StaticObjectInstanceActionShift.java
@@ -16,10 +16,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package handlers.actionhandlers;
+package handlers.actionshifthandlers;
 
 import com.l2jserver.gameserver.enums.InstanceType;
-import com.l2jserver.gameserver.handler.IActionHandler;
+import com.l2jserver.gameserver.handler.IActionShiftHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.StaticObject;
 import com.l2jserver.util.StringUtil;
 
-public class L2StaticObjectInstanceActionShift implements IActionHandler
+public class L2StaticObjectInstanceActionShift implements IActionShiftHandler
 {
 	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
similarity index 88%
rename from L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonActionShift.java
rename to L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
index 63fd854ca2a3c4f85c4589eb3fd79c18c590b72c..fd3971953d73ad49c6eccd07a37eeba7997e075b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
@@ -16,16 +16,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package handlers.actionhandlers;
+package handlers.actionshifthandlers;
 
 import com.l2jserver.gameserver.enums.InstanceType;
 import com.l2jserver.gameserver.handler.AdminCommandHandler;
-import com.l2jserver.gameserver.handler.IActionHandler;
+import com.l2jserver.gameserver.handler.IActionShiftHandler;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-public class L2SummonActionShift implements IActionHandler
+public class L2SummonActionShift implements IActionShiftHandler
 {
 	@Override
 	public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/18000-18100.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/18000-18100.xml
index 3ac29f07f0d42dbef827f694c63971bd4d33fc3a..c7032318e7f62b38a755feef69c16baafc2638dc 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/18000-18100.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/18000-18100.xml
@@ -46,20 +46,20 @@
 		<ai aggroRange="1000" clanHelpRange="400">
 			<clan_list>
 				<clan>CAVE_SERVANT</clan>
-				<enemy_clan>CAVE_KEEPER</enemy_clan>
-				<enemy_clan>CAVE_KEEPER_HOLD</enemy_clan>
-				<enemy_clan>CAVE_MAIDEN</enemy_clan>
-				<enemy_clan>CAVE_MAIDEN_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_CAPTAIN</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_WARRIOR</enemy_clan>
-				<enemy_clan>H_CAVE_SERVANT_CAPTAIN</enemy_clan>
-				<enemy_clan>H_CAVE_SERVANT_WARRIOR</enemy_clan>
-				<enemy_clan>ROYAL_CAVE_SERVANT</enemy_clan>
-				<enemy_clan>ROYAL_CAVE_SERVANT_HOLD</enemy_clan>
+				<ignore_npc_id>20134</ignore_npc_id> <!-- Cave Maiden -->
+				<ignore_npc_id>20236</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20237</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20238</ignore_npc_id> <!-- Cave Servant Warrior -->
+				<ignore_npc_id>20239</ignore_npc_id> <!-- Cave Servant Captain -->
+				<ignore_npc_id>20240</ignore_npc_id> <!-- Royal Cave Servant -->
+				<ignore_npc_id>20246</ignore_npc_id> <!-- Cave Keeper -->
+				<ignore_npc_id>20272</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20273</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20274</ignore_npc_id> <!-- Cave Servant Warrior -->
+				<ignore_npc_id>20275</ignore_npc_id> <!-- Cave Servant Captain -->
+				<ignore_npc_id>20276</ignore_npc_id> <!-- Royal Cave Servant -->
+				<ignore_npc_id>20277</ignore_npc_id> <!-- Cave Keeper -->
+				<ignore_npc_id>20287</ignore_npc_id> <!-- Cave Maiden -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -142,20 +142,20 @@
 		<ai aggroRange="1000" clanHelpRange="300">
 			<clan_list>
 				<clan>CAVE_SERVANT</clan>
-				<enemy_clan>CAVE_KEEPER</enemy_clan>
-				<enemy_clan>CAVE_KEEPER_HOLD</enemy_clan>
-				<enemy_clan>CAVE_MAIDEN</enemy_clan>
-				<enemy_clan>CAVE_MAIDEN_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_CAPTAIN</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_WARRIOR</enemy_clan>
-				<enemy_clan>H_CAVE_SERVANT_CAPTAIN</enemy_clan>
-				<enemy_clan>H_CAVE_SERVANT_WARRIOR</enemy_clan>
-				<enemy_clan>ROYAL_CAVE_SERVANT</enemy_clan>
-				<enemy_clan>ROYAL_CAVE_SERVANT_HOLD</enemy_clan>
+				<ignore_npc_id>20134</ignore_npc_id> <!-- Cave Maiden -->
+				<ignore_npc_id>20236</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20237</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20238</ignore_npc_id> <!-- Cave Servant Warrior -->
+				<ignore_npc_id>20239</ignore_npc_id> <!-- Cave Servant Captain -->
+				<ignore_npc_id>20240</ignore_npc_id> <!-- Royal Cave Servant -->
+				<ignore_npc_id>20246</ignore_npc_id> <!-- Cave Keeper -->
+				<ignore_npc_id>20272</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20273</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20274</ignore_npc_id> <!-- Cave Servant Warrior -->
+				<ignore_npc_id>20275</ignore_npc_id> <!-- Cave Servant Captain -->
+				<ignore_npc_id>20276</ignore_npc_id> <!-- Royal Cave Servant -->
+				<ignore_npc_id>20277</ignore_npc_id> <!-- Cave Keeper -->
+				<ignore_npc_id>20287</ignore_npc_id> <!-- Cave Maiden -->
 			</clan_list>
 		</ai>
 		<collision>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/20200-20300.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/20200-20300.xml
index 4c92957a1b5aba4be76763a3d78c06865a2578ab..a55d61f66813596637126b5526f6db24d1365eb0 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/20200-20300.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/20200-20300.xml
@@ -4346,12 +4346,12 @@
 		<ai aggroRange="1000" clanHelpRange="300">
 			<clan_list>
 				<clan>CAVE_SERVANT</clan>
-				<enemy_clan>CAVE_SERVANT</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_WARRIOR</enemy_clan>
-				<enemy_clan>H_CAVE_SERVANT_WARRIOR</enemy_clan>
+				<ignore_npc_id>20236</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20237</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20238</ignore_npc_id> <!-- Cave Servant Warrior -->
+				<ignore_npc_id>20272</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20273</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20274</ignore_npc_id> <!-- Cave Servant Warrior -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -4445,14 +4445,14 @@
 		<ai type="BALANCED" aggroRange="1000" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>CAVE_SERVANT</clan>
-				<enemy_clan>CAVE_SERVANT</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_CAPTAIN</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_WARRIOR</enemy_clan>
-				<enemy_clan>H_CAVE_SERVANT_CAPTAIN</enemy_clan>
-				<enemy_clan>H_CAVE_SERVANT_WARRIOR</enemy_clan>
+				<ignore_npc_id>20236</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20237</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20238</ignore_npc_id> <!-- Cave Servant Warrior -->
+				<ignore_npc_id>20239</ignore_npc_id> <!-- Cave Servant Captain -->
+				<ignore_npc_id>20272</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20273</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20274</ignore_npc_id> <!-- Cave Servant Warrior -->
+				<ignore_npc_id>20275</ignore_npc_id> <!-- Cave Servant Captain -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -5014,16 +5014,16 @@
 		<ai aggroRange="1000" clanHelpRange="300" isAggressive="false">
 			<clan_list>
 				<clan>CAVE_SERVANT</clan>
-				<enemy_clan>CAVE_SERVANT</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_CAPTAIN</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_WARRIOR</enemy_clan>
-				<enemy_clan>H_CAVE_SERVANT_CAPTAIN</enemy_clan>
-				<enemy_clan>H_CAVE_SERVANT_WARRIOR</enemy_clan>
-				<enemy_clan>ROYAL_CAVE_SERVANT</enemy_clan>
-				<enemy_clan>ROYAL_CAVE_SERVANT_HOLD</enemy_clan>
+				<ignore_npc_id>20236</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20237</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20238</ignore_npc_id> <!-- Cave Servant Warrior -->
+				<ignore_npc_id>20239</ignore_npc_id> <!-- Cave Servant Captain -->
+				<ignore_npc_id>20240</ignore_npc_id> <!-- Royal Cave Servant -->
+				<ignore_npc_id>20272</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20273</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20274</ignore_npc_id> <!-- Cave Servant Warrior -->
+				<ignore_npc_id>20275</ignore_npc_id> <!-- Cave Servant Captain -->
+				<ignore_npc_id>20276</ignore_npc_id> <!-- Royal Cave Servant -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -7208,12 +7208,12 @@
 		<ai aggroRange="1000" clanHelpRange="300">
 			<clan_list>
 				<clan>CAVE_SERVANT</clan>
-				<enemy_clan>CAVE_SERVANT</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_WARRIOR</enemy_clan>
-				<enemy_clan>H_CAVE_SERVANT_WARRIOR</enemy_clan>
+				<ignore_npc_id>20236</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20237</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20238</ignore_npc_id> <!-- Cave Servant Warrior -->
+				<ignore_npc_id>20272</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20273</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20274</ignore_npc_id> <!-- Cave Servant Warrior -->
 			</clan_list>
 		</ai>
 		<collision>
@@ -7271,14 +7271,14 @@
 		<ai type="BALANCED" aggroRange="1000" clanHelpRange="300" isAggressive="false">
 			<clan_list>
 				<clan>CAVE_SERVANT</clan>
-				<enemy_clan>CAVE_SERVANT</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_CAPTAIN</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_WARRIOR</enemy_clan>
-				<enemy_clan>H_CAVE_SERVANT_CAPTAIN</enemy_clan>
-				<enemy_clan>H_CAVE_SERVANT_WARRIOR</enemy_clan>
+				<ignore_npc_id>20236</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20237</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20238</ignore_npc_id> <!-- Cave Servant Warrior -->
+				<ignore_npc_id>20239</ignore_npc_id> <!-- Cave Servant Captain -->
+				<ignore_npc_id>20272</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20273</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20274</ignore_npc_id> <!-- Cave Servant Warrior -->
+				<ignore_npc_id>20275</ignore_npc_id> <!-- Cave Servant Captain -->
 			</clan_list>
 		</ai>
 		<collision>
@@ -7334,16 +7334,16 @@
 		<ai aggroRange="1000" clanHelpRange="300" isAggressive="false">
 			<clan_list>
 				<clan>CAVE_SERVANT</clan>
-				<enemy_clan>CAVE_SERVANT</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_CAPTAIN</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_WARRIOR</enemy_clan>
-				<enemy_clan>H_CAVE_SERVANT_CAPTAIN</enemy_clan>
-				<enemy_clan>H_CAVE_SERVANT_WARRIOR</enemy_clan>
-				<enemy_clan>ROYAL_CAVE_SERVANT</enemy_clan>
-				<enemy_clan>ROYAL_CAVE_SERVANT_HOLD</enemy_clan>
+				<ignore_npc_id>20236</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20237</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20238</ignore_npc_id> <!-- Cave Servant Warrior -->
+				<ignore_npc_id>20239</ignore_npc_id> <!-- Cave Servant Captain -->
+				<ignore_npc_id>20240</ignore_npc_id> <!-- Royal Cave Servant -->
+				<ignore_npc_id>20272</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20273</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20274</ignore_npc_id> <!-- Cave Servant Warrior -->
+				<ignore_npc_id>20275</ignore_npc_id> <!-- Cave Servant Captain -->
+				<ignore_npc_id>20276</ignore_npc_id> <!-- Royal Cave Servant -->
 			</clan_list>
 		</ai>
 		<collision>
@@ -7813,18 +7813,18 @@
 		<ex_crt_effect>false</ex_crt_effect>
 		<ai aggroRange="1000" clanHelpRange="300">
 			<clan_list>
-				<enemy_clan>CAVE_KEEPER</enemy_clan>
-				<enemy_clan>CAVE_KEEPER_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_ARCHER_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_CAPTAIN</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_HOLD</enemy_clan>
-				<enemy_clan>CAVE_SERVANT_WARRIOR</enemy_clan>
-				<enemy_clan>H_CAVE_SERVANT_CAPTAIN</enemy_clan>
-				<enemy_clan>H_CAVE_SERVANT_WARRIOR</enemy_clan>
-				<enemy_clan>ROYAL_CAVE_SERVANT</enemy_clan>
-				<enemy_clan>ROYAL_CAVE_SERVANT_HOLD</enemy_clan>
+				<ignore_npc_id>20236</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20237</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20238</ignore_npc_id> <!-- Cave Servant Warrior -->
+				<ignore_npc_id>20239</ignore_npc_id> <!-- Cave Servant Captain -->
+				<ignore_npc_id>20240</ignore_npc_id> <!-- Royal Cave Servant -->
+				<ignore_npc_id>20246</ignore_npc_id> <!-- Cave Keeper -->
+				<ignore_npc_id>20272</ignore_npc_id> <!-- Cave Servant -->
+				<ignore_npc_id>20273</ignore_npc_id> <!-- Cave Servant Archer -->
+				<ignore_npc_id>20274</ignore_npc_id> <!-- Cave Servant Warrior -->
+				<ignore_npc_id>20275</ignore_npc_id> <!-- Cave Servant Captain -->
+				<ignore_npc_id>20276</ignore_npc_id> <!-- Royal Cave Servant -->
+				<ignore_npc_id>20277</ignore_npc_id> <!-- Cave Keeper -->
 			</clan_list>
 		</ai>
 		<collision>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/21100-21200.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/21100-21200.xml
index 93b2f9cd3fb8fd08f3aee5a15b5658a266683ab9..a2b2700c8e9c1ddcccda2ec0d1fdb1aaa59c92f7 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/21100-21200.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/21100-21200.xml
@@ -6461,15 +6461,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>GIGANT_ACOLYTE</enemy_clan>
-				<enemy_clan>GIGANT_CLERIC</enemy_clan>
-				<enemy_clan>GIGANT_COMMANDER</enemy_clan>
-				<enemy_clan>GIGANT_CONFESSOR</enemy_clan>
-				<enemy_clan>GIGANT_FANATIC</enemy_clan>
-				<enemy_clan>GIGANT_OFFICER</enemy_clan>
-				<enemy_clan>GIGANT_OVERSEER</enemy_clan>
-				<enemy_clan>GIGANT_SLAVE</enemy_clan>
-				<enemy_clan>GIGANT_TROOPER</enemy_clan>
+				<ignore_npc_id>21187</ignore_npc_id> <!-- Gigant Slave -->
+				<ignore_npc_id>21188</ignore_npc_id> <!-- Gigant Acolyte -->
+				<ignore_npc_id>21189</ignore_npc_id> <!-- Gigant Overseer -->
+				<ignore_npc_id>21190</ignore_npc_id> <!-- Gigant Footman -->
+				<ignore_npc_id>21191</ignore_npc_id> <!-- Gigant Cleric -->
+				<ignore_npc_id>21192</ignore_npc_id> <!-- Gigant Officer -->
+				<ignore_npc_id>21193</ignore_npc_id> <!-- Gigant Raider -->
+				<ignore_npc_id>21194</ignore_npc_id> <!-- Gigant Confessor -->
+				<ignore_npc_id>21195</ignore_npc_id> <!-- Gigant Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -6556,15 +6556,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>GIGANT_ACOLYTE</enemy_clan>
-				<enemy_clan>GIGANT_CLERIC</enemy_clan>
-				<enemy_clan>GIGANT_COMMANDER</enemy_clan>
-				<enemy_clan>GIGANT_CONFESSOR</enemy_clan>
-				<enemy_clan>GIGANT_FANATIC</enemy_clan>
-				<enemy_clan>GIGANT_OFFICER</enemy_clan>
-				<enemy_clan>GIGANT_OVERSEER</enemy_clan>
-				<enemy_clan>GIGANT_SLAVE</enemy_clan>
-				<enemy_clan>GIGANT_TROOPER</enemy_clan>
+				<ignore_npc_id>21187</ignore_npc_id> <!-- Gigant Slave -->
+				<ignore_npc_id>21188</ignore_npc_id> <!-- Gigant Acolyte -->
+				<ignore_npc_id>21189</ignore_npc_id> <!-- Gigant Overseer -->
+				<ignore_npc_id>21190</ignore_npc_id> <!-- Gigant Footman -->
+				<ignore_npc_id>21191</ignore_npc_id> <!-- Gigant Cleric -->
+				<ignore_npc_id>21192</ignore_npc_id> <!-- Gigant Officer -->
+				<ignore_npc_id>21193</ignore_npc_id> <!-- Gigant Raider -->
+				<ignore_npc_id>21194</ignore_npc_id> <!-- Gigant Confessor -->
+				<ignore_npc_id>21195</ignore_npc_id> <!-- Gigant Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -6650,15 +6650,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>GIGANT_ACOLYTE</enemy_clan>
-				<enemy_clan>GIGANT_CLERIC</enemy_clan>
-				<enemy_clan>GIGANT_COMMANDER</enemy_clan>
-				<enemy_clan>GIGANT_CONFESSOR</enemy_clan>
-				<enemy_clan>GIGANT_FANATIC</enemy_clan>
-				<enemy_clan>GIGANT_OFFICER</enemy_clan>
-				<enemy_clan>GIGANT_OVERSEER</enemy_clan>
-				<enemy_clan>GIGANT_SLAVE</enemy_clan>
-				<enemy_clan>GIGANT_TROOPER</enemy_clan>
+				<ignore_npc_id>21187</ignore_npc_id> <!-- Gigant Slave -->
+				<ignore_npc_id>21188</ignore_npc_id> <!-- Gigant Acolyte -->
+				<ignore_npc_id>21189</ignore_npc_id> <!-- Gigant Overseer -->
+				<ignore_npc_id>21190</ignore_npc_id> <!-- Gigant Footman -->
+				<ignore_npc_id>21191</ignore_npc_id> <!-- Gigant Cleric -->
+				<ignore_npc_id>21192</ignore_npc_id> <!-- Gigant Officer -->
+				<ignore_npc_id>21193</ignore_npc_id> <!-- Gigant Raider -->
+				<ignore_npc_id>21194</ignore_npc_id> <!-- Gigant Confessor -->
+				<ignore_npc_id>21195</ignore_npc_id> <!-- Gigant Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -6745,15 +6745,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>GIGANT_ACOLYTE</enemy_clan>
-				<enemy_clan>GIGANT_CLERIC</enemy_clan>
-				<enemy_clan>GIGANT_COMMANDER</enemy_clan>
-				<enemy_clan>GIGANT_CONFESSOR</enemy_clan>
-				<enemy_clan>GIGANT_FANATIC</enemy_clan>
-				<enemy_clan>GIGANT_OFFICER</enemy_clan>
-				<enemy_clan>GIGANT_OVERSEER</enemy_clan>
-				<enemy_clan>GIGANT_SLAVE</enemy_clan>
-				<enemy_clan>GIGANT_TROOPER</enemy_clan>
+				<ignore_npc_id>21187</ignore_npc_id> <!-- Gigant Slave -->
+				<ignore_npc_id>21188</ignore_npc_id> <!-- Gigant Acolyte -->
+				<ignore_npc_id>21189</ignore_npc_id> <!-- Gigant Overseer -->
+				<ignore_npc_id>21190</ignore_npc_id> <!-- Gigant Footman -->
+				<ignore_npc_id>21191</ignore_npc_id> <!-- Gigant Cleric -->
+				<ignore_npc_id>21192</ignore_npc_id> <!-- Gigant Officer -->
+				<ignore_npc_id>21193</ignore_npc_id> <!-- Gigant Raider -->
+				<ignore_npc_id>21194</ignore_npc_id> <!-- Gigant Confessor -->
+				<ignore_npc_id>21195</ignore_npc_id> <!-- Gigant Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -6837,15 +6837,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>GIGANT_ACOLYTE</enemy_clan>
-				<enemy_clan>GIGANT_CLERIC</enemy_clan>
-				<enemy_clan>GIGANT_COMMANDER</enemy_clan>
-				<enemy_clan>GIGANT_CONFESSOR</enemy_clan>
-				<enemy_clan>GIGANT_FANATIC</enemy_clan>
-				<enemy_clan>GIGANT_OFFICER</enemy_clan>
-				<enemy_clan>GIGANT_OVERSEER</enemy_clan>
-				<enemy_clan>GIGANT_SLAVE</enemy_clan>
-				<enemy_clan>GIGANT_TROOPER</enemy_clan>
+				<ignore_npc_id>21187</ignore_npc_id> <!-- Gigant Slave -->
+				<ignore_npc_id>21188</ignore_npc_id> <!-- Gigant Acolyte -->
+				<ignore_npc_id>21189</ignore_npc_id> <!-- Gigant Overseer -->
+				<ignore_npc_id>21190</ignore_npc_id> <!-- Gigant Footman -->
+				<ignore_npc_id>21191</ignore_npc_id> <!-- Gigant Cleric -->
+				<ignore_npc_id>21192</ignore_npc_id> <!-- Gigant Officer -->
+				<ignore_npc_id>21193</ignore_npc_id> <!-- Gigant Raider -->
+				<ignore_npc_id>21194</ignore_npc_id> <!-- Gigant Confessor -->
+				<ignore_npc_id>21195</ignore_npc_id> <!-- Gigant Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -6934,15 +6934,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>GIGANT_ACOLYTE</enemy_clan>
-				<enemy_clan>GIGANT_CLERIC</enemy_clan>
-				<enemy_clan>GIGANT_COMMANDER</enemy_clan>
-				<enemy_clan>GIGANT_CONFESSOR</enemy_clan>
-				<enemy_clan>GIGANT_FANATIC</enemy_clan>
-				<enemy_clan>GIGANT_OFFICER</enemy_clan>
-				<enemy_clan>GIGANT_OVERSEER</enemy_clan>
-				<enemy_clan>GIGANT_SLAVE</enemy_clan>
-				<enemy_clan>GIGANT_TROOPER</enemy_clan>
+				<ignore_npc_id>21187</ignore_npc_id> <!-- Gigant Slave -->
+				<ignore_npc_id>21188</ignore_npc_id> <!-- Gigant Acolyte -->
+				<ignore_npc_id>21189</ignore_npc_id> <!-- Gigant Overseer -->
+				<ignore_npc_id>21190</ignore_npc_id> <!-- Gigant Footman -->
+				<ignore_npc_id>21191</ignore_npc_id> <!-- Gigant Cleric -->
+				<ignore_npc_id>21192</ignore_npc_id> <!-- Gigant Officer -->
+				<ignore_npc_id>21193</ignore_npc_id> <!-- Gigant Raider -->
+				<ignore_npc_id>21194</ignore_npc_id> <!-- Gigant Confessor -->
+				<ignore_npc_id>21195</ignore_npc_id> <!-- Gigant Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -7032,15 +7032,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>GIGANT_CLERIC</enemy_clan>
-				<enemy_clan>GIGANT_COMMANDER</enemy_clan>
-				<enemy_clan>GIGANT_CONFESSOR</enemy_clan>
-				<enemy_clan>GIGANT_FANATIC</enemy_clan>
-				<enemy_clan>GIGANT_OFFICER</enemy_clan>
-				<enemy_clan>NEPHILIM_GUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_PRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_SENTINEL</enemy_clan>
-				<enemy_clan>NEPHILIM_SWORDMAN</enemy_clan>
+				<ignore_npc_id>21191</ignore_npc_id> <!-- Gigant Cleric -->
+				<ignore_npc_id>21192</ignore_npc_id> <!-- Gigant Officer -->
+				<ignore_npc_id>21193</ignore_npc_id> <!-- Gigant Raider -->
+				<ignore_npc_id>21194</ignore_npc_id> <!-- Gigant Confessor -->
+				<ignore_npc_id>21195</ignore_npc_id> <!-- Gigant Commander -->
+				<ignore_npc_id>21196</ignore_npc_id> <!-- Nephilim Sentinel -->
+				<ignore_npc_id>21197</ignore_npc_id> <!-- Nephilim Priest -->
+				<ignore_npc_id>21198</ignore_npc_id> <!-- Nephilim Swordsman -->
+				<ignore_npc_id>21199</ignore_npc_id> <!-- Nephilim Guard -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -7135,15 +7135,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>GIGANT_CLERIC</enemy_clan>
-				<enemy_clan>GIGANT_COMMANDER</enemy_clan>
-				<enemy_clan>GIGANT_CONFESSOR</enemy_clan>
-				<enemy_clan>GIGANT_FANATIC</enemy_clan>
-				<enemy_clan>GIGANT_OFFICER</enemy_clan>
-				<enemy_clan>NEPHILIM_GUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_PRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_SENTINEL</enemy_clan>
-				<enemy_clan>NEPHILIM_SWORDMAN</enemy_clan>
+				<ignore_npc_id>21191</ignore_npc_id> <!-- Gigant Cleric -->
+				<ignore_npc_id>21192</ignore_npc_id> <!-- Gigant Officer -->
+				<ignore_npc_id>21193</ignore_npc_id> <!-- Gigant Raider -->
+				<ignore_npc_id>21194</ignore_npc_id> <!-- Gigant Confessor -->
+				<ignore_npc_id>21195</ignore_npc_id> <!-- Gigant Commander -->
+				<ignore_npc_id>21196</ignore_npc_id> <!-- Nephilim Sentinel -->
+				<ignore_npc_id>21197</ignore_npc_id> <!-- Nephilim Priest -->
+				<ignore_npc_id>21198</ignore_npc_id> <!-- Nephilim Swordsman -->
+				<ignore_npc_id>21199</ignore_npc_id> <!-- Nephilim Guard -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -7234,15 +7234,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>GIGANT_CLERIC</enemy_clan>
-				<enemy_clan>GIGANT_COMMANDER</enemy_clan>
-				<enemy_clan>GIGANT_CONFESSOR</enemy_clan>
-				<enemy_clan>GIGANT_FANATIC</enemy_clan>
-				<enemy_clan>GIGANT_OFFICER</enemy_clan>
-				<enemy_clan>NEPHILIM_GUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_PRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_SENTINEL</enemy_clan>
-				<enemy_clan>NEPHILIM_SWORDMAN</enemy_clan>
+				<ignore_npc_id>21191</ignore_npc_id> <!-- Gigant Cleric -->
+				<ignore_npc_id>21192</ignore_npc_id> <!-- Gigant Officer -->
+				<ignore_npc_id>21193</ignore_npc_id> <!-- Gigant Raider -->
+				<ignore_npc_id>21194</ignore_npc_id> <!-- Gigant Confessor -->
+				<ignore_npc_id>21195</ignore_npc_id> <!-- Gigant Commander -->
+				<ignore_npc_id>21196</ignore_npc_id> <!-- Nephilim Sentinel -->
+				<ignore_npc_id>21197</ignore_npc_id> <!-- Nephilim Priest -->
+				<ignore_npc_id>21198</ignore_npc_id> <!-- Nephilim Swordsman -->
+				<ignore_npc_id>21199</ignore_npc_id> <!-- Nephilim Guard -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -7331,15 +7331,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>GIGANT_CLERIC</enemy_clan>
-				<enemy_clan>GIGANT_COMMANDER</enemy_clan>
-				<enemy_clan>GIGANT_CONFESSOR</enemy_clan>
-				<enemy_clan>GIGANT_FANATIC</enemy_clan>
-				<enemy_clan>GIGANT_OFFICER</enemy_clan>
-				<enemy_clan>NEPHILIM_GUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_PRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_SENTINEL</enemy_clan>
-				<enemy_clan>NEPHILIM_SWORDMAN</enemy_clan>
+				<ignore_npc_id>21191</ignore_npc_id> <!-- Gigant Cleric -->
+				<ignore_npc_id>21192</ignore_npc_id> <!-- Gigant Officer -->
+				<ignore_npc_id>21193</ignore_npc_id> <!-- Gigant Raider -->
+				<ignore_npc_id>21194</ignore_npc_id> <!-- Gigant Confessor -->
+				<ignore_npc_id>21195</ignore_npc_id> <!-- Gigant Commander -->
+				<ignore_npc_id>21196</ignore_npc_id> <!-- Nephilim Sentinel -->
+				<ignore_npc_id>21197</ignore_npc_id> <!-- Nephilim Priest -->
+				<ignore_npc_id>21198</ignore_npc_id> <!-- Nephilim Swordsman -->
+				<ignore_npc_id>21199</ignore_npc_id> <!-- Nephilim Guard -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -7433,15 +7433,15 @@
 		<ai type="MAGE" aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>GIGANT_CLERIC</enemy_clan>
-				<enemy_clan>GIGANT_COMMANDER</enemy_clan>
-				<enemy_clan>GIGANT_CONFESSOR</enemy_clan>
-				<enemy_clan>GIGANT_FANATIC</enemy_clan>
-				<enemy_clan>GIGANT_OFFICER</enemy_clan>
-				<enemy_clan>NEPHILIM_GUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_PRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_SENTINEL</enemy_clan>
-				<enemy_clan>NEPHILIM_SWORDMAN</enemy_clan>
+				<ignore_npc_id>21191</ignore_npc_id> <!-- Gigant Cleric -->
+				<ignore_npc_id>21192</ignore_npc_id> <!-- Gigant Officer -->
+				<ignore_npc_id>21193</ignore_npc_id> <!-- Gigant Raider -->
+				<ignore_npc_id>21194</ignore_npc_id> <!-- Gigant Confessor -->
+				<ignore_npc_id>21195</ignore_npc_id> <!-- Gigant Commander -->
+				<ignore_npc_id>21196</ignore_npc_id> <!-- Nephilim Sentinel -->
+				<ignore_npc_id>21197</ignore_npc_id> <!-- Nephilim Priest -->
+				<ignore_npc_id>21198</ignore_npc_id> <!-- Nephilim Swordsman -->
+				<ignore_npc_id>21199</ignore_npc_id> <!-- Nephilim Guard -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -7535,15 +7535,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>GIGANT_CLERIC</enemy_clan>
-				<enemy_clan>GIGANT_COMMANDER</enemy_clan>
-				<enemy_clan>GIGANT_CONFESSOR</enemy_clan>
-				<enemy_clan>GIGANT_FANATIC</enemy_clan>
-				<enemy_clan>GIGANT_OFFICER</enemy_clan>
-				<enemy_clan>NEPHILIM_GUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_PRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_SENTINEL</enemy_clan>
-				<enemy_clan>NEPHILIM_SWORDMAN</enemy_clan>
+				<ignore_npc_id>21191</ignore_npc_id> <!-- Gigant Cleric -->
+				<ignore_npc_id>21192</ignore_npc_id> <!-- Gigant Officer -->
+				<ignore_npc_id>21193</ignore_npc_id> <!-- Gigant Raider -->
+				<ignore_npc_id>21194</ignore_npc_id> <!-- Gigant Confessor -->
+				<ignore_npc_id>21195</ignore_npc_id> <!-- Gigant Commander -->
+				<ignore_npc_id>21196</ignore_npc_id> <!-- Nephilim Sentinel -->
+				<ignore_npc_id>21197</ignore_npc_id> <!-- Nephilim Priest -->
+				<ignore_npc_id>21198</ignore_npc_id> <!-- Nephilim Swordsman -->
+				<ignore_npc_id>21199</ignore_npc_id> <!-- Nephilim Guard -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -7637,18 +7637,18 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>NEPHILIM_BISHOP</enemy_clan>
-				<enemy_clan>NEPHILIM_CARDINAL</enemy_clan>
-				<enemy_clan>NEPHILIM_CENTURION</enemy_clan>
-				<enemy_clan>NEPHILIM_COMMANDER</enemy_clan>
-				<enemy_clan>NEPHILIM_GUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHGUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHPRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_PRAETORIAN</enemy_clan>
-				<enemy_clan>NEPHILIM_PRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_SCOUT</enemy_clan>
-				<enemy_clan>NEPHILIM_SENTINEL</enemy_clan>
-				<enemy_clan>NEPHILIM_SWORDMAN</enemy_clan>
+				<ignore_npc_id>21196</ignore_npc_id> <!-- Nephilim Sentinel -->
+				<ignore_npc_id>21197</ignore_npc_id> <!-- Nephilim Priest -->
+				<ignore_npc_id>21198</ignore_npc_id> <!-- Nephilim Swordsman -->
+				<ignore_npc_id>21199</ignore_npc_id> <!-- Nephilim Guard -->
+				<ignore_npc_id>21200</ignore_npc_id> <!-- Nephilim Bishop -->
+				<ignore_npc_id>21201</ignore_npc_id> <!-- Nephilim Centurion -->
+				<ignore_npc_id>21202</ignore_npc_id> <!-- Nephilim Scout -->
+				<ignore_npc_id>21203</ignore_npc_id> <!-- Nephilim Archbishop -->
+				<ignore_npc_id>21204</ignore_npc_id> <!-- Nephilim Praetorian -->
+				<ignore_npc_id>21205</ignore_npc_id> <!-- Nephilim Royal Guard -->
+				<ignore_npc_id>21206</ignore_npc_id> <!-- Nephilim Cardinal -->
+				<ignore_npc_id>21207</ignore_npc_id> <!-- Nephilim Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -7748,18 +7748,18 @@
 		<ai type="BALANCED" aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>NEPHILIM_BISHOP</enemy_clan>
-				<enemy_clan>NEPHILIM_CARDINAL</enemy_clan>
-				<enemy_clan>NEPHILIM_CENTURION</enemy_clan>
-				<enemy_clan>NEPHILIM_COMMANDER</enemy_clan>
-				<enemy_clan>NEPHILIM_GUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHGUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHPRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_PRAETORIAN</enemy_clan>
-				<enemy_clan>NEPHILIM_PRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_SCOUT</enemy_clan>
-				<enemy_clan>NEPHILIM_SENTINEL</enemy_clan>
-				<enemy_clan>NEPHILIM_SWORDMAN</enemy_clan>
+				<ignore_npc_id>21196</ignore_npc_id> <!-- Nephilim Sentinel -->
+				<ignore_npc_id>21197</ignore_npc_id> <!-- Nephilim Priest -->
+				<ignore_npc_id>21198</ignore_npc_id> <!-- Nephilim Swordsman -->
+				<ignore_npc_id>21199</ignore_npc_id> <!-- Nephilim Guard -->
+				<ignore_npc_id>21200</ignore_npc_id> <!-- Nephilim Bishop -->
+				<ignore_npc_id>21201</ignore_npc_id> <!-- Nephilim Centurion -->
+				<ignore_npc_id>21202</ignore_npc_id> <!-- Nephilim Scout -->
+				<ignore_npc_id>21203</ignore_npc_id> <!-- Nephilim Archbishop -->
+				<ignore_npc_id>21204</ignore_npc_id> <!-- Nephilim Praetorian -->
+				<ignore_npc_id>21205</ignore_npc_id> <!-- Nephilim Royal Guard -->
+				<ignore_npc_id>21206</ignore_npc_id> <!-- Nephilim Cardinal -->
+				<ignore_npc_id>21207</ignore_npc_id> <!-- Nephilim Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -7859,18 +7859,18 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>NEPHILIM_BISHOP</enemy_clan>
-				<enemy_clan>NEPHILIM_CARDINAL</enemy_clan>
-				<enemy_clan>NEPHILIM_CENTURION</enemy_clan>
-				<enemy_clan>NEPHILIM_COMMANDER</enemy_clan>
-				<enemy_clan>NEPHILIM_GUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHGUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHPRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_PRAETORIAN</enemy_clan>
-				<enemy_clan>NEPHILIM_PRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_SCOUT</enemy_clan>
-				<enemy_clan>NEPHILIM_SENTINEL</enemy_clan>
-				<enemy_clan>NEPHILIM_SWORDMAN</enemy_clan>
+				<ignore_npc_id>21196</ignore_npc_id> <!-- Nephilim Sentinel -->
+				<ignore_npc_id>21197</ignore_npc_id> <!-- Nephilim Priest -->
+				<ignore_npc_id>21198</ignore_npc_id> <!-- Nephilim Swordsman -->
+				<ignore_npc_id>21199</ignore_npc_id> <!-- Nephilim Guard -->
+				<ignore_npc_id>21200</ignore_npc_id> <!-- Nephilim Bishop -->
+				<ignore_npc_id>21201</ignore_npc_id> <!-- Nephilim Centurion -->
+				<ignore_npc_id>21202</ignore_npc_id> <!-- Nephilim Scout -->
+				<ignore_npc_id>21203</ignore_npc_id> <!-- Nephilim Archbishop -->
+				<ignore_npc_id>21204</ignore_npc_id> <!-- Nephilim Praetorian -->
+				<ignore_npc_id>21205</ignore_npc_id> <!-- Nephilim Royal Guard -->
+				<ignore_npc_id>21206</ignore_npc_id> <!-- Nephilim Cardinal -->
+				<ignore_npc_id>21207</ignore_npc_id> <!-- Nephilim Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -7961,18 +7961,18 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>NEPHILIM_BISHOP</enemy_clan>
-				<enemy_clan>NEPHILIM_CARDINAL</enemy_clan>
-				<enemy_clan>NEPHILIM_CENTURION</enemy_clan>
-				<enemy_clan>NEPHILIM_COMMANDER</enemy_clan>
-				<enemy_clan>NEPHILIM_GUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHGUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHPRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_PRAETORIAN</enemy_clan>
-				<enemy_clan>NEPHILIM_PRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_SCOUT</enemy_clan>
-				<enemy_clan>NEPHILIM_SENTINEL</enemy_clan>
-				<enemy_clan>NEPHILIM_SWORDMAN</enemy_clan>
+				<ignore_npc_id>21196</ignore_npc_id> <!-- Nephilim Sentinel -->
+				<ignore_npc_id>21197</ignore_npc_id> <!-- Nephilim Priest -->
+				<ignore_npc_id>21198</ignore_npc_id> <!-- Nephilim Swordsman -->
+				<ignore_npc_id>21199</ignore_npc_id> <!-- Nephilim Guard -->
+				<ignore_npc_id>21200</ignore_npc_id> <!-- Nephilim Bishop -->
+				<ignore_npc_id>21201</ignore_npc_id> <!-- Nephilim Centurion -->
+				<ignore_npc_id>21202</ignore_npc_id> <!-- Nephilim Scout -->
+				<ignore_npc_id>21203</ignore_npc_id> <!-- Nephilim Archbishop -->
+				<ignore_npc_id>21204</ignore_npc_id> <!-- Nephilim Praetorian -->
+				<ignore_npc_id>21205</ignore_npc_id> <!-- Nephilim Royal Guard -->
+				<ignore_npc_id>21206</ignore_npc_id> <!-- Nephilim Cardinal -->
+				<ignore_npc_id>21207</ignore_npc_id> <!-- Nephilim Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -8068,18 +8068,18 @@
 		<ai type="BALANCED" aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>NEPHILIM_BISHOP</enemy_clan>
-				<enemy_clan>NEPHILIM_CARDINAL</enemy_clan>
-				<enemy_clan>NEPHILIM_CENTURION</enemy_clan>
-				<enemy_clan>NEPHILIM_COMMANDER</enemy_clan>
-				<enemy_clan>NEPHILIM_GUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHGUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHPRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_PRAETORIAN</enemy_clan>
-				<enemy_clan>NEPHILIM_PRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_SCOUT</enemy_clan>
-				<enemy_clan>NEPHILIM_SENTINEL</enemy_clan>
-				<enemy_clan>NEPHILIM_SWORDMAN</enemy_clan>
+				<ignore_npc_id>21196</ignore_npc_id> <!-- Nephilim Sentinel -->
+				<ignore_npc_id>21197</ignore_npc_id> <!-- Nephilim Priest -->
+				<ignore_npc_id>21198</ignore_npc_id> <!-- Nephilim Swordsman -->
+				<ignore_npc_id>21199</ignore_npc_id> <!-- Nephilim Guard -->
+				<ignore_npc_id>21200</ignore_npc_id> <!-- Nephilim Bishop -->
+				<ignore_npc_id>21201</ignore_npc_id> <!-- Nephilim Centurion -->
+				<ignore_npc_id>21202</ignore_npc_id> <!-- Nephilim Scout -->
+				<ignore_npc_id>21203</ignore_npc_id> <!-- Nephilim Archbishop -->
+				<ignore_npc_id>21204</ignore_npc_id> <!-- Nephilim Praetorian -->
+				<ignore_npc_id>21205</ignore_npc_id> <!-- Nephilim Royal Guard -->
+				<ignore_npc_id>21206</ignore_npc_id> <!-- Nephilim Cardinal -->
+				<ignore_npc_id>21207</ignore_npc_id> <!-- Nephilim Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -8176,18 +8176,18 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>NEPHILIM_BISHOP</enemy_clan>
-				<enemy_clan>NEPHILIM_CARDINAL</enemy_clan>
-				<enemy_clan>NEPHILIM_CENTURION</enemy_clan>
-				<enemy_clan>NEPHILIM_COMMANDER</enemy_clan>
-				<enemy_clan>NEPHILIM_GUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHGUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHPRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_PRAETORIAN</enemy_clan>
-				<enemy_clan>NEPHILIM_PRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_SCOUT</enemy_clan>
-				<enemy_clan>NEPHILIM_SENTINEL</enemy_clan>
-				<enemy_clan>NEPHILIM_SWORDMAN</enemy_clan>
+				<ignore_npc_id>21196</ignore_npc_id> <!-- Nephilim Sentinel -->
+				<ignore_npc_id>21197</ignore_npc_id> <!-- Nephilim Priest -->
+				<ignore_npc_id>21198</ignore_npc_id> <!-- Nephilim Swordsman -->
+				<ignore_npc_id>21199</ignore_npc_id> <!-- Nephilim Guard -->
+				<ignore_npc_id>21200</ignore_npc_id> <!-- Nephilim Bishop -->
+				<ignore_npc_id>21201</ignore_npc_id> <!-- Nephilim Centurion -->
+				<ignore_npc_id>21202</ignore_npc_id> <!-- Nephilim Scout -->
+				<ignore_npc_id>21203</ignore_npc_id> <!-- Nephilim Archbishop -->
+				<ignore_npc_id>21204</ignore_npc_id> <!-- Nephilim Praetorian -->
+				<ignore_npc_id>21205</ignore_npc_id> <!-- Nephilim Royal Guard -->
+				<ignore_npc_id>21206</ignore_npc_id> <!-- Nephilim Cardinal -->
+				<ignore_npc_id>21207</ignore_npc_id> <!-- Nephilim Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -8275,18 +8275,18 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>NEPHILIM_BISHOP</enemy_clan>
-				<enemy_clan>NEPHILIM_CARDINAL</enemy_clan>
-				<enemy_clan>NEPHILIM_CENTURION</enemy_clan>
-				<enemy_clan>NEPHILIM_COMMANDER</enemy_clan>
-				<enemy_clan>NEPHILIM_GUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHGUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHPRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_PRAETORIAN</enemy_clan>
-				<enemy_clan>NEPHILIM_PRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_SCOUT</enemy_clan>
-				<enemy_clan>NEPHILIM_SENTINEL</enemy_clan>
-				<enemy_clan>NEPHILIM_SWORDMAN</enemy_clan>
+				<ignore_npc_id>21196</ignore_npc_id> <!-- Nephilim Sentinel -->
+				<ignore_npc_id>21197</ignore_npc_id> <!-- Nephilim Priest -->
+				<ignore_npc_id>21198</ignore_npc_id> <!-- Nephilim Swordsman -->
+				<ignore_npc_id>21199</ignore_npc_id> <!-- Nephilim Guard -->
+				<ignore_npc_id>21200</ignore_npc_id> <!-- Nephilim Bishop -->
+				<ignore_npc_id>21201</ignore_npc_id> <!-- Nephilim Centurion -->
+				<ignore_npc_id>21202</ignore_npc_id> <!-- Nephilim Scout -->
+				<ignore_npc_id>21203</ignore_npc_id> <!-- Nephilim Archbishop -->
+				<ignore_npc_id>21204</ignore_npc_id> <!-- Nephilim Praetorian -->
+				<ignore_npc_id>21205</ignore_npc_id> <!-- Nephilim Royal Guard -->
+				<ignore_npc_id>21206</ignore_npc_id> <!-- Nephilim Cardinal -->
+				<ignore_npc_id>21207</ignore_npc_id> <!-- Nephilim Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -8381,18 +8381,18 @@
 		<ai type="MAGE" aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>NEPHILIM_BISHOP</enemy_clan>
-				<enemy_clan>NEPHILIM_CARDINAL</enemy_clan>
-				<enemy_clan>NEPHILIM_CENTURION</enemy_clan>
-				<enemy_clan>NEPHILIM_COMMANDER</enemy_clan>
-				<enemy_clan>NEPHILIM_GUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHGUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHPRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_PRAETORIAN</enemy_clan>
-				<enemy_clan>NEPHILIM_PRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_SCOUT</enemy_clan>
-				<enemy_clan>NEPHILIM_SENTINEL</enemy_clan>
-				<enemy_clan>NEPHILIM_SWORDMAN</enemy_clan>
+				<ignore_npc_id>21196</ignore_npc_id> <!-- Nephilim Sentinel -->
+				<ignore_npc_id>21197</ignore_npc_id> <!-- Nephilim Priest -->
+				<ignore_npc_id>21198</ignore_npc_id> <!-- Nephilim Swordsman -->
+				<ignore_npc_id>21199</ignore_npc_id> <!-- Nephilim Guard -->
+				<ignore_npc_id>21200</ignore_npc_id> <!-- Nephilim Bishop -->
+				<ignore_npc_id>21201</ignore_npc_id> <!-- Nephilim Centurion -->
+				<ignore_npc_id>21202</ignore_npc_id> <!-- Nephilim Scout -->
+				<ignore_npc_id>21203</ignore_npc_id> <!-- Nephilim Archbishop -->
+				<ignore_npc_id>21204</ignore_npc_id> <!-- Nephilim Praetorian -->
+				<ignore_npc_id>21205</ignore_npc_id> <!-- Nephilim Royal Guard -->
+				<ignore_npc_id>21206</ignore_npc_id> <!-- Nephilim Cardinal -->
+				<ignore_npc_id>21207</ignore_npc_id> <!-- Nephilim Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -8485,18 +8485,18 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>NEPHILIM_BISHOP</enemy_clan>
-				<enemy_clan>NEPHILIM_CARDINAL</enemy_clan>
-				<enemy_clan>NEPHILIM_CENTURION</enemy_clan>
-				<enemy_clan>NEPHILIM_COMMANDER</enemy_clan>
-				<enemy_clan>NEPHILIM_GUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHGUARD</enemy_clan>
-				<enemy_clan>NEPHILIM_HIGHPRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_PRAETORIAN</enemy_clan>
-				<enemy_clan>NEPHILIM_PRIEST</enemy_clan>
-				<enemy_clan>NEPHILIM_SCOUT</enemy_clan>
-				<enemy_clan>NEPHILIM_SENTINEL</enemy_clan>
-				<enemy_clan>NEPHILIM_SWORDMAN</enemy_clan>
+				<ignore_npc_id>21196</ignore_npc_id> <!-- Nephilim Sentinel -->
+				<ignore_npc_id>21197</ignore_npc_id> <!-- Nephilim Priest -->
+				<ignore_npc_id>21198</ignore_npc_id> <!-- Nephilim Swordsman -->
+				<ignore_npc_id>21199</ignore_npc_id> <!-- Nephilim Guard -->
+				<ignore_npc_id>21200</ignore_npc_id> <!-- Nephilim Bishop -->
+				<ignore_npc_id>21201</ignore_npc_id> <!-- Nephilim Centurion -->
+				<ignore_npc_id>21202</ignore_npc_id> <!-- Nephilim Scout -->
+				<ignore_npc_id>21203</ignore_npc_id> <!-- Nephilim Archbishop -->
+				<ignore_npc_id>21204</ignore_npc_id> <!-- Nephilim Praetorian -->
+				<ignore_npc_id>21205</ignore_npc_id> <!-- Nephilim Royal Guard -->
+				<ignore_npc_id>21206</ignore_npc_id> <!-- Nephilim Cardinal -->
+				<ignore_npc_id>21207</ignore_npc_id> <!-- Nephilim Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -8584,15 +8584,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LITH_ADEPT</enemy_clan>
-				<enemy_clan>LITH_COMMANDER</enemy_clan>
-				<enemy_clan>LITH_GUARD</enemy_clan>
-				<enemy_clan>LITH_MEDIUM</enemy_clan>
-				<enemy_clan>LITH_PATROLMAN</enemy_clan>
-				<enemy_clan>LITH_SCOUT</enemy_clan>
-				<enemy_clan>LITH_SHAMAN</enemy_clan>
-				<enemy_clan>LITH_WARLORD</enemy_clan>
-				<enemy_clan>LITH_WARRIOR</enemy_clan>
+				<ignore_npc_id>21166</ignore_npc_id> <!-- Lith Scout -->
+				<ignore_npc_id>21167</ignore_npc_id> <!-- Lith Witch -->
+				<ignore_npc_id>21168</ignore_npc_id> <!-- Lith Warrior -->
+				<ignore_npc_id>21169</ignore_npc_id> <!-- Lith Guard -->
+				<ignore_npc_id>21170</ignore_npc_id> <!-- Lith Medium -->
+				<ignore_npc_id>21171</ignore_npc_id> <!-- Lith Overlord -->
+				<ignore_npc_id>21172</ignore_npc_id> <!-- Lith Patrolman -->
+				<ignore_npc_id>21173</ignore_npc_id> <!-- Lith Shaman -->
+				<ignore_npc_id>21174</ignore_npc_id> <!-- Lith Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -8678,15 +8678,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LITH_ADEPT</enemy_clan>
-				<enemy_clan>LITH_COMMANDER</enemy_clan>
-				<enemy_clan>LITH_GUARD</enemy_clan>
-				<enemy_clan>LITH_MEDIUM</enemy_clan>
-				<enemy_clan>LITH_PATROLMAN</enemy_clan>
-				<enemy_clan>LITH_SCOUT</enemy_clan>
-				<enemy_clan>LITH_SHAMAN</enemy_clan>
-				<enemy_clan>LITH_WARLORD</enemy_clan>
-				<enemy_clan>LITH_WARRIOR</enemy_clan>
+				<ignore_npc_id>21166</ignore_npc_id> <!-- Lith Scout -->
+				<ignore_npc_id>21167</ignore_npc_id> <!-- Lith Witch -->
+				<ignore_npc_id>21168</ignore_npc_id> <!-- Lith Warrior -->
+				<ignore_npc_id>21169</ignore_npc_id> <!-- Lith Guard -->
+				<ignore_npc_id>21170</ignore_npc_id> <!-- Lith Medium -->
+				<ignore_npc_id>21171</ignore_npc_id> <!-- Lith Overlord -->
+				<ignore_npc_id>21172</ignore_npc_id> <!-- Lith Patrolman -->
+				<ignore_npc_id>21173</ignore_npc_id> <!-- Lith Shaman -->
+				<ignore_npc_id>21174</ignore_npc_id> <!-- Lith Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -8771,15 +8771,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LITH_ADEPT</enemy_clan>
-				<enemy_clan>LITH_COMMANDER</enemy_clan>
-				<enemy_clan>LITH_GUARD</enemy_clan>
-				<enemy_clan>LITH_MEDIUM</enemy_clan>
-				<enemy_clan>LITH_PATROLMAN</enemy_clan>
-				<enemy_clan>LITH_SCOUT</enemy_clan>
-				<enemy_clan>LITH_SHAMAN</enemy_clan>
-				<enemy_clan>LITH_WARLORD</enemy_clan>
-				<enemy_clan>LITH_WARRIOR</enemy_clan>
+				<ignore_npc_id>21166</ignore_npc_id> <!-- Lith Scout -->
+				<ignore_npc_id>21167</ignore_npc_id> <!-- Lith Witch -->
+				<ignore_npc_id>21168</ignore_npc_id> <!-- Lith Warrior -->
+				<ignore_npc_id>21169</ignore_npc_id> <!-- Lith Guard -->
+				<ignore_npc_id>21170</ignore_npc_id> <!-- Lith Medium -->
+				<ignore_npc_id>21171</ignore_npc_id> <!-- Lith Overlord -->
+				<ignore_npc_id>21172</ignore_npc_id> <!-- Lith Patrolman -->
+				<ignore_npc_id>21173</ignore_npc_id> <!-- Lith Shaman -->
+				<ignore_npc_id>21174</ignore_npc_id> <!-- Lith Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -8864,15 +8864,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LITH_ADEPT</enemy_clan>
-				<enemy_clan>LITH_COMMANDER</enemy_clan>
-				<enemy_clan>LITH_GUARD</enemy_clan>
-				<enemy_clan>LITH_MEDIUM</enemy_clan>
-				<enemy_clan>LITH_PATROLMAN</enemy_clan>
-				<enemy_clan>LITH_SCOUT</enemy_clan>
-				<enemy_clan>LITH_SHAMAN</enemy_clan>
-				<enemy_clan>LITH_WARLORD</enemy_clan>
-				<enemy_clan>LITH_WARRIOR</enemy_clan>
+				<ignore_npc_id>21166</ignore_npc_id> <!-- Lith Scout -->
+				<ignore_npc_id>21167</ignore_npc_id> <!-- Lith Witch -->
+				<ignore_npc_id>21168</ignore_npc_id> <!-- Lith Warrior -->
+				<ignore_npc_id>21169</ignore_npc_id> <!-- Lith Guard -->
+				<ignore_npc_id>21170</ignore_npc_id> <!-- Lith Medium -->
+				<ignore_npc_id>21171</ignore_npc_id> <!-- Lith Overlord -->
+				<ignore_npc_id>21172</ignore_npc_id> <!-- Lith Patrolman -->
+				<ignore_npc_id>21173</ignore_npc_id> <!-- Lith Shaman -->
+				<ignore_npc_id>21174</ignore_npc_id> <!-- Lith Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -8956,15 +8956,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LITH_ADEPT</enemy_clan>
-				<enemy_clan>LITH_COMMANDER</enemy_clan>
-				<enemy_clan>LITH_GUARD</enemy_clan>
-				<enemy_clan>LITH_MEDIUM</enemy_clan>
-				<enemy_clan>LITH_PATROLMAN</enemy_clan>
-				<enemy_clan>LITH_SCOUT</enemy_clan>
-				<enemy_clan>LITH_SHAMAN</enemy_clan>
-				<enemy_clan>LITH_WARLORD</enemy_clan>
-				<enemy_clan>LITH_WARRIOR</enemy_clan>
+				<ignore_npc_id>21166</ignore_npc_id> <!-- Lith Scout -->
+				<ignore_npc_id>21167</ignore_npc_id> <!-- Lith Witch -->
+				<ignore_npc_id>21168</ignore_npc_id> <!-- Lith Warrior -->
+				<ignore_npc_id>21169</ignore_npc_id> <!-- Lith Guard -->
+				<ignore_npc_id>21170</ignore_npc_id> <!-- Lith Medium -->
+				<ignore_npc_id>21171</ignore_npc_id> <!-- Lith Overlord -->
+				<ignore_npc_id>21172</ignore_npc_id> <!-- Lith Patrolman -->
+				<ignore_npc_id>21173</ignore_npc_id> <!-- Lith Shaman -->
+				<ignore_npc_id>21174</ignore_npc_id> <!-- Lith Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -9051,15 +9051,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LITH_ADEPT</enemy_clan>
-				<enemy_clan>LITH_COMMANDER</enemy_clan>
-				<enemy_clan>LITH_GUARD</enemy_clan>
-				<enemy_clan>LITH_MEDIUM</enemy_clan>
-				<enemy_clan>LITH_PATROLMAN</enemy_clan>
-				<enemy_clan>LITH_SCOUT</enemy_clan>
-				<enemy_clan>LITH_SHAMAN</enemy_clan>
-				<enemy_clan>LITH_WARLORD</enemy_clan>
-				<enemy_clan>LITH_WARRIOR</enemy_clan>
+				<ignore_npc_id>21166</ignore_npc_id> <!-- Lith Scout -->
+				<ignore_npc_id>21167</ignore_npc_id> <!-- Lith Witch -->
+				<ignore_npc_id>21168</ignore_npc_id> <!-- Lith Warrior -->
+				<ignore_npc_id>21169</ignore_npc_id> <!-- Lith Guard -->
+				<ignore_npc_id>21170</ignore_npc_id> <!-- Lith Medium -->
+				<ignore_npc_id>21171</ignore_npc_id> <!-- Lith Overlord -->
+				<ignore_npc_id>21172</ignore_npc_id> <!-- Lith Patrolman -->
+				<ignore_npc_id>21173</ignore_npc_id> <!-- Lith Shaman -->
+				<ignore_npc_id>21174</ignore_npc_id> <!-- Lith Commander -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -9149,15 +9149,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LILIM_BUTCHER</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_ERRANT</enemy_clan>
-				<enemy_clan>LILIM_MARAUDER</enemy_clan>
-				<enemy_clan>LILIM_SORCEROR</enemy_clan>
-				<enemy_clan>LITH_COMMANDER</enemy_clan>
-				<enemy_clan>LITH_MEDIUM</enemy_clan>
-				<enemy_clan>LITH_PATROLMAN</enemy_clan>
-				<enemy_clan>LITH_SHAMAN</enemy_clan>
-				<enemy_clan>LITH_WARLORD</enemy_clan>
+				<ignore_npc_id>21170</ignore_npc_id> <!-- Lith Medium -->
+				<ignore_npc_id>21171</ignore_npc_id> <!-- Lith Overlord -->
+				<ignore_npc_id>21172</ignore_npc_id> <!-- Lith Patrolman -->
+				<ignore_npc_id>21173</ignore_npc_id> <!-- Lith Shaman -->
+				<ignore_npc_id>21174</ignore_npc_id> <!-- Lith Commander -->
+				<ignore_npc_id>21175</ignore_npc_id> <!-- Lilim Butcher -->
+				<ignore_npc_id>21176</ignore_npc_id> <!-- Lilim Magus -->
+				<ignore_npc_id>21177</ignore_npc_id> <!-- Lilim Knight-Errant -->
+				<ignore_npc_id>21178</ignore_npc_id> <!-- Lilim Marauder -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -9250,15 +9250,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LILIM_BUTCHER</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_ERRANT</enemy_clan>
-				<enemy_clan>LILIM_MARAUDER</enemy_clan>
-				<enemy_clan>LILIM_SORCEROR</enemy_clan>
-				<enemy_clan>LITH_COMMANDER</enemy_clan>
-				<enemy_clan>LITH_MEDIUM</enemy_clan>
-				<enemy_clan>LITH_PATROLMAN</enemy_clan>
-				<enemy_clan>LITH_SHAMAN</enemy_clan>
-				<enemy_clan>LITH_WARLORD</enemy_clan>
+				<ignore_npc_id>21170</ignore_npc_id> <!-- Lith Medium -->
+				<ignore_npc_id>21171</ignore_npc_id> <!-- Lith Overlord -->
+				<ignore_npc_id>21172</ignore_npc_id> <!-- Lith Patrolman -->
+				<ignore_npc_id>21173</ignore_npc_id> <!-- Lith Shaman -->
+				<ignore_npc_id>21174</ignore_npc_id> <!-- Lith Commander -->
+				<ignore_npc_id>21175</ignore_npc_id> <!-- Lilim Butcher -->
+				<ignore_npc_id>21176</ignore_npc_id> <!-- Lilim Magus -->
+				<ignore_npc_id>21177</ignore_npc_id> <!-- Lilim Knight-Errant -->
+				<ignore_npc_id>21178</ignore_npc_id> <!-- Lilim Marauder -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -9347,15 +9347,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LILIM_BUTCHER</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_ERRANT</enemy_clan>
-				<enemy_clan>LILIM_MARAUDER</enemy_clan>
-				<enemy_clan>LILIM_SORCEROR</enemy_clan>
-				<enemy_clan>LITH_COMMANDER</enemy_clan>
-				<enemy_clan>LITH_MEDIUM</enemy_clan>
-				<enemy_clan>LITH_PATROLMAN</enemy_clan>
-				<enemy_clan>LITH_SHAMAN</enemy_clan>
-				<enemy_clan>LITH_WARLORD</enemy_clan>
+				<ignore_npc_id>21170</ignore_npc_id> <!-- Lith Medium -->
+				<ignore_npc_id>21171</ignore_npc_id> <!-- Lith Overlord -->
+				<ignore_npc_id>21172</ignore_npc_id> <!-- Lith Patrolman -->
+				<ignore_npc_id>21173</ignore_npc_id> <!-- Lith Shaman -->
+				<ignore_npc_id>21174</ignore_npc_id> <!-- Lith Commander -->
+				<ignore_npc_id>21175</ignore_npc_id> <!-- Lilim Butcher -->
+				<ignore_npc_id>21176</ignore_npc_id> <!-- Lilim Magus -->
+				<ignore_npc_id>21177</ignore_npc_id> <!-- Lilim Knight-Errant -->
+				<ignore_npc_id>21178</ignore_npc_id> <!-- Lilim Marauder -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -9443,15 +9443,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LILIM_BUTCHER</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_ERRANT</enemy_clan>
-				<enemy_clan>LILIM_MARAUDER</enemy_clan>
-				<enemy_clan>LILIM_SORCEROR</enemy_clan>
-				<enemy_clan>LITH_COMMANDER</enemy_clan>
-				<enemy_clan>LITH_MEDIUM</enemy_clan>
-				<enemy_clan>LITH_PATROLMAN</enemy_clan>
-				<enemy_clan>LITH_SHAMAN</enemy_clan>
-				<enemy_clan>LITH_WARLORD</enemy_clan>
+				<ignore_npc_id>21170</ignore_npc_id> <!-- Lith Medium -->
+				<ignore_npc_id>21171</ignore_npc_id> <!-- Lith Overlord -->
+				<ignore_npc_id>21172</ignore_npc_id> <!-- Lith Patrolman -->
+				<ignore_npc_id>21173</ignore_npc_id> <!-- Lith Shaman -->
+				<ignore_npc_id>21174</ignore_npc_id> <!-- Lith Commander -->
+				<ignore_npc_id>21175</ignore_npc_id> <!-- Lilim Butcher -->
+				<ignore_npc_id>21176</ignore_npc_id> <!-- Lilim Magus -->
+				<ignore_npc_id>21177</ignore_npc_id> <!-- Lilim Knight-Errant -->
+				<ignore_npc_id>21178</ignore_npc_id> <!-- Lilim Marauder -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -9544,15 +9544,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LILIM_BUTCHER</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_ERRANT</enemy_clan>
-				<enemy_clan>LILIM_MARAUDER</enemy_clan>
-				<enemy_clan>LILIM_SORCEROR</enemy_clan>
-				<enemy_clan>LITH_COMMANDER</enemy_clan>
-				<enemy_clan>LITH_MEDIUM</enemy_clan>
-				<enemy_clan>LITH_PATROLMAN</enemy_clan>
-				<enemy_clan>LITH_SHAMAN</enemy_clan>
-				<enemy_clan>LITH_WARLORD</enemy_clan>
+				<ignore_npc_id>21170</ignore_npc_id> <!-- Lith Medium -->
+				<ignore_npc_id>21171</ignore_npc_id> <!-- Lith Overlord -->
+				<ignore_npc_id>21172</ignore_npc_id> <!-- Lith Patrolman -->
+				<ignore_npc_id>21173</ignore_npc_id> <!-- Lith Shaman -->
+				<ignore_npc_id>21174</ignore_npc_id> <!-- Lith Commander -->
+				<ignore_npc_id>21175</ignore_npc_id> <!-- Lilim Butcher -->
+				<ignore_npc_id>21176</ignore_npc_id> <!-- Lilim Magus -->
+				<ignore_npc_id>21177</ignore_npc_id> <!-- Lilim Knight-Errant -->
+				<ignore_npc_id>21178</ignore_npc_id> <!-- Lilim Marauder -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -9643,15 +9643,15 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LILIM_BUTCHER</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_ERRANT</enemy_clan>
-				<enemy_clan>LILIM_MARAUDER</enemy_clan>
-				<enemy_clan>LILIM_SORCEROR</enemy_clan>
-				<enemy_clan>LITH_COMMANDER</enemy_clan>
-				<enemy_clan>LITH_MEDIUM</enemy_clan>
-				<enemy_clan>LITH_PATROLMAN</enemy_clan>
-				<enemy_clan>LITH_SHAMAN</enemy_clan>
-				<enemy_clan>LITH_WARLORD</enemy_clan>
+				<ignore_npc_id>21170</ignore_npc_id> <!-- Lith Medium -->
+				<ignore_npc_id>21171</ignore_npc_id> <!-- Lith Overlord -->
+				<ignore_npc_id>21172</ignore_npc_id> <!-- Lith Patrolman -->
+				<ignore_npc_id>21173</ignore_npc_id> <!-- Lith Shaman -->
+				<ignore_npc_id>21174</ignore_npc_id> <!-- Lith Commander -->
+				<ignore_npc_id>21175</ignore_npc_id> <!-- Lilim Butcher -->
+				<ignore_npc_id>21176</ignore_npc_id> <!-- Lilim Magus -->
+				<ignore_npc_id>21177</ignore_npc_id> <!-- Lilim Knight-Errant -->
+				<ignore_npc_id>21178</ignore_npc_id> <!-- Lilim Marauder -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -9743,18 +9743,18 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LILIM_ADVISER</enemy_clan>
-				<enemy_clan>LILIM_ARCHMAGE</enemy_clan>
-				<enemy_clan>LILIM_ASSASSIN</enemy_clan>
-				<enemy_clan>LILIM_BUTCHER</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_ERRANT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_GUARDIAN</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_LORD</enemy_clan>
-				<enemy_clan>LILIM_MARAUDER</enemy_clan>
-				<enemy_clan>LILIM_PRIEST</enemy_clan>
-				<enemy_clan>LILIM_SLAYER</enemy_clan>
-				<enemy_clan>LILIM_SORCEROR</enemy_clan>
+				<ignore_npc_id>21175</ignore_npc_id> <!-- Lilim Butcher -->
+				<ignore_npc_id>21176</ignore_npc_id> <!-- Lilim Magus -->
+				<ignore_npc_id>21177</ignore_npc_id> <!-- Lilim Knight-Errant -->
+				<ignore_npc_id>21178</ignore_npc_id> <!-- Lilim Marauder -->
+				<ignore_npc_id>21179</ignore_npc_id> <!-- Lilim Seer -->
+				<ignore_npc_id>21180</ignore_npc_id> <!-- Lilim Knight -->
+				<ignore_npc_id>21181</ignore_npc_id> <!-- Lilim Assassin -->
+				<ignore_npc_id>21182</ignore_npc_id> <!-- Lilim Soldier -->
+				<ignore_npc_id>21183</ignore_npc_id> <!-- Lilim Knight Commander -->
+				<ignore_npc_id>21184</ignore_npc_id> <!-- Lilim Slayer -->
+				<ignore_npc_id>21185</ignore_npc_id> <!-- Lilim Great Magus -->
+				<ignore_npc_id>21186</ignore_npc_id> <!-- Lilim Guard Knight -->
 			</clan_list>
 		</ai>
 		<drop_lists>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/21200-21300.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/21200-21300.xml
index 8feeff3eb448bc2f7a0e3fb1b1d9afcb2bc6bd1d..47144fb503d56e2eb9c545898017abbfbbe56975 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/21200-21300.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/21200-21300.xml
@@ -56,18 +56,18 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LILIM_ADVISER</enemy_clan>
-				<enemy_clan>LILIM_ARCHMAGE</enemy_clan>
-				<enemy_clan>LILIM_ASSASSIN</enemy_clan>
-				<enemy_clan>LILIM_BUTCHER</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_ERRANT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_GUARDIAN</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_LORD</enemy_clan>
-				<enemy_clan>LILIM_MARAUDER</enemy_clan>
-				<enemy_clan>LILIM_PRIEST</enemy_clan>
-				<enemy_clan>LILIM_SLAYER</enemy_clan>
-				<enemy_clan>LILIM_SORCEROR</enemy_clan>
+				<ignore_npc_id>21175</ignore_npc_id> <!-- Lilim Butcher -->
+				<ignore_npc_id>21176</ignore_npc_id> <!-- Lilim Magus -->
+				<ignore_npc_id>21177</ignore_npc_id> <!-- Lilim Knight-Errant -->
+				<ignore_npc_id>21178</ignore_npc_id> <!-- Lilim Marauder -->
+				<ignore_npc_id>21179</ignore_npc_id> <!-- Lilim Seer -->
+				<ignore_npc_id>21180</ignore_npc_id> <!-- Lilim Knight -->
+				<ignore_npc_id>21181</ignore_npc_id> <!-- Lilim Assassin -->
+				<ignore_npc_id>21182</ignore_npc_id> <!-- Lilim Soldier -->
+				<ignore_npc_id>21183</ignore_npc_id> <!-- Lilim Knight Commander -->
+				<ignore_npc_id>21184</ignore_npc_id> <!-- Lilim Slayer -->
+				<ignore_npc_id>21185</ignore_npc_id> <!-- Lilim Great Magus -->
+				<ignore_npc_id>21186</ignore_npc_id> <!-- Lilim Guard Knight -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -165,18 +165,18 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LILIM_ADVISER</enemy_clan>
-				<enemy_clan>LILIM_ARCHMAGE</enemy_clan>
-				<enemy_clan>LILIM_ASSASSIN</enemy_clan>
-				<enemy_clan>LILIM_BUTCHER</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_ERRANT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_GUARDIAN</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_LORD</enemy_clan>
-				<enemy_clan>LILIM_MARAUDER</enemy_clan>
-				<enemy_clan>LILIM_PRIEST</enemy_clan>
-				<enemy_clan>LILIM_SLAYER</enemy_clan>
-				<enemy_clan>LILIM_SORCEROR</enemy_clan>
+				<ignore_npc_id>21175</ignore_npc_id> <!-- Lilim Butcher -->
+				<ignore_npc_id>21176</ignore_npc_id> <!-- Lilim Magus -->
+				<ignore_npc_id>21177</ignore_npc_id> <!-- Lilim Knight-Errant -->
+				<ignore_npc_id>21178</ignore_npc_id> <!-- Lilim Marauder -->
+				<ignore_npc_id>21179</ignore_npc_id> <!-- Lilim Seer -->
+				<ignore_npc_id>21180</ignore_npc_id> <!-- Lilim Knight -->
+				<ignore_npc_id>21181</ignore_npc_id> <!-- Lilim Assassin -->
+				<ignore_npc_id>21182</ignore_npc_id> <!-- Lilim Soldier -->
+				<ignore_npc_id>21183</ignore_npc_id> <!-- Lilim Knight Commander -->
+				<ignore_npc_id>21184</ignore_npc_id> <!-- Lilim Slayer -->
+				<ignore_npc_id>21185</ignore_npc_id> <!-- Lilim Great Magus -->
+				<ignore_npc_id>21186</ignore_npc_id> <!-- Lilim Guard Knight -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -266,18 +266,18 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LILIM_ADVISER</enemy_clan>
-				<enemy_clan>LILIM_ARCHMAGE</enemy_clan>
-				<enemy_clan>LILIM_ASSASSIN</enemy_clan>
-				<enemy_clan>LILIM_BUTCHER</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_ERRANT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_GUARDIAN</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_LORD</enemy_clan>
-				<enemy_clan>LILIM_MARAUDER</enemy_clan>
-				<enemy_clan>LILIM_PRIEST</enemy_clan>
-				<enemy_clan>LILIM_SLAYER</enemy_clan>
-				<enemy_clan>LILIM_SORCEROR</enemy_clan>
+				<ignore_npc_id>21175</ignore_npc_id> <!-- Lilim Butcher -->
+				<ignore_npc_id>21176</ignore_npc_id> <!-- Lilim Magus -->
+				<ignore_npc_id>21177</ignore_npc_id> <!-- Lilim Knight-Errant -->
+				<ignore_npc_id>21178</ignore_npc_id> <!-- Lilim Marauder -->
+				<ignore_npc_id>21179</ignore_npc_id> <!-- Lilim Seer -->
+				<ignore_npc_id>21180</ignore_npc_id> <!-- Lilim Knight -->
+				<ignore_npc_id>21181</ignore_npc_id> <!-- Lilim Assassin -->
+				<ignore_npc_id>21182</ignore_npc_id> <!-- Lilim Soldier -->
+				<ignore_npc_id>21183</ignore_npc_id> <!-- Lilim Knight Commander -->
+				<ignore_npc_id>21184</ignore_npc_id> <!-- Lilim Slayer -->
+				<ignore_npc_id>21185</ignore_npc_id> <!-- Lilim Great Magus -->
+				<ignore_npc_id>21186</ignore_npc_id> <!-- Lilim Guard Knight -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -372,18 +372,18 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LILIM_ADVISER</enemy_clan>
-				<enemy_clan>LILIM_ARCHMAGE</enemy_clan>
-				<enemy_clan>LILIM_ASSASSIN</enemy_clan>
-				<enemy_clan>LILIM_BUTCHER</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_ERRANT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_GUARDIAN</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_LORD</enemy_clan>
-				<enemy_clan>LILIM_MARAUDER</enemy_clan>
-				<enemy_clan>LILIM_PRIEST</enemy_clan>
-				<enemy_clan>LILIM_SLAYER</enemy_clan>
-				<enemy_clan>LILIM_SORCEROR</enemy_clan>
+				<ignore_npc_id>21175</ignore_npc_id> <!-- Lilim Butcher -->
+				<ignore_npc_id>21176</ignore_npc_id> <!-- Lilim Magus -->
+				<ignore_npc_id>21177</ignore_npc_id> <!-- Lilim Knight-Errant -->
+				<ignore_npc_id>21178</ignore_npc_id> <!-- Lilim Marauder -->
+				<ignore_npc_id>21179</ignore_npc_id> <!-- Lilim Seer -->
+				<ignore_npc_id>21180</ignore_npc_id> <!-- Lilim Knight -->
+				<ignore_npc_id>21181</ignore_npc_id> <!-- Lilim Assassin -->
+				<ignore_npc_id>21182</ignore_npc_id> <!-- Lilim Soldier -->
+				<ignore_npc_id>21183</ignore_npc_id> <!-- Lilim Knight Commander -->
+				<ignore_npc_id>21184</ignore_npc_id> <!-- Lilim Slayer -->
+				<ignore_npc_id>21185</ignore_npc_id> <!-- Lilim Great Magus -->
+				<ignore_npc_id>21186</ignore_npc_id> <!-- Lilim Guard Knight -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -478,18 +478,18 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LILIM_ADVISER</enemy_clan>
-				<enemy_clan>LILIM_ARCHMAGE</enemy_clan>
-				<enemy_clan>LILIM_ASSASSIN</enemy_clan>
-				<enemy_clan>LILIM_BUTCHER</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_ERRANT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_GUARDIAN</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_LORD</enemy_clan>
-				<enemy_clan>LILIM_MARAUDER</enemy_clan>
-				<enemy_clan>LILIM_PRIEST</enemy_clan>
-				<enemy_clan>LILIM_SLAYER</enemy_clan>
-				<enemy_clan>LILIM_SORCEROR</enemy_clan>
+				<ignore_npc_id>21175</ignore_npc_id> <!-- Lilim Butcher -->
+				<ignore_npc_id>21176</ignore_npc_id> <!-- Lilim Magus -->
+				<ignore_npc_id>21177</ignore_npc_id> <!-- Lilim Knight-Errant -->
+				<ignore_npc_id>21178</ignore_npc_id> <!-- Lilim Marauder -->
+				<ignore_npc_id>21179</ignore_npc_id> <!-- Lilim Seer -->
+				<ignore_npc_id>21180</ignore_npc_id> <!-- Lilim Knight -->
+				<ignore_npc_id>21181</ignore_npc_id> <!-- Lilim Assassin -->
+				<ignore_npc_id>21182</ignore_npc_id> <!-- Lilim Soldier -->
+				<ignore_npc_id>21183</ignore_npc_id> <!-- Lilim Knight Commander -->
+				<ignore_npc_id>21184</ignore_npc_id> <!-- Lilim Slayer -->
+				<ignore_npc_id>21185</ignore_npc_id> <!-- Lilim Great Magus -->
+				<ignore_npc_id>21186</ignore_npc_id> <!-- Lilim Guard Knight -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -575,18 +575,18 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LILIM_ADVISER</enemy_clan>
-				<enemy_clan>LILIM_ARCHMAGE</enemy_clan>
-				<enemy_clan>LILIM_ASSASSIN</enemy_clan>
-				<enemy_clan>LILIM_BUTCHER</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_ERRANT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_GUARDIAN</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_LORD</enemy_clan>
-				<enemy_clan>LILIM_MARAUDER</enemy_clan>
-				<enemy_clan>LILIM_PRIEST</enemy_clan>
-				<enemy_clan>LILIM_SLAYER</enemy_clan>
-				<enemy_clan>LILIM_SORCEROR</enemy_clan>
+				<ignore_npc_id>21175</ignore_npc_id> <!-- Lilim Butcher -->
+				<ignore_npc_id>21176</ignore_npc_id> <!-- Lilim Magus -->
+				<ignore_npc_id>21177</ignore_npc_id> <!-- Lilim Knight-Errant -->
+				<ignore_npc_id>21178</ignore_npc_id> <!-- Lilim Marauder -->
+				<ignore_npc_id>21179</ignore_npc_id> <!-- Lilim Seer -->
+				<ignore_npc_id>21180</ignore_npc_id> <!-- Lilim Knight -->
+				<ignore_npc_id>21181</ignore_npc_id> <!-- Lilim Assassin -->
+				<ignore_npc_id>21182</ignore_npc_id> <!-- Lilim Soldier -->
+				<ignore_npc_id>21183</ignore_npc_id> <!-- Lilim Knight Commander -->
+				<ignore_npc_id>21184</ignore_npc_id> <!-- Lilim Slayer -->
+				<ignore_npc_id>21185</ignore_npc_id> <!-- Lilim Great Magus -->
+				<ignore_npc_id>21186</ignore_npc_id> <!-- Lilim Guard Knight -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -675,18 +675,18 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LILIM_ADVISER</enemy_clan>
-				<enemy_clan>LILIM_ARCHMAGE</enemy_clan>
-				<enemy_clan>LILIM_ASSASSIN</enemy_clan>
-				<enemy_clan>LILIM_BUTCHER</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_ERRANT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_GUARDIAN</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_LORD</enemy_clan>
-				<enemy_clan>LILIM_MARAUDER</enemy_clan>
-				<enemy_clan>LILIM_PRIEST</enemy_clan>
-				<enemy_clan>LILIM_SLAYER</enemy_clan>
-				<enemy_clan>LILIM_SORCEROR</enemy_clan>
+				<ignore_npc_id>21175</ignore_npc_id> <!-- Lilim Butcher -->
+				<ignore_npc_id>21176</ignore_npc_id> <!-- Lilim Magus -->
+				<ignore_npc_id>21177</ignore_npc_id> <!-- Lilim Knight-Errant -->
+				<ignore_npc_id>21178</ignore_npc_id> <!-- Lilim Marauder -->
+				<ignore_npc_id>21179</ignore_npc_id> <!-- Lilim Seer -->
+				<ignore_npc_id>21180</ignore_npc_id> <!-- Lilim Knight -->
+				<ignore_npc_id>21181</ignore_npc_id> <!-- Lilim Assassin -->
+				<ignore_npc_id>21182</ignore_npc_id> <!-- Lilim Soldier -->
+				<ignore_npc_id>21183</ignore_npc_id> <!-- Lilim Knight Commander -->
+				<ignore_npc_id>21184</ignore_npc_id> <!-- Lilim Slayer -->
+				<ignore_npc_id>21185</ignore_npc_id> <!-- Lilim Great Magus -->
+				<ignore_npc_id>21186</ignore_npc_id> <!-- Lilim Guard Knight -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -777,18 +777,18 @@
 		<ai aggroRange="800" clanHelpRange="400" isAggressive="false">
 			<clan_list>
 				<clan>C_DUNGEON</clan>
-				<enemy_clan>LILIM_ADVISER</enemy_clan>
-				<enemy_clan>LILIM_ARCHMAGE</enemy_clan>
-				<enemy_clan>LILIM_ASSASSIN</enemy_clan>
-				<enemy_clan>LILIM_BUTCHER</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_ERRANT</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_GUARDIAN</enemy_clan>
-				<enemy_clan>LILIM_KNIGHT_LORD</enemy_clan>
-				<enemy_clan>LILIM_MARAUDER</enemy_clan>
-				<enemy_clan>LILIM_PRIEST</enemy_clan>
-				<enemy_clan>LILIM_SLAYER</enemy_clan>
-				<enemy_clan>LILIM_SORCEROR</enemy_clan>
+				<ignore_npc_id>21175</ignore_npc_id> <!-- Lilim Butcher -->
+				<ignore_npc_id>21176</ignore_npc_id> <!-- Lilim Magus -->
+				<ignore_npc_id>21177</ignore_npc_id> <!-- Lilim Knight-Errant -->
+				<ignore_npc_id>21178</ignore_npc_id> <!-- Lilim Marauder -->
+				<ignore_npc_id>21179</ignore_npc_id> <!-- Lilim Seer -->
+				<ignore_npc_id>21180</ignore_npc_id> <!-- Lilim Knight -->
+				<ignore_npc_id>21181</ignore_npc_id> <!-- Lilim Assassin -->
+				<ignore_npc_id>21182</ignore_npc_id> <!-- Lilim Soldier -->
+				<ignore_npc_id>21183</ignore_npc_id> <!-- Lilim Knight Commander -->
+				<ignore_npc_id>21184</ignore_npc_id> <!-- Lilim Slayer -->
+				<ignore_npc_id>21185</ignore_npc_id> <!-- Lilim Great Magus -->
+				<ignore_npc_id>21186</ignore_npc_id> <!-- Lilim Guard Knight -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -5639,15 +5639,15 @@
 		<ai aggroRange="1000" clanHelpRange="500" isAggressive="false">
 			<clan_list>
 				<clan>ANT</clan>
-				<enemy_clan>CAVE_ANT_2A</enemy_clan>
-				<enemy_clan>CAVE_ANT_4</enemy_clan>
-				<enemy_clan>CAVE_ANT_LAVA_2A</enemy_clan>
-				<enemy_clan>CAVE_ANT_LAVA_2B</enemy_clan>
-				<enemy_clan>CAVE_ANT_LAVA_2D</enemy_clan>
-				<enemy_clan>CAVE_ANT_LAVA_4</enemy_clan>
-				<enemy_clan>CAVE_NOBLE_ANT_4</enemy_clan>
-				<enemy_clan>CAVE_RECRUIT_2B</enemy_clan>
-				<enemy_clan>CAVE_RECRUIT_4</enemy_clan>
+				<ignore_npc_id>21265</ignore_npc_id> <!-- Cave Ant Larva -->
+				<ignore_npc_id>21266</ignore_npc_id> <!-- Cave Ant Larva -->
+				<ignore_npc_id>21267</ignore_npc_id> <!-- Cave Ant Larva -->
+				<ignore_npc_id>21268</ignore_npc_id> <!-- Cave Ant Larva -->
+				<ignore_npc_id>21269</ignore_npc_id> <!-- Cave Ant -->
+				<ignore_npc_id>21270</ignore_npc_id> <!-- Cave Ant Soldier -->
+				<ignore_npc_id>21271</ignore_npc_id> <!-- Cave Ant -->
+				<ignore_npc_id>21272</ignore_npc_id> <!-- Cave Ant Soldier -->
+				<ignore_npc_id>21273</ignore_npc_id> <!-- Cave Noble Ant -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -5759,15 +5759,15 @@
 		<ai aggroRange="1000" clanHelpRange="500" isAggressive="false">
 			<clan_list>
 				<clan>ANT</clan>
-				<enemy_clan>CAVE_ANT_2A</enemy_clan>
-				<enemy_clan>CAVE_ANT_4</enemy_clan>
-				<enemy_clan>CAVE_ANT_LAVA_2A</enemy_clan>
-				<enemy_clan>CAVE_ANT_LAVA_2B</enemy_clan>
-				<enemy_clan>CAVE_ANT_LAVA_2D</enemy_clan>
-				<enemy_clan>CAVE_ANT_LAVA_4</enemy_clan>
-				<enemy_clan>CAVE_NOBLE_ANT_4</enemy_clan>
-				<enemy_clan>CAVE_RECRUIT_2B</enemy_clan>
-				<enemy_clan>CAVE_RECRUIT_4</enemy_clan>
+				<ignore_npc_id>21265</ignore_npc_id> <!-- Cave Ant Larva -->
+				<ignore_npc_id>21266</ignore_npc_id> <!-- Cave Ant Larva -->
+				<ignore_npc_id>21267</ignore_npc_id> <!-- Cave Ant Larva -->
+				<ignore_npc_id>21268</ignore_npc_id> <!-- Cave Ant Larva -->
+				<ignore_npc_id>21269</ignore_npc_id> <!-- Cave Ant -->
+				<ignore_npc_id>21270</ignore_npc_id> <!-- Cave Ant Soldier -->
+				<ignore_npc_id>21271</ignore_npc_id> <!-- Cave Ant -->
+				<ignore_npc_id>21272</ignore_npc_id> <!-- Cave Ant Soldier -->
+				<ignore_npc_id>21273</ignore_npc_id> <!-- Cave Noble Ant -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -5856,15 +5856,15 @@
 		<ai aggroRange="1000" clanHelpRange="500" isAggressive="false">
 			<clan_list>
 				<clan>ANT</clan>
-				<enemy_clan>CAVE_ANT_2A</enemy_clan>
-				<enemy_clan>CAVE_ANT_4</enemy_clan>
-				<enemy_clan>CAVE_ANT_LAVA_2A</enemy_clan>
-				<enemy_clan>CAVE_ANT_LAVA_2B</enemy_clan>
-				<enemy_clan>CAVE_ANT_LAVA_2D</enemy_clan>
-				<enemy_clan>CAVE_ANT_LAVA_4</enemy_clan>
-				<enemy_clan>CAVE_NOBLE_ANT_4</enemy_clan>
-				<enemy_clan>CAVE_RECRUIT_2B</enemy_clan>
-				<enemy_clan>CAVE_RECRUIT_4</enemy_clan>
+				<ignore_npc_id>21265</ignore_npc_id> <!-- Cave Ant Larva -->
+				<ignore_npc_id>21266</ignore_npc_id> <!-- Cave Ant Larva -->
+				<ignore_npc_id>21267</ignore_npc_id> <!-- Cave Ant Larva -->
+				<ignore_npc_id>21268</ignore_npc_id> <!-- Cave Ant Larva -->
+				<ignore_npc_id>21269</ignore_npc_id> <!-- Cave Ant -->
+				<ignore_npc_id>21270</ignore_npc_id> <!-- Cave Ant Soldier -->
+				<ignore_npc_id>21271</ignore_npc_id> <!-- Cave Ant -->
+				<ignore_npc_id>21272</ignore_npc_id> <!-- Cave Ant Soldier -->
+				<ignore_npc_id>21273</ignore_npc_id> <!-- Cave Noble Ant -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -5956,15 +5956,15 @@
 		<ai aggroRange="1000" clanHelpRange="500" isAggressive="false">
 			<clan_list>
 				<clan>ANT</clan>
-				<enemy_clan>CAVE_ANT_2A</enemy_clan>
-				<enemy_clan>CAVE_ANT_4</enemy_clan>
-				<enemy_clan>CAVE_ANT_LAVA_2A</enemy_clan>
-				<enemy_clan>CAVE_ANT_LAVA_2B</enemy_clan>
-				<enemy_clan>CAVE_ANT_LAVA_2D</enemy_clan>
-				<enemy_clan>CAVE_ANT_LAVA_4</enemy_clan>
-				<enemy_clan>CAVE_NOBLE_ANT_4</enemy_clan>
-				<enemy_clan>CAVE_RECRUIT_2B</enemy_clan>
-				<enemy_clan>CAVE_RECRUIT_4</enemy_clan>
+				<ignore_npc_id>21265</ignore_npc_id> <!-- Cave Ant Larva -->
+				<ignore_npc_id>21266</ignore_npc_id> <!-- Cave Ant Larva -->
+				<ignore_npc_id>21267</ignore_npc_id> <!-- Cave Ant Larva -->
+				<ignore_npc_id>21268</ignore_npc_id> <!-- Cave Ant Larva -->
+				<ignore_npc_id>21269</ignore_npc_id> <!-- Cave Ant -->
+				<ignore_npc_id>21270</ignore_npc_id> <!-- Cave Ant Soldier -->
+				<ignore_npc_id>21271</ignore_npc_id> <!-- Cave Ant -->
+				<ignore_npc_id>21272</ignore_npc_id> <!-- Cave Ant Soldier -->
+				<ignore_npc_id>21273</ignore_npc_id> <!-- Cave Noble Ant -->
 			</clan_list>
 		</ai>
 		<drop_lists>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/22400-22500.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/22400-22500.xml
index a0c4b53f6eebf57531940c8cee973eb139424879..bc554c27e828dcc2b1304f8073d554d4643b4b67 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/22400-22500.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/22400-22500.xml
@@ -4762,7 +4762,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="200" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_25_NORMAL</enemy_clan>
+				<ignore_npc_id>22452</ignore_npc_id> <!-- White Skull Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -4867,7 +4867,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="300" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_25_NORMAL</enemy_clan>
+				<ignore_npc_id>22452</ignore_npc_id> <!-- White Skull Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -5066,7 +5066,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="200" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_30_NORMAL</enemy_clan>
+				<ignore_npc_id>22455</ignore_npc_id> <!-- Begrudged Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -5169,7 +5169,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="300" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_30_NORMAL</enemy_clan>
+				<ignore_npc_id>22455</ignore_npc_id> <!-- Begrudged Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -5366,7 +5366,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="200" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_35_NORMAL</enemy_clan>
+				<ignore_npc_id>22458</ignore_npc_id> <!-- Rotten Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -5467,7 +5467,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="300" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_35_NORMAL</enemy_clan>
+				<ignore_npc_id>22458</ignore_npc_id> <!-- Rotten Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -5664,7 +5664,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="200" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_40_NORMAL</enemy_clan>
+				<ignore_npc_id>22461</ignore_npc_id> <!-- Gluttonous Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -5767,7 +5767,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="300" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_40_NORMAL</enemy_clan>
+				<ignore_npc_id>22461</ignore_npc_id> <!-- Gluttonous Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -5966,7 +5966,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="200" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_45_NORMAL</enemy_clan>
+				<ignore_npc_id>22464</ignore_npc_id> <!-- Callous Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -6069,7 +6069,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="300" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_45_NORMAL</enemy_clan>
+				<ignore_npc_id>22464</ignore_npc_id> <!-- Callous Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -6268,7 +6268,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="200" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_50_NORMAL</enemy_clan>
+				<ignore_npc_id>22467</ignore_npc_id> <!-- Savage Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -6371,7 +6371,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="300" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_50_NORMAL</enemy_clan>
+				<ignore_npc_id>22467</ignore_npc_id> <!-- Savage Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -6570,7 +6570,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="200" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_55_NORMAL</enemy_clan>
+				<ignore_npc_id>22470</ignore_npc_id> <!-- Peerless Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -6673,7 +6673,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="300" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_55_NORMAL</enemy_clan>
+				<ignore_npc_id>22470</ignore_npc_id> <!-- Peerless Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -6872,7 +6872,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="200" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_60_NORMAL</enemy_clan>
+				<ignore_npc_id>22473</ignore_npc_id> <!-- Massive Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -6975,7 +6975,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="300" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_60_NORMAL</enemy_clan>
+				<ignore_npc_id>22473</ignore_npc_id> <!-- Massive Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -7173,7 +7173,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="200" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_65_NORMAL</enemy_clan>
+				<ignore_npc_id>22476</ignore_npc_id> <!-- Fervent Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -7275,7 +7275,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="300" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_65_NORMAL</enemy_clan>
+				<ignore_npc_id>22476</ignore_npc_id> <!-- Fervent Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -7472,7 +7472,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="200" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_70_NORMAL</enemy_clan>
+				<ignore_npc_id>22479</ignore_npc_id> <!-- Ruptured Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -7574,7 +7574,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="300" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_70_NORMAL</enemy_clan>
+				<ignore_npc_id>22479</ignore_npc_id> <!-- Ruptured Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -7771,7 +7771,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="200" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_75_NORMAL</enemy_clan>
+				<ignore_npc_id>22482</ignore_npc_id> <!-- Sword Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -7875,7 +7875,7 @@
 		<ai type="BALANCED" aggroRange="300" clanHelpRange="300" isAggressive="false">
 			<clan_list>
 				<clan>RIM</clan>
-				<enemy_clan>RIM_75_NORMAL</enemy_clan>
+				<ignore_npc_id>22482</ignore_npc_id> <!-- Sword Kanabion -->
 			</clan_list>
 		</ai>
 		<drop_lists>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/25400-25500.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/25400-25500.xml
index d1f9465920cdda1b35945e88f444c5d97fd21574..7ca69bbb4cc14c621cc5b60c86e93e359308e8d3 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/25400-25500.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/25400-25500.xml
@@ -1332,7 +1332,7 @@
 		<ai type="BALANCED" clanHelpRange="300" isAggressive="false">
 			<clan_list>
 				<clan>TIMINIEL</clan>
-				<enemy_clan>TIMINIELS_SPIRIT</enemy_clan>
+				<ignore_npc_id>21797</ignore_npc_id> <!-- Spirit of Timiniel -->
 			</clan_list>
 		</ai>
 		<drop_lists>
@@ -1400,7 +1400,7 @@
 		<ai clanHelpRange="300" isAggressive="false">
 			<clan_list>
 				<clan>TIMINIEL</clan>
-				<enemy_clan>TIMINIELS_SPIRIT</enemy_clan>
+				<ignore_npc_id>21797</ignore_npc_id> <!-- Spirit of Timiniel -->
 			</clan_list>
 		</ai>
 		<collision>
@@ -1446,7 +1446,7 @@
 		<ai clanHelpRange="300" isAggressive="false">
 			<clan_list>
 				<clan>TIMINIEL</clan>
-				<enemy_clan>TIMINIELS_SPIRIT</enemy_clan>
+				<ignore_npc_id>21797</ignore_npc_id> <!-- Spirit of Timiniel -->
 			</clan_list>
 		</ai>
 		<collision>
diff --git a/L2J_DataPack_BETA/dist/game/data/xsd/npcs.xsd b/L2J_DataPack_BETA/dist/game/data/xsd/npcs.xsd
index b71e4a15cee2ebf1068bd590851f88b7a4cc0c2b..e6ca3b05ab84401d7022b705a7e3c57eea73c434 100644
--- a/L2J_DataPack_BETA/dist/game/data/xsd/npcs.xsd
+++ b/L2J_DataPack_BETA/dist/game/data/xsd/npcs.xsd
@@ -218,8 +218,8 @@
 										<xs:element name="clan_list" minOccurs="0" maxOccurs="1">
 											<xs:complexType>
 												<xs:choice minOccurs="1" maxOccurs="unbounded">
-													<xs:element name="clan" />
-													<xs:element name="enemy_clan" />
+													<xs:element name="clan" type="xs:token" />
+													<xs:element name="ignore_npc_id" type="xs:nonNegativeInteger" />
 												</xs:choice>
 											</xs:complexType>
 										</xs:element>