diff --git a/data/templates/item/1-ShortSword.xml b/data/templates/item/1-ShortSword.xml
index 7a0f419e2..83ffcf289 100644
--- a/data/templates/item/1-ShortSword.xml
+++ b/data/templates/item/1-ShortSword.xml
@@ -6,10 +6,10 @@
 	<price>1</price>
 	<stats>
 		<physicalDamage>
-			<set order="128">8</set>
+			<set order="128">510</set>
 		</physicalDamage>
 		<magicalDamage>
-			<set order="128">6</set>
+			<set order="128">508</set>
 		</magicalDamage>
 		<criticalChance>
 			<set order="128">8</set>
diff --git a/data/templates/npc/monster/13034-SuperHugePig.xml b/data/templates/npc/monster/13034-SuperHugePig.xml
index d7df21534..2ef6aa180 100644
--- a/data/templates/npc/monster/13034-SuperHugePig.xml
+++ b/data/templates/npc/monster/13034-SuperHugePig.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="13034" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/13097.xml b/data/templates/npc/monster/13097.xml
index daba674d2..651d9703d 100644
--- a/data/templates/npc/monster/13097.xml
+++ b/data/templates/npc/monster/13097.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="13097" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/13148-Lindvior.xml b/data/templates/npc/monster/13148-Lindvior.xml
index 2fa90103d..acc946be1 100644
--- a/data/templates/npc/monster/13148-Lindvior.xml
+++ b/data/templates/npc/monster/13148-Lindvior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="13148" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="false" attackable="true">
diff --git a/data/templates/npc/monster/16019-TinyBabyBuffalo.xml b/data/templates/npc/monster/16019-TinyBabyBuffalo.xml
index 3993a53ad..ab7fdc947 100644
--- a/data/templates/npc/monster/16019-TinyBabyBuffalo.xml
+++ b/data/templates/npc/monster/16019-TinyBabyBuffalo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="16019" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/16020-TameTinyBabyBuffalo.xml b/data/templates/npc/monster/16020-TameTinyBabyBuffalo.xml
index a843bc320..46f1f07a8 100644
--- a/data/templates/npc/monster/16020-TameTinyBabyBuffalo.xml
+++ b/data/templates/npc/monster/16020-TameTinyBabyBuffalo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="16020" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/16021-TinyBabyCougar.xml b/data/templates/npc/monster/16021-TinyBabyCougar.xml
index ac5f5a715..e375b130b 100644
--- a/data/templates/npc/monster/16021-TinyBabyCougar.xml
+++ b/data/templates/npc/monster/16021-TinyBabyCougar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="16021" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/16022-TameTinyBabyCougar.xml b/data/templates/npc/monster/16022-TameTinyBabyCougar.xml
index 8ddf1a8ba..18293fce9 100644
--- a/data/templates/npc/monster/16022-TameTinyBabyCougar.xml
+++ b/data/templates/npc/monster/16022-TameTinyBabyCougar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="16022" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/16023-TinyBabyKookaburra.xml b/data/templates/npc/monster/16023-TinyBabyKookaburra.xml
index a9d9da35f..08f485275 100644
--- a/data/templates/npc/monster/16023-TinyBabyKookaburra.xml
+++ b/data/templates/npc/monster/16023-TinyBabyKookaburra.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="16023" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/16024-TameTinyBabyKookaburra.xml b/data/templates/npc/monster/16024-TameTinyBabyKookaburra.xml
index 7c35b6a02..0c91849f0 100644
--- a/data/templates/npc/monster/16024-TameTinyBabyKookaburra.xml
+++ b/data/templates/npc/monster/16024-TameTinyBabyKookaburra.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="16024" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18001-BloodQueen.xml b/data/templates/npc/monster/18001-BloodQueen.xml
index 1a4c91660..16a02ba6c 100644
--- a/data/templates/npc/monster/18001-BloodQueen.xml
+++ b/data/templates/npc/monster/18001-BloodQueen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18001" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18002-BloodQueen.xml b/data/templates/npc/monster/18002-BloodQueen.xml
index 5a7349493..644d3e37b 100644
--- a/data/templates/npc/monster/18002-BloodQueen.xml
+++ b/data/templates/npc/monster/18002-BloodQueen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18002" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18003-BeardedKeltir.xml b/data/templates/npc/monster/18003-BeardedKeltir.xml
index d4dd197bf..74a1e5203 100644
--- a/data/templates/npc/monster/18003-BeardedKeltir.xml
+++ b/data/templates/npc/monster/18003-BeardedKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18003" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18004-SusceptorPrime.xml b/data/templates/npc/monster/18004-SusceptorPrime.xml
index 92f41d1d9..c39bc41d8 100644
--- a/data/templates/npc/monster/18004-SusceptorPrime.xml
+++ b/data/templates/npc/monster/18004-SusceptorPrime.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18004" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18005-Mimic.xml b/data/templates/npc/monster/18005-Mimic.xml
index 42db6f9b7..37203b670 100644
--- a/data/templates/npc/monster/18005-Mimic.xml
+++ b/data/templates/npc/monster/18005-Mimic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18005" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18006-MarukLord.xml b/data/templates/npc/monster/18006-MarukLord.xml
index aad1e5ded..878d7bca5 100644
--- a/data/templates/npc/monster/18006-MarukLord.xml
+++ b/data/templates/npc/monster/18006-MarukLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18006" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18007-LimalKarinness.xml b/data/templates/npc/monster/18007-LimalKarinness.xml
index df7295d39..72cb4f008 100644
--- a/data/templates/npc/monster/18007-LimalKarinness.xml
+++ b/data/templates/npc/monster/18007-LimalKarinness.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18007" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18008-Karik.xml b/data/templates/npc/monster/18008-Karik.xml
index 29e5a8468..0130e6910 100644
--- a/data/templates/npc/monster/18008-Karik.xml
+++ b/data/templates/npc/monster/18008-Karik.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18008" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18119-CorpseOfDeadman.xml b/data/templates/npc/monster/18119-CorpseOfDeadman.xml
index 6373eca90..ed2fc4303 100644
--- a/data/templates/npc/monster/18119-CorpseOfDeadman.xml
+++ b/data/templates/npc/monster/18119-CorpseOfDeadman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18119" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18327-FreyaSServant.xml b/data/templates/npc/monster/18327-FreyaSServant.xml
index 05f73394b..6ac367a1c 100644
--- a/data/templates/npc/monster/18327-FreyaSServant.xml
+++ b/data/templates/npc/monster/18327-FreyaSServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18327" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18328-HallAlarmDevice.xml b/data/templates/npc/monster/18328-HallAlarmDevice.xml
index 771757010..8ee6c76c7 100644
--- a/data/templates/npc/monster/18328-HallAlarmDevice.xml
+++ b/data/templates/npc/monster/18328-HallAlarmDevice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18328" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18329-HallKeeperCaptain.xml b/data/templates/npc/monster/18329-HallKeeperCaptain.xml
index 26c05fb3e..0c766521f 100644
--- a/data/templates/npc/monster/18329-HallKeeperCaptain.xml
+++ b/data/templates/npc/monster/18329-HallKeeperCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18329" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18330-HallKeeperWizard.xml b/data/templates/npc/monster/18330-HallKeeperWizard.xml
index 450ee8da6..e5886373e 100644
--- a/data/templates/npc/monster/18330-HallKeeperWizard.xml
+++ b/data/templates/npc/monster/18330-HallKeeperWizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18330" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18331-HallKeeperGuard.xml b/data/templates/npc/monster/18331-HallKeeperGuard.xml
index 2b1a43e2d..1a2e5ac02 100644
--- a/data/templates/npc/monster/18331-HallKeeperGuard.xml
+++ b/data/templates/npc/monster/18331-HallKeeperGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18331" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18332-HallKeeperPatrol.xml b/data/templates/npc/monster/18332-HallKeeperPatrol.xml
index 24c02afed..120b21046 100644
--- a/data/templates/npc/monster/18332-HallKeeperPatrol.xml
+++ b/data/templates/npc/monster/18332-HallKeeperPatrol.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18332" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18333-HallKeeperSuicidalSoldier.xml b/data/templates/npc/monster/18333-HallKeeperSuicidalSoldier.xml
index 574cf5b4e..d20262163 100644
--- a/data/templates/npc/monster/18333-HallKeeperSuicidalSoldier.xml
+++ b/data/templates/npc/monster/18333-HallKeeperSuicidalSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18333" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18334-DarkChoirCaptain.xml b/data/templates/npc/monster/18334-DarkChoirCaptain.xml
index 878a70055..93e4b6dc4 100644
--- a/data/templates/npc/monster/18334-DarkChoirCaptain.xml
+++ b/data/templates/npc/monster/18334-DarkChoirCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18334" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18335-DarkChoirPrimaDonna.xml b/data/templates/npc/monster/18335-DarkChoirPrimaDonna.xml
index 9260f1f12..e456d5e7d 100644
--- a/data/templates/npc/monster/18335-DarkChoirPrimaDonna.xml
+++ b/data/templates/npc/monster/18335-DarkChoirPrimaDonna.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18335" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18336-DarkChoirLancer.xml b/data/templates/npc/monster/18336-DarkChoirLancer.xml
index 4e7dc9be5..910f23e6a 100644
--- a/data/templates/npc/monster/18336-DarkChoirLancer.xml
+++ b/data/templates/npc/monster/18336-DarkChoirLancer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18336" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18337-DarkChoirArcher.xml b/data/templates/npc/monster/18337-DarkChoirArcher.xml
index 78b185feb..eea922cec 100644
--- a/data/templates/npc/monster/18337-DarkChoirArcher.xml
+++ b/data/templates/npc/monster/18337-DarkChoirArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18337" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18338-DarkChoirWitchDoctor.xml b/data/templates/npc/monster/18338-DarkChoirWitchDoctor.xml
index db5d4b508..f77303a0f 100644
--- a/data/templates/npc/monster/18338-DarkChoirWitchDoctor.xml
+++ b/data/templates/npc/monster/18338-DarkChoirWitchDoctor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18338" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18339-DarkChoirPlayer.xml b/data/templates/npc/monster/18339-DarkChoirPlayer.xml
index dcdf45428..2446864b8 100644
--- a/data/templates/npc/monster/18339-DarkChoirPlayer.xml
+++ b/data/templates/npc/monster/18339-DarkChoirPlayer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18339" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18340-HallKeeperSuicidalSoldier.xml b/data/templates/npc/monster/18340-HallKeeperSuicidalSoldier.xml
index 969fcfbb5..977699f3a 100644
--- a/data/templates/npc/monster/18340-HallKeeperSuicidalSoldier.xml
+++ b/data/templates/npc/monster/18340-HallKeeperSuicidalSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18340" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18341-HallKeeperSuicidalSoldier.xml b/data/templates/npc/monster/18341-HallKeeperSuicidalSoldier.xml
index 06bc3b013..c532bb2da 100644
--- a/data/templates/npc/monster/18341-HallKeeperSuicidalSoldier.xml
+++ b/data/templates/npc/monster/18341-HallKeeperSuicidalSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18341" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18342-Gremlin.xml b/data/templates/npc/monster/18342-Gremlin.xml
index d37cf686a..ca3f00e23 100644
--- a/data/templates/npc/monster/18342-Gremlin.xml
+++ b/data/templates/npc/monster/18342-Gremlin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18342" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18343-GatekeeperZombie.xml b/data/templates/npc/monster/18343-GatekeeperZombie.xml
index 49e89410a..dede4a4a5 100644
--- a/data/templates/npc/monster/18343-GatekeeperZombie.xml
+++ b/data/templates/npc/monster/18343-GatekeeperZombie.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18343" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18344-AncientEgg.xml b/data/templates/npc/monster/18344-AncientEgg.xml
index e2aced5ef..fe678df50 100644
--- a/data/templates/npc/monster/18344-AncientEgg.xml
+++ b/data/templates/npc/monster/18344-AncientEgg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18344" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18345-Sprigant.xml b/data/templates/npc/monster/18345-Sprigant.xml
index d6aa928f4..a9ce3dcfe 100644
--- a/data/templates/npc/monster/18345-Sprigant.xml
+++ b/data/templates/npc/monster/18345-Sprigant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18345" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18346-Sprigant.xml b/data/templates/npc/monster/18346-Sprigant.xml
index 8cc8f8509..35de1b915 100644
--- a/data/templates/npc/monster/18346-Sprigant.xml
+++ b/data/templates/npc/monster/18346-Sprigant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18346" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18347-GardenGuard.xml b/data/templates/npc/monster/18347-GardenGuard.xml
index abe52e426..997ebaea9 100644
--- a/data/templates/npc/monster/18347-GardenGuard.xml
+++ b/data/templates/npc/monster/18347-GardenGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18347" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18348-GardenGuard.xml b/data/templates/npc/monster/18348-GardenGuard.xml
index fb53c139f..9759c3a7d 100644
--- a/data/templates/npc/monster/18348-GardenGuard.xml
+++ b/data/templates/npc/monster/18348-GardenGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18348" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18349-GardenGuard.xml b/data/templates/npc/monster/18349-GardenGuard.xml
index 29f579d4f..649d653b8 100644
--- a/data/templates/npc/monster/18349-GardenGuard.xml
+++ b/data/templates/npc/monster/18349-GardenGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18349" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18350-GardenGuard.xml b/data/templates/npc/monster/18350-GardenGuard.xml
index aef445650..46d748f44 100644
--- a/data/templates/npc/monster/18350-GardenGuard.xml
+++ b/data/templates/npc/monster/18350-GardenGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18350" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18351-GardenGuard.xml b/data/templates/npc/monster/18351-GardenGuard.xml
index ac508876b..51140635f 100644
--- a/data/templates/npc/monster/18351-GardenGuard.xml
+++ b/data/templates/npc/monster/18351-GardenGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18351" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18352-KamaelGuard.xml b/data/templates/npc/monster/18352-KamaelGuard.xml
index 9e3f304dc..92c8adcf7 100644
--- a/data/templates/npc/monster/18352-KamaelGuard.xml
+++ b/data/templates/npc/monster/18352-KamaelGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18352" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18353-GuardianOfRecords.xml b/data/templates/npc/monster/18353-GuardianOfRecords.xml
index ab5b88778..0fec149cf 100644
--- a/data/templates/npc/monster/18353-GuardianOfRecords.xml
+++ b/data/templates/npc/monster/18353-GuardianOfRecords.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18353" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18354-GuardianOfObservation.xml b/data/templates/npc/monster/18354-GuardianOfObservation.xml
index 8abb9e1fb..103124a03 100644
--- a/data/templates/npc/monster/18354-GuardianOfObservation.xml
+++ b/data/templates/npc/monster/18354-GuardianOfObservation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18354" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18355-SpiculaSGuard.xml b/data/templates/npc/monster/18355-SpiculaSGuard.xml
index d8df04da7..7f23356a3 100644
--- a/data/templates/npc/monster/18355-SpiculaSGuard.xml
+++ b/data/templates/npc/monster/18355-SpiculaSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18355" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18356-HarkilgamedSGatekeeper.xml b/data/templates/npc/monster/18356-HarkilgamedSGatekeeper.xml
index 02e0958e4..b5a39ec6d 100644
--- a/data/templates/npc/monster/18356-HarkilgamedSGatekeeper.xml
+++ b/data/templates/npc/monster/18356-HarkilgamedSGatekeeper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18356" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18357-RodenpiculaSGatekeeper.xml b/data/templates/npc/monster/18357-RodenpiculaSGatekeeper.xml
index f5e247afa..52a482739 100644
--- a/data/templates/npc/monster/18357-RodenpiculaSGatekeeper.xml
+++ b/data/templates/npc/monster/18357-RodenpiculaSGatekeeper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18357" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18358-GuardianOfSecrets.xml b/data/templates/npc/monster/18358-GuardianOfSecrets.xml
index cc38c1e97..602475baf 100644
--- a/data/templates/npc/monster/18358-GuardianOfSecrets.xml
+++ b/data/templates/npc/monster/18358-GuardianOfSecrets.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18358" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18359-ArviterreSGuardian.xml b/data/templates/npc/monster/18359-ArviterreSGuardian.xml
index cda590712..1ac4ff566 100644
--- a/data/templates/npc/monster/18359-ArviterreSGuardian.xml
+++ b/data/templates/npc/monster/18359-ArviterreSGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18359" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18360-KatenarSGatekeeper.xml b/data/templates/npc/monster/18360-KatenarSGatekeeper.xml
index 30ebc99ac..e0258888d 100644
--- a/data/templates/npc/monster/18360-KatenarSGatekeeper.xml
+++ b/data/templates/npc/monster/18360-KatenarSGatekeeper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18360" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18361-GuardianOfPrediction.xml b/data/templates/npc/monster/18361-GuardianOfPrediction.xml
index e6ae6a039..43f08139e 100644
--- a/data/templates/npc/monster/18361-GuardianOfPrediction.xml
+++ b/data/templates/npc/monster/18361-GuardianOfPrediction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18361" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18362-GardenGuard.xml b/data/templates/npc/monster/18362-GardenGuard.xml
index 1cf6e7b45..82edddaa2 100644
--- a/data/templates/npc/monster/18362-GardenGuard.xml
+++ b/data/templates/npc/monster/18362-GardenGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18362" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18363-GardenGuard.xml b/data/templates/npc/monster/18363-GardenGuard.xml
index f19636e1d..f75a72b8f 100644
--- a/data/templates/npc/monster/18363-GardenGuard.xml
+++ b/data/templates/npc/monster/18363-GardenGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18363" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18364-WitchWarder.xml b/data/templates/npc/monster/18364-WitchWarder.xml
index c7bff2595..f077f452e 100644
--- a/data/templates/npc/monster/18364-WitchWarder.xml
+++ b/data/templates/npc/monster/18364-WitchWarder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18364" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18365-WitchWarder.xml b/data/templates/npc/monster/18365-WitchWarder.xml
index 1f715d40c..2b81a908f 100644
--- a/data/templates/npc/monster/18365-WitchWarder.xml
+++ b/data/templates/npc/monster/18365-WitchWarder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18365" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18366-WitchWarder.xml b/data/templates/npc/monster/18366-WitchWarder.xml
index 3a5876873..bd45e8dea 100644
--- a/data/templates/npc/monster/18366-WitchWarder.xml
+++ b/data/templates/npc/monster/18366-WitchWarder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18366" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18367-PrisonGuard.xml b/data/templates/npc/monster/18367-PrisonGuard.xml
index 2dd04a156..974947fed 100644
--- a/data/templates/npc/monster/18367-PrisonGuard.xml
+++ b/data/templates/npc/monster/18367-PrisonGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18367" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18368-PrisonGuard.xml b/data/templates/npc/monster/18368-PrisonGuard.xml
index b49b0dd37..578c58c64 100644
--- a/data/templates/npc/monster/18368-PrisonGuard.xml
+++ b/data/templates/npc/monster/18368-PrisonGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18368" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18369-ChromaticCrystallineGolem.xml b/data/templates/npc/monster/18369-ChromaticCrystallineGolem.xml
index 5fa2af13d..2cbc7c217 100644
--- a/data/templates/npc/monster/18369-ChromaticCrystallineGolem.xml
+++ b/data/templates/npc/monster/18369-ChromaticCrystallineGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18369" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18370-ChromaticCrystallineGolem.xml b/data/templates/npc/monster/18370-ChromaticCrystallineGolem.xml
index fdcdaa209..e874d4c46 100644
--- a/data/templates/npc/monster/18370-ChromaticCrystallineGolem.xml
+++ b/data/templates/npc/monster/18370-ChromaticCrystallineGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18370" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18371-BelethSample.xml b/data/templates/npc/monster/18371-BelethSample.xml
index d82f9af79..64ae7348a 100644
--- a/data/templates/npc/monster/18371-BelethSample.xml
+++ b/data/templates/npc/monster/18371-BelethSample.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18371" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18372-BelethSample.xml b/data/templates/npc/monster/18372-BelethSample.xml
index 171cab113..5316296b2 100644
--- a/data/templates/npc/monster/18372-BelethSample.xml
+++ b/data/templates/npc/monster/18372-BelethSample.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18372" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18373-BelethSample.xml b/data/templates/npc/monster/18373-BelethSample.xml
index 8b506f216..9a3b1916e 100644
--- a/data/templates/npc/monster/18373-BelethSample.xml
+++ b/data/templates/npc/monster/18373-BelethSample.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18373" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18374-BelethSample.xml b/data/templates/npc/monster/18374-BelethSample.xml
index 6c3a724ef..d08ff0798 100644
--- a/data/templates/npc/monster/18374-BelethSample.xml
+++ b/data/templates/npc/monster/18374-BelethSample.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18374" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18375-BelethSample.xml b/data/templates/npc/monster/18375-BelethSample.xml
index 3b1212763..309e81fbf 100644
--- a/data/templates/npc/monster/18375-BelethSample.xml
+++ b/data/templates/npc/monster/18375-BelethSample.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18375" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18376-BelethSample.xml b/data/templates/npc/monster/18376-BelethSample.xml
index 3ad771fba..acc544b62 100644
--- a/data/templates/npc/monster/18376-BelethSample.xml
+++ b/data/templates/npc/monster/18376-BelethSample.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18376" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18377-BelethSample.xml b/data/templates/npc/monster/18377-BelethSample.xml
index e5586e4fb..709f60149 100644
--- a/data/templates/npc/monster/18377-BelethSample.xml
+++ b/data/templates/npc/monster/18377-BelethSample.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18377" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18444-GardenGuard.xml b/data/templates/npc/monster/18444-GardenGuard.xml
index bfebb1889..925433e6d 100644
--- a/data/templates/npc/monster/18444-GardenGuard.xml
+++ b/data/templates/npc/monster/18444-GardenGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18444" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18463-RemnantDiabolist.xml b/data/templates/npc/monster/18463-RemnantDiabolist.xml
index bbbedb1ad..12efdd28c 100644
--- a/data/templates/npc/monster/18463-RemnantDiabolist.xml
+++ b/data/templates/npc/monster/18463-RemnantDiabolist.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18463" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18464-RemnantDiviner.xml b/data/templates/npc/monster/18464-RemnantDiviner.xml
index 903d5e2d3..4f549aa4a 100644
--- a/data/templates/npc/monster/18464-RemnantDiviner.xml
+++ b/data/templates/npc/monster/18464-RemnantDiviner.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18464" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18465-Derek.xml b/data/templates/npc/monster/18465-Derek.xml
index a2b9c6c7e..c5eedb7bf 100644
--- a/data/templates/npc/monster/18465-Derek.xml
+++ b/data/templates/npc/monster/18465-Derek.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18465" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18466-OutpostCaptain.xml b/data/templates/npc/monster/18466-OutpostCaptain.xml
index 6f2fd47c6..1de5f9837 100644
--- a/data/templates/npc/monster/18466-OutpostCaptain.xml
+++ b/data/templates/npc/monster/18466-OutpostCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18466" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18467-WoundedLandGuard.xml b/data/templates/npc/monster/18467-WoundedLandGuard.xml
index 6255c9b0c..cdd1767b6 100644
--- a/data/templates/npc/monster/18467-WoundedLandGuard.xml
+++ b/data/templates/npc/monster/18467-WoundedLandGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18467" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18474-Alarm.xml b/data/templates/npc/monster/18474-Alarm.xml
index 54996ba0d..54ed0224a 100644
--- a/data/templates/npc/monster/18474-Alarm.xml
+++ b/data/templates/npc/monster/18474-Alarm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18474" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18478-HerbJar.xml b/data/templates/npc/monster/18478-HerbJar.xml
index 06eb59402..cf8bb3217 100644
--- a/data/templates/npc/monster/18478-HerbJar.xml
+++ b/data/templates/npc/monster/18478-HerbJar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18478" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18482-FafurionKindred.xml b/data/templates/npc/monster/18482-FafurionKindred.xml
index d46ef4c98..c9cbcc75c 100644
--- a/data/templates/npc/monster/18482-FafurionKindred.xml
+++ b/data/templates/npc/monster/18482-FafurionKindred.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18482" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18483-GardenGuard.xml b/data/templates/npc/monster/18483-GardenGuard.xml
index ec7a3c338..14e47fb23 100644
--- a/data/templates/npc/monster/18483-GardenGuard.xml
+++ b/data/templates/npc/monster/18483-GardenGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18483" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18490-BelethSSlave.xml b/data/templates/npc/monster/18490-BelethSSlave.xml
index e36dde366..1cea0ffb4 100644
--- a/data/templates/npc/monster/18490-BelethSSlave.xml
+++ b/data/templates/npc/monster/18490-BelethSSlave.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18490" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18544-CrumaBorder.xml b/data/templates/npc/monster/18544-CrumaBorder.xml
index b186a7951..b8ca379b6 100644
--- a/data/templates/npc/monster/18544-CrumaBorder.xml
+++ b/data/templates/npc/monster/18544-CrumaBorder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18544" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18545-AncientExperiment.xml b/data/templates/npc/monster/18545-AncientExperiment.xml
index 331c2b96e..ae1f5c658 100644
--- a/data/templates/npc/monster/18545-AncientExperiment.xml
+++ b/data/templates/npc/monster/18545-AncientExperiment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18545" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18546-AncientExperiment.xml b/data/templates/npc/monster/18546-AncientExperiment.xml
index 5accf11bd..7103d4887 100644
--- a/data/templates/npc/monster/18546-AncientExperiment.xml
+++ b/data/templates/npc/monster/18546-AncientExperiment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18546" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18547-AncientExperiment.xml b/data/templates/npc/monster/18547-AncientExperiment.xml
index 323aa3cdd..4795a7580 100644
--- a/data/templates/npc/monster/18547-AncientExperiment.xml
+++ b/data/templates/npc/monster/18547-AncientExperiment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18547" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18548-AncientExperiment.xml b/data/templates/npc/monster/18548-AncientExperiment.xml
index 5594adc00..17bc2b8a9 100644
--- a/data/templates/npc/monster/18548-AncientExperiment.xml
+++ b/data/templates/npc/monster/18548-AncientExperiment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18548" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18549-AncientExperiment.xml b/data/templates/npc/monster/18549-AncientExperiment.xml
index 7c23cdb1e..fefad46d8 100644
--- a/data/templates/npc/monster/18549-AncientExperiment.xml
+++ b/data/templates/npc/monster/18549-AncientExperiment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18549" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18550-CrumaPhantom.xml b/data/templates/npc/monster/18550-CrumaPhantom.xml
index 460c648cc..e5c084839 100644
--- a/data/templates/npc/monster/18550-CrumaPhantom.xml
+++ b/data/templates/npc/monster/18550-CrumaPhantom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18550" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18551-CrumaPhantom.xml b/data/templates/npc/monster/18551-CrumaPhantom.xml
index 344cff241..e8f18a93e 100644
--- a/data/templates/npc/monster/18551-CrumaPhantom.xml
+++ b/data/templates/npc/monster/18551-CrumaPhantom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18551" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18552-CrumaPhantom.xml b/data/templates/npc/monster/18552-CrumaPhantom.xml
index 2473d3b04..4f3dcd8c0 100644
--- a/data/templates/npc/monster/18552-CrumaPhantom.xml
+++ b/data/templates/npc/monster/18552-CrumaPhantom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18552" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18553-CrumaPhantom.xml b/data/templates/npc/monster/18553-CrumaPhantom.xml
index 1e15bf823..eec99a835 100644
--- a/data/templates/npc/monster/18553-CrumaPhantom.xml
+++ b/data/templates/npc/monster/18553-CrumaPhantom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18553" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18554-TomlanKamos.xml b/data/templates/npc/monster/18554-TomlanKamos.xml
index 199f3745d..19fcde971 100644
--- a/data/templates/npc/monster/18554-TomlanKamos.xml
+++ b/data/templates/npc/monster/18554-TomlanKamos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18554" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18555-OlAriosh.xml b/data/templates/npc/monster/18555-OlAriosh.xml
index 67505cc3b..783d326e5 100644
--- a/data/templates/npc/monster/18555-OlAriosh.xml
+++ b/data/templates/npc/monster/18555-OlAriosh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18555" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18556-FollowerOfAriosh.xml b/data/templates/npc/monster/18556-FollowerOfAriosh.xml
index e5d96c146..69fed574f 100644
--- a/data/templates/npc/monster/18556-FollowerOfAriosh.xml
+++ b/data/templates/npc/monster/18556-FollowerOfAriosh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18556" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18557-RancDeumus.xml b/data/templates/npc/monster/18557-RancDeumus.xml
index f7f69ab79..831c2992f 100644
--- a/data/templates/npc/monster/18557-RancDeumus.xml
+++ b/data/templates/npc/monster/18557-RancDeumus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18557" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18558-CrimsonHatuOtis.xml b/data/templates/npc/monster/18558-CrimsonHatuOtis.xml
index 648660dae..fd8cb2d54 100644
--- a/data/templates/npc/monster/18558-CrimsonHatuOtis.xml
+++ b/data/templates/npc/monster/18558-CrimsonHatuOtis.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18558" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18559-SeerFlouros.xml b/data/templates/npc/monster/18559-SeerFlouros.xml
index 268fe3388..2c6c6fc7b 100644
--- a/data/templates/npc/monster/18559-SeerFlouros.xml
+++ b/data/templates/npc/monster/18559-SeerFlouros.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18559" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18560-FollowerOfFlouros.xml b/data/templates/npc/monster/18560-FollowerOfFlouros.xml
index 50a41f1bf..3bd95caca 100644
--- a/data/templates/npc/monster/18560-FollowerOfFlouros.xml
+++ b/data/templates/npc/monster/18560-FollowerOfFlouros.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18560" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18561-GranitickDuerga.xml b/data/templates/npc/monster/18561-GranitickDuerga.xml
index 6a900e803..9e4c256fd 100644
--- a/data/templates/npc/monster/18561-GranitickDuerga.xml
+++ b/data/templates/npc/monster/18561-GranitickDuerga.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18561" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18562-BladeOtis.xml b/data/templates/npc/monster/18562-BladeOtis.xml
index 4e6a3a490..374876ace 100644
--- a/data/templates/npc/monster/18562-BladeOtis.xml
+++ b/data/templates/npc/monster/18562-BladeOtis.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18562" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18563-FollowerOfOtis.xml b/data/templates/npc/monster/18563-FollowerOfOtis.xml
index b02c30efc..19a59c854 100644
--- a/data/templates/npc/monster/18563-FollowerOfOtis.xml
+++ b/data/templates/npc/monster/18563-FollowerOfOtis.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18563" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18564-WeirdBunei.xml b/data/templates/npc/monster/18564-WeirdBunei.xml
index b01c01fc2..d0b370183 100644
--- a/data/templates/npc/monster/18564-WeirdBunei.xml
+++ b/data/templates/npc/monster/18564-WeirdBunei.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18564" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18565-BraveMartim.xml b/data/templates/npc/monster/18565-BraveMartim.xml
index dfc722621..c8d3b3fb2 100644
--- a/data/templates/npc/monster/18565-BraveMartim.xml
+++ b/data/templates/npc/monster/18565-BraveMartim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18565" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18566-KaimAbigore.xml b/data/templates/npc/monster/18566-KaimAbigore.xml
index 616267881..d6c323eb0 100644
--- a/data/templates/npc/monster/18566-KaimAbigore.xml
+++ b/data/templates/npc/monster/18566-KaimAbigore.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18566" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18567-FollowerOfAbigore.xml b/data/templates/npc/monster/18567-FollowerOfAbigore.xml
index 223502e42..d6490bd9a 100644
--- a/data/templates/npc/monster/18567-FollowerOfAbigore.xml
+++ b/data/templates/npc/monster/18567-FollowerOfAbigore.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18567" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18568-KnightMontagnar.xml b/data/templates/npc/monster/18568-KnightMontagnar.xml
index c7bb40b50..bae5a5ca2 100644
--- a/data/templates/npc/monster/18568-KnightMontagnar.xml
+++ b/data/templates/npc/monster/18568-KnightMontagnar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18568" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18569-FollowerOfMontagnar.xml b/data/templates/npc/monster/18569-FollowerOfMontagnar.xml
index 05cad346b..d4d513ec4 100644
--- a/data/templates/npc/monster/18569-FollowerOfMontagnar.xml
+++ b/data/templates/npc/monster/18569-FollowerOfMontagnar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18569" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18570-SummerYaganitan.xml b/data/templates/npc/monster/18570-SummerYaganitan.xml
index a13ee49ef..06095cc9c 100644
--- a/data/templates/npc/monster/18570-SummerYaganitan.xml
+++ b/data/templates/npc/monster/18570-SummerYaganitan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18570" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18571-VenomousStorace.xml b/data/templates/npc/monster/18571-VenomousStorace.xml
index 4ddca220c..c1db745c9 100644
--- a/data/templates/npc/monster/18571-VenomousStorace.xml
+++ b/data/templates/npc/monster/18571-VenomousStorace.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18571" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18572-FollowerOfStorace.xml b/data/templates/npc/monster/18572-FollowerOfStorace.xml
index b760aad05..bbaec044b 100644
--- a/data/templates/npc/monster/18572-FollowerOfStorace.xml
+++ b/data/templates/npc/monster/18572-FollowerOfStorace.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18572" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18573-KelBilette.xml b/data/templates/npc/monster/18573-KelBilette.xml
index 5fa18c738..0e6e2ffa3 100644
--- a/data/templates/npc/monster/18573-KelBilette.xml
+++ b/data/templates/npc/monster/18573-KelBilette.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18573" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18574-FollowerOfBilette.xml b/data/templates/npc/monster/18574-FollowerOfBilette.xml
index c36001db6..26c652a92 100644
--- a/data/templates/npc/monster/18574-FollowerOfBilette.xml
+++ b/data/templates/npc/monster/18574-FollowerOfBilette.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18574" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18575-WarlordTamuze.xml b/data/templates/npc/monster/18575-WarlordTamuze.xml
index 2227405db..936297ea3 100644
--- a/data/templates/npc/monster/18575-WarlordTamuze.xml
+++ b/data/templates/npc/monster/18575-WarlordTamuze.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18575" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18576-FollowerOfTamuze.xml b/data/templates/npc/monster/18576-FollowerOfTamuze.xml
index 0eb320b74..a9ccbd5cb 100644
--- a/data/templates/npc/monster/18576-FollowerOfTamuze.xml
+++ b/data/templates/npc/monster/18576-FollowerOfTamuze.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18576" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18577-WhiteAllosce.xml b/data/templates/npc/monster/18577-WhiteAllosce.xml
index 7429733bb..5730990cc 100644
--- a/data/templates/npc/monster/18577-WhiteAllosce.xml
+++ b/data/templates/npc/monster/18577-WhiteAllosce.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18577" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18578-FollowerOfAllosce.xml b/data/templates/npc/monster/18578-FollowerOfAllosce.xml
index 3a54ec143..f82b663dd 100644
--- a/data/templates/npc/monster/18578-FollowerOfAllosce.xml
+++ b/data/templates/npc/monster/18578-FollowerOfAllosce.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18578" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18607-Gargos.xml b/data/templates/npc/monster/18607-Gargos.xml
index f6c4656ee..910dbd3e8 100644
--- a/data/templates/npc/monster/18607-Gargos.xml
+++ b/data/templates/npc/monster/18607-Gargos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18607" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18608-Kinsus.xml b/data/templates/npc/monster/18608-Kinsus.xml
index 5a5b1c6dc..d06b928df 100644
--- a/data/templates/npc/monster/18608-Kinsus.xml
+++ b/data/templates/npc/monster/18608-Kinsus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18608" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18609-Papion.xml b/data/templates/npc/monster/18609-Papion.xml
index cebf89fdb..d6cb84d4c 100644
--- a/data/templates/npc/monster/18609-Papion.xml
+++ b/data/templates/npc/monster/18609-Papion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18609" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18610-Hillas.xml b/data/templates/npc/monster/18610-Hillas.xml
index 070e0dba7..1bac9945c 100644
--- a/data/templates/npc/monster/18610-Hillas.xml
+++ b/data/templates/npc/monster/18610-Hillas.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18610" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18611-SpiritOfWater.xml b/data/templates/npc/monster/18611-SpiritOfWater.xml
index 8ef5eb3df..647cf2c19 100644
--- a/data/templates/npc/monster/18611-SpiritOfWater.xml
+++ b/data/templates/npc/monster/18611-SpiritOfWater.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18611" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18612-SpiritOfWater.xml b/data/templates/npc/monster/18612-SpiritOfWater.xml
index 1c04c78de..1914a5371 100644
--- a/data/templates/npc/monster/18612-SpiritOfWater.xml
+++ b/data/templates/npc/monster/18612-SpiritOfWater.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18612" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18613-SpiritOfWater.xml b/data/templates/npc/monster/18613-SpiritOfWater.xml
index 8a3637460..bf866b2d8 100644
--- a/data/templates/npc/monster/18613-SpiritOfWater.xml
+++ b/data/templates/npc/monster/18613-SpiritOfWater.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18613" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18614-SpiritOfFire.xml b/data/templates/npc/monster/18614-SpiritOfFire.xml
index e12f040f4..2d5dd338f 100644
--- a/data/templates/npc/monster/18614-SpiritOfFire.xml
+++ b/data/templates/npc/monster/18614-SpiritOfFire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18614" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18615-SpiritOfFire.xml b/data/templates/npc/monster/18615-SpiritOfFire.xml
index c8e0f8f29..917624cb5 100644
--- a/data/templates/npc/monster/18615-SpiritOfFire.xml
+++ b/data/templates/npc/monster/18615-SpiritOfFire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18615" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18616-Bloom.xml b/data/templates/npc/monster/18616-Bloom.xml
index cf0e0ec80..13da57ea9 100644
--- a/data/templates/npc/monster/18616-Bloom.xml
+++ b/data/templates/npc/monster/18616-Bloom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18616" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18620-Adiantum.xml b/data/templates/npc/monster/18620-Adiantum.xml
index c2ea16869..b52f5e4f8 100644
--- a/data/templates/npc/monster/18620-Adiantum.xml
+++ b/data/templates/npc/monster/18620-Adiantum.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18620" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18622-PowderKeg.xml b/data/templates/npc/monster/18622-PowderKeg.xml
index 0a77a6991..d31bbdbc5 100644
--- a/data/templates/npc/monster/18622-PowderKeg.xml
+++ b/data/templates/npc/monster/18622-PowderKeg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18622" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18623-BegrudgedArcher.xml b/data/templates/npc/monster/18623-BegrudgedArcher.xml
index 1679169fd..d6b09ccbb 100644
--- a/data/templates/npc/monster/18623-BegrudgedArcher.xml
+++ b/data/templates/npc/monster/18623-BegrudgedArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18623" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18624-DeadmanSGrudge.xml b/data/templates/npc/monster/18624-DeadmanSGrudge.xml
index e825e1b00..1a891c957 100644
--- a/data/templates/npc/monster/18624-DeadmanSGrudge.xml
+++ b/data/templates/npc/monster/18624-DeadmanSGrudge.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18624" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18625-DeadmanSGrudge.xml b/data/templates/npc/monster/18625-DeadmanSGrudge.xml
index 0cfce5b2b..34234fff5 100644
--- a/data/templates/npc/monster/18625-DeadmanSGrudge.xml
+++ b/data/templates/npc/monster/18625-DeadmanSGrudge.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18625" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18626-DeadmanSGrudge.xml b/data/templates/npc/monster/18626-DeadmanSGrudge.xml
index 5a7e2ba4a..78599fc83 100644
--- a/data/templates/npc/monster/18626-DeadmanSGrudge.xml
+++ b/data/templates/npc/monster/18626-DeadmanSGrudge.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18626" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18627-DeadmanSGrudge.xml b/data/templates/npc/monster/18627-DeadmanSGrudge.xml
index 1b5b9697c..689ef31c1 100644
--- a/data/templates/npc/monster/18627-DeadmanSGrudge.xml
+++ b/data/templates/npc/monster/18627-DeadmanSGrudge.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18627" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18628-Atan.xml b/data/templates/npc/monster/18628-Atan.xml
index 80b32fd1e..472365286 100644
--- a/data/templates/npc/monster/18628-Atan.xml
+++ b/data/templates/npc/monster/18628-Atan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18628" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18629-Kams.xml b/data/templates/npc/monster/18629-Kams.xml
index 0feec24d0..cebad3c32 100644
--- a/data/templates/npc/monster/18629-Kams.xml
+++ b/data/templates/npc/monster/18629-Kams.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18629" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18630-Hikoro.xml b/data/templates/npc/monster/18630-Hikoro.xml
index 5bef2e17c..65981de9c 100644
--- a/data/templates/npc/monster/18630-Hikoro.xml
+++ b/data/templates/npc/monster/18630-Hikoro.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18630" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18631-Alkaso.xml b/data/templates/npc/monster/18631-Alkaso.xml
index 1cdecb7d9..3e7fbba74 100644
--- a/data/templates/npc/monster/18631-Alkaso.xml
+++ b/data/templates/npc/monster/18631-Alkaso.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18631" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18632-Gerbera.xml b/data/templates/npc/monster/18632-Gerbera.xml
index 6379b1e7c..83dacf81e 100644
--- a/data/templates/npc/monster/18632-Gerbera.xml
+++ b/data/templates/npc/monster/18632-Gerbera.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18632" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18633-Lematan.xml b/data/templates/npc/monster/18633-Lematan.xml
index 79f9bb3f0..175d7980c 100644
--- a/data/templates/npc/monster/18633-Lematan.xml
+++ b/data/templates/npc/monster/18633-Lematan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18633" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18634-LematanSFollower.xml b/data/templates/npc/monster/18634-LematanSFollower.xml
index cdf23aa38..242730c7e 100644
--- a/data/templates/npc/monster/18634-LematanSFollower.xml
+++ b/data/templates/npc/monster/18634-LematanSFollower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18634" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18635-VarkaSilenosRecruit.xml b/data/templates/npc/monster/18635-VarkaSilenosRecruit.xml
index 6d1cd7cee..0313eb37c 100644
--- a/data/templates/npc/monster/18635-VarkaSilenosRecruit.xml
+++ b/data/templates/npc/monster/18635-VarkaSilenosRecruit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18635" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18636-VarkaSilenosFootman.xml b/data/templates/npc/monster/18636-VarkaSilenosFootman.xml
index 9c45eca63..cc4c2654d 100644
--- a/data/templates/npc/monster/18636-VarkaSilenosFootman.xml
+++ b/data/templates/npc/monster/18636-VarkaSilenosFootman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18636" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18637-GrazingAntelope.xml b/data/templates/npc/monster/18637-GrazingAntelope.xml
index 92772c173..22fbc3a6c 100644
--- a/data/templates/npc/monster/18637-GrazingAntelope.xml
+++ b/data/templates/npc/monster/18637-GrazingAntelope.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18637" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18638-VarkaSilenosScout.xml b/data/templates/npc/monster/18638-VarkaSilenosScout.xml
index 666225fd3..c32bf4574 100644
--- a/data/templates/npc/monster/18638-VarkaSilenosScout.xml
+++ b/data/templates/npc/monster/18638-VarkaSilenosScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18638" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18639-VarkaSilenosHunter.xml b/data/templates/npc/monster/18639-VarkaSilenosHunter.xml
index 8f42a2368..62552c6cd 100644
--- a/data/templates/npc/monster/18639-VarkaSilenosHunter.xml
+++ b/data/templates/npc/monster/18639-VarkaSilenosHunter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18639" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18640-VarkaSilenosShaman.xml b/data/templates/npc/monster/18640-VarkaSilenosShaman.xml
index d24bc2241..37a7bd2cc 100644
--- a/data/templates/npc/monster/18640-VarkaSilenosShaman.xml
+++ b/data/templates/npc/monster/18640-VarkaSilenosShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18640" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18641-VarkaSilenosPriest.xml b/data/templates/npc/monster/18641-VarkaSilenosPriest.xml
index 31ce4df80..90f9eb7d8 100644
--- a/data/templates/npc/monster/18641-VarkaSilenosPriest.xml
+++ b/data/templates/npc/monster/18641-VarkaSilenosPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18641" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18642-VarkaSilenosWarrior.xml b/data/templates/npc/monster/18642-VarkaSilenosWarrior.xml
index 229a9e2d5..2a289290c 100644
--- a/data/templates/npc/monster/18642-VarkaSilenosWarrior.xml
+++ b/data/templates/npc/monster/18642-VarkaSilenosWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18642" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18643-GrazingAntelope.xml b/data/templates/npc/monster/18643-GrazingAntelope.xml
index 6b7cba20b..7d83cb4bb 100644
--- a/data/templates/npc/monster/18643-GrazingAntelope.xml
+++ b/data/templates/npc/monster/18643-GrazingAntelope.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18643" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18644-VarkaSilenosMedium.xml b/data/templates/npc/monster/18644-VarkaSilenosMedium.xml
index 3dd299873..71b7bb942 100644
--- a/data/templates/npc/monster/18644-VarkaSilenosMedium.xml
+++ b/data/templates/npc/monster/18644-VarkaSilenosMedium.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18644" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18645-VarkaSilenosMagus.xml b/data/templates/npc/monster/18645-VarkaSilenosMagus.xml
index d5dfcfd9d..57730467b 100644
--- a/data/templates/npc/monster/18645-VarkaSilenosMagus.xml
+++ b/data/templates/npc/monster/18645-VarkaSilenosMagus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18645" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18646-VarkaSilenosOfficer.xml b/data/templates/npc/monster/18646-VarkaSilenosOfficer.xml
index a2dbe363a..da7d08414 100644
--- a/data/templates/npc/monster/18646-VarkaSilenosOfficer.xml
+++ b/data/templates/npc/monster/18646-VarkaSilenosOfficer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18646" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18647-GrazingFlava.xml b/data/templates/npc/monster/18647-GrazingFlava.xml
index 991e8c223..ab11f6ed5 100644
--- a/data/templates/npc/monster/18647-GrazingFlava.xml
+++ b/data/templates/npc/monster/18647-GrazingFlava.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18647" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18648-VarkaSilenosSeer.xml b/data/templates/npc/monster/18648-VarkaSilenosSeer.xml
index 42e568e08..e1376d6ce 100644
--- a/data/templates/npc/monster/18648-VarkaSilenosSeer.xml
+++ b/data/templates/npc/monster/18648-VarkaSilenosSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18648" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18649-VarkaSilenosGreatMagus.xml b/data/templates/npc/monster/18649-VarkaSilenosGreatMagus.xml
index 1ef612725..50edf6e02 100644
--- a/data/templates/npc/monster/18649-VarkaSilenosGreatMagus.xml
+++ b/data/templates/npc/monster/18649-VarkaSilenosGreatMagus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18649" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18650-VarkaSilenosGeneral.xml b/data/templates/npc/monster/18650-VarkaSilenosGeneral.xml
index c4698c94e..a00bcf411 100644
--- a/data/templates/npc/monster/18650-VarkaSilenosGeneral.xml
+++ b/data/templates/npc/monster/18650-VarkaSilenosGeneral.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18650" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18651-GrazingElderAntelope.xml b/data/templates/npc/monster/18651-GrazingElderAntelope.xml
index 7d6a6dead..b494fb96a 100644
--- a/data/templates/npc/monster/18651-GrazingElderAntelope.xml
+++ b/data/templates/npc/monster/18651-GrazingElderAntelope.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18651" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18652-VarkaSilenosGreatSeer.xml b/data/templates/npc/monster/18652-VarkaSilenosGreatSeer.xml
index 35b15b0cb..8eeb96dc8 100644
--- a/data/templates/npc/monster/18652-VarkaSilenosGreatSeer.xml
+++ b/data/templates/npc/monster/18652-VarkaSilenosGreatSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18652" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18653-VarkaSEliteGuard.xml b/data/templates/npc/monster/18653-VarkaSEliteGuard.xml
index bbece885e..bcf9c97eb 100644
--- a/data/templates/npc/monster/18653-VarkaSEliteGuard.xml
+++ b/data/templates/npc/monster/18653-VarkaSEliteGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18653" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18654-VarkaSCommander.xml b/data/templates/npc/monster/18654-VarkaSCommander.xml
index c09ce71fc..6ddc439fb 100644
--- a/data/templates/npc/monster/18654-VarkaSCommander.xml
+++ b/data/templates/npc/monster/18654-VarkaSCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18654" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18655-VarkaSHeadGuard.xml b/data/templates/npc/monster/18655-VarkaSHeadGuard.xml
index 2d7f053fa..8b57bdc0b 100644
--- a/data/templates/npc/monster/18655-VarkaSHeadGuard.xml
+++ b/data/templates/npc/monster/18655-VarkaSHeadGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18655" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18656-VarkaSHeadMagus.xml b/data/templates/npc/monster/18656-VarkaSHeadMagus.xml
index afc22cb94..b7f1d26a1 100644
--- a/data/templates/npc/monster/18656-VarkaSHeadMagus.xml
+++ b/data/templates/npc/monster/18656-VarkaSHeadMagus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18656" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18657-ProphetGuard.xml b/data/templates/npc/monster/18657-ProphetGuard.xml
index 7f6f9b474..99c85fe1a 100644
--- a/data/templates/npc/monster/18657-ProphetGuard.xml
+++ b/data/templates/npc/monster/18657-ProphetGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18657" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18658-DiscipleOfProphet.xml b/data/templates/npc/monster/18658-DiscipleOfProphet.xml
index 7f8d6f214..6a95a3b3f 100644
--- a/data/templates/npc/monster/18658-DiscipleOfProphet.xml
+++ b/data/templates/npc/monster/18658-DiscipleOfProphet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18658" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18659-VarkaSProphet.xml b/data/templates/npc/monster/18659-VarkaSProphet.xml
index ca16d8fed..7e3bee49b 100644
--- a/data/templates/npc/monster/18659-VarkaSProphet.xml
+++ b/data/templates/npc/monster/18659-VarkaSProphet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18659" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18660-Latana.xml b/data/templates/npc/monster/18660-Latana.xml
index 8f42f0220..7ce924320 100644
--- a/data/templates/npc/monster/18660-Latana.xml
+++ b/data/templates/npc/monster/18660-Latana.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18660" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18664-FortuneBug.xml b/data/templates/npc/monster/18664-FortuneBug.xml
index 230de0b2a..7f4de65e4 100644
--- a/data/templates/npc/monster/18664-FortuneBug.xml
+++ b/data/templates/npc/monster/18664-FortuneBug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18664" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18665-FortuneBug.xml b/data/templates/npc/monster/18665-FortuneBug.xml
index 4e8a351cb..64527a2ee 100644
--- a/data/templates/npc/monster/18665-FortuneBug.xml
+++ b/data/templates/npc/monster/18665-FortuneBug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18665" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18666-FortuneBug.xml b/data/templates/npc/monster/18666-FortuneBug.xml
index 720a1ef16..9bbab8537 100644
--- a/data/templates/npc/monster/18666-FortuneBug.xml
+++ b/data/templates/npc/monster/18666-FortuneBug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18666" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18667-WardOfDeath.xml b/data/templates/npc/monster/18667-WardOfDeath.xml
index 99c4c8208..50b80032c 100644
--- a/data/templates/npc/monster/18667-WardOfDeath.xml
+++ b/data/templates/npc/monster/18667-WardOfDeath.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18667" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18668-WardOfDeath.xml b/data/templates/npc/monster/18668-WardOfDeath.xml
index ad25e6fc3..3855c3feb 100644
--- a/data/templates/npc/monster/18668-WardOfDeath.xml
+++ b/data/templates/npc/monster/18668-WardOfDeath.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18668" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18669.xml b/data/templates/npc/monster/18669.xml
index 6d9d395e5..06c3ae5b1 100644
--- a/data/templates/npc/monster/18669.xml
+++ b/data/templates/npc/monster/18669.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18669" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18670.xml b/data/templates/npc/monster/18670.xml
index 1bb0825e0..0e7e1d910 100644
--- a/data/templates/npc/monster/18670.xml
+++ b/data/templates/npc/monster/18670.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18670" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18671-Block.xml b/data/templates/npc/monster/18671-Block.xml
index 963226d73..bc685b7e5 100644
--- a/data/templates/npc/monster/18671-Block.xml
+++ b/data/templates/npc/monster/18671-Block.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18671" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18673-Block.xml b/data/templates/npc/monster/18673-Block.xml
index 8d91d5508..ace8d26fe 100644
--- a/data/templates/npc/monster/18673-Block.xml
+++ b/data/templates/npc/monster/18673-Block.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18673" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18674-Block.xml b/data/templates/npc/monster/18674-Block.xml
index 55dc32694..14a6c1d7d 100644
--- a/data/templates/npc/monster/18674-Block.xml
+++ b/data/templates/npc/monster/18674-Block.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18674" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18675-Block.xml b/data/templates/npc/monster/18675-Block.xml
index c7f2dcc0b..cc6246689 100644
--- a/data/templates/npc/monster/18675-Block.xml
+++ b/data/templates/npc/monster/18675-Block.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18675" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18676-BlockCarryingGirl.xml b/data/templates/npc/monster/18676-BlockCarryingGirl.xml
index 0763d835e..da985dbec 100644
--- a/data/templates/npc/monster/18676-BlockCarryingGirl.xml
+++ b/data/templates/npc/monster/18676-BlockCarryingGirl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18676" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18677-DragonSteedTroopMessenger.xml b/data/templates/npc/monster/18677-DragonSteedTroopMessenger.xml
index f02b25534..860e49d5f 100644
--- a/data/templates/npc/monster/18677-DragonSteedTroopMessenger.xml
+++ b/data/templates/npc/monster/18677-DragonSteedTroopMessenger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18677" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18693-TreasureBoxOfTheAncientGiants.xml b/data/templates/npc/monster/18693-TreasureBoxOfTheAncientGiants.xml
index 18decf268..70993af72 100644
--- a/data/templates/npc/monster/18693-TreasureBoxOfTheAncientGiants.xml
+++ b/data/templates/npc/monster/18693-TreasureBoxOfTheAncientGiants.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18693" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18694-TreasureBoxGuard.xml b/data/templates/npc/monster/18694-TreasureBoxGuard.xml
index 86a879496..92e94ee74 100644
--- a/data/templates/npc/monster/18694-TreasureBoxGuard.xml
+++ b/data/templates/npc/monster/18694-TreasureBoxGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18694" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18695-TreasureBoxGuard.xml b/data/templates/npc/monster/18695-TreasureBoxGuard.xml
index 1937d1ac7..af63327ef 100644
--- a/data/templates/npc/monster/18695-TreasureBoxGuard.xml
+++ b/data/templates/npc/monster/18695-TreasureBoxGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18695" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18696-DimensionMovingDevice.xml b/data/templates/npc/monster/18696-DimensionMovingDevice.xml
index 2bf436508..fc04d780a 100644
--- a/data/templates/npc/monster/18696-DimensionMovingDevice.xml
+++ b/data/templates/npc/monster/18696-DimensionMovingDevice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18696" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18697-Trap.xml b/data/templates/npc/monster/18697-Trap.xml
index 48fe56c6f..364d3a593 100644
--- a/data/templates/npc/monster/18697-Trap.xml
+++ b/data/templates/npc/monster/18697-Trap.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18697" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18698-Trap.xml b/data/templates/npc/monster/18698-Trap.xml
index f9c2b482f..3eeef2250 100644
--- a/data/templates/npc/monster/18698-Trap.xml
+++ b/data/templates/npc/monster/18698-Trap.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18698" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18699-Trap.xml b/data/templates/npc/monster/18699-Trap.xml
index eb506e59f..5f432dbb2 100644
--- a/data/templates/npc/monster/18699-Trap.xml
+++ b/data/templates/npc/monster/18699-Trap.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18699" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18700.xml b/data/templates/npc/monster/18700.xml
index 957f310a7..5f17e3aec 100644
--- a/data/templates/npc/monster/18700.xml
+++ b/data/templates/npc/monster/18700.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18700" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18701.xml b/data/templates/npc/monster/18701.xml
index 560cf77ca..2544e15da 100644
--- a/data/templates/npc/monster/18701.xml
+++ b/data/templates/npc/monster/18701.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18701" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18703-DefeatedTroopsController.xml b/data/templates/npc/monster/18703-DefeatedTroopsController.xml
index 17442804b..b6af9c557 100644
--- a/data/templates/npc/monster/18703-DefeatedTroopsController.xml
+++ b/data/templates/npc/monster/18703-DefeatedTroopsController.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18703" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18704-TumorOfDeath.xml b/data/templates/npc/monster/18704-TumorOfDeath.xml
index 546184c9c..e4d672581 100644
--- a/data/templates/npc/monster/18704-TumorOfDeath.xml
+++ b/data/templates/npc/monster/18704-TumorOfDeath.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18704" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18706-SoulCoffin.xml b/data/templates/npc/monster/18706-SoulCoffin.xml
index 9816631d4..765b978e6 100644
--- a/data/templates/npc/monster/18706-SoulCoffin.xml
+++ b/data/templates/npc/monster/18706-SoulCoffin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18706" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18707.xml b/data/templates/npc/monster/18707.xml
index a2850611d..19c88d409 100644
--- a/data/templates/npc/monster/18707.xml
+++ b/data/templates/npc/monster/18707.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18707" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18708-TumorOfDeath.xml b/data/templates/npc/monster/18708-TumorOfDeath.xml
index 06db10b2c..6cee377ca 100644
--- a/data/templates/npc/monster/18708-TumorOfDeath.xml
+++ b/data/templates/npc/monster/18708-TumorOfDeath.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18708" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18709-SoulCoffin.xml b/data/templates/npc/monster/18709-SoulCoffin.xml
index 356acdde1..de26f7790 100644
--- a/data/templates/npc/monster/18709-SoulCoffin.xml
+++ b/data/templates/npc/monster/18709-SoulCoffin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18709" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18710-SoulCoffin.xml b/data/templates/npc/monster/18710-SoulCoffin.xml
index b4467eece..553367ff2 100644
--- a/data/templates/npc/monster/18710-SoulCoffin.xml
+++ b/data/templates/npc/monster/18710-SoulCoffin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18710" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18711-SoulCoffin.xml b/data/templates/npc/monster/18711-SoulCoffin.xml
index 8194e2a18..1d9f0e32d 100644
--- a/data/templates/npc/monster/18711-SoulCoffin.xml
+++ b/data/templates/npc/monster/18711-SoulCoffin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18711" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18712-SoulCoffin.xml b/data/templates/npc/monster/18712-SoulCoffin.xml
index 3b93d291f..23ce7f957 100644
--- a/data/templates/npc/monster/18712-SoulCoffin.xml
+++ b/data/templates/npc/monster/18712-SoulCoffin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18712" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18713-SoulCoffin.xml b/data/templates/npc/monster/18713-SoulCoffin.xml
index efbc3cde7..6d62f5ca3 100644
--- a/data/templates/npc/monster/18713-SoulCoffin.xml
+++ b/data/templates/npc/monster/18713-SoulCoffin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18713" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18714-SoulCoffin.xml b/data/templates/npc/monster/18714-SoulCoffin.xml
index d1a3f7596..b93e1a2ca 100644
--- a/data/templates/npc/monster/18714-SoulCoffin.xml
+++ b/data/templates/npc/monster/18714-SoulCoffin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18714" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18715-ConqueredSoul.xml b/data/templates/npc/monster/18715-ConqueredSoul.xml
index afd324622..a1bf068f2 100644
--- a/data/templates/npc/monster/18715-ConqueredSoul.xml
+++ b/data/templates/npc/monster/18715-ConqueredSoul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18715" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18716-ConqueredSoul.xml b/data/templates/npc/monster/18716-ConqueredSoul.xml
index 3d63032e3..b015b784d 100644
--- a/data/templates/npc/monster/18716-ConqueredSoul.xml
+++ b/data/templates/npc/monster/18716-ConqueredSoul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18716" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18717-ConqueredSoul.xml b/data/templates/npc/monster/18717-ConqueredSoul.xml
index 081cc894e..3e083e980 100644
--- a/data/templates/npc/monster/18717-ConqueredSoul.xml
+++ b/data/templates/npc/monster/18717-ConqueredSoul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18717" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18776-Obelisk.xml b/data/templates/npc/monster/18776-Obelisk.xml
index ec47ca8ac..b6919aca4 100644
--- a/data/templates/npc/monster/18776-Obelisk.xml
+++ b/data/templates/npc/monster/18776-Obelisk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18776" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18777-GreatPowerfulDevice.xml b/data/templates/npc/monster/18777-GreatPowerfulDevice.xml
index fb57e3047..4495af261 100644
--- a/data/templates/npc/monster/18777-GreatPowerfulDevice.xml
+++ b/data/templates/npc/monster/18777-GreatPowerfulDevice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18777" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18778-ThroneOfDestructionPowerfulDevice.xml b/data/templates/npc/monster/18778-ThroneOfDestructionPowerfulDevice.xml
index 867723c8e..04e7e861e 100644
--- a/data/templates/npc/monster/18778-ThroneOfDestructionPowerfulDevice.xml
+++ b/data/templates/npc/monster/18778-ThroneOfDestructionPowerfulDevice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18778" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18779.xml b/data/templates/npc/monster/18779.xml
index 1044a52e9..a37520b31 100644
--- a/data/templates/npc/monster/18779.xml
+++ b/data/templates/npc/monster/18779.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18779" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18780-SymbolOfCohemenes.xml b/data/templates/npc/monster/18780-SymbolOfCohemenes.xml
index ab86fa0d3..a8770531f 100644
--- a/data/templates/npc/monster/18780-SymbolOfCohemenes.xml
+++ b/data/templates/npc/monster/18780-SymbolOfCohemenes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18780" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18781-YoungDrakeWing.xml b/data/templates/npc/monster/18781-YoungDrakeWing.xml
index 0f64e7900..a12a0b5d8 100644
--- a/data/templates/npc/monster/18781-YoungDrakeWing.xml
+++ b/data/templates/npc/monster/18781-YoungDrakeWing.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18781" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18782-ZealotOfShilen.xml b/data/templates/npc/monster/18782-ZealotOfShilen.xml
index f1c8a45fd..0ddd5176d 100644
--- a/data/templates/npc/monster/18782-ZealotOfShilen.xml
+++ b/data/templates/npc/monster/18782-ZealotOfShilen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18782" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18783-DefeatedTroopsCommander.xml b/data/templates/npc/monster/18783-DefeatedTroopsCommander.xml
index 39269be03..986d44e51 100644
--- a/data/templates/npc/monster/18783-DefeatedTroopsCommander.xml
+++ b/data/templates/npc/monster/18783-DefeatedTroopsCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18783" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18784-DefeatedTroopsNo1BattalionCommander.xml b/data/templates/npc/monster/18784-DefeatedTroopsNo1BattalionCommander.xml
index eb5287587..794854900 100644
--- a/data/templates/npc/monster/18784-DefeatedTroopsNo1BattalionCommander.xml
+++ b/data/templates/npc/monster/18784-DefeatedTroopsNo1BattalionCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18784" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18785-DefeatedTroopsWhiteDragonLeader.xml b/data/templates/npc/monster/18785-DefeatedTroopsWhiteDragonLeader.xml
index d7664991b..b5fdd9cb3 100644
--- a/data/templates/npc/monster/18785-DefeatedTroopsWhiteDragonLeader.xml
+++ b/data/templates/npc/monster/18785-DefeatedTroopsWhiteDragonLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18785" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18786-DefeatedTroopsInfantry.xml b/data/templates/npc/monster/18786-DefeatedTroopsInfantry.xml
index a7de52980..cffc05b78 100644
--- a/data/templates/npc/monster/18786-DefeatedTroopsInfantry.xml
+++ b/data/templates/npc/monster/18786-DefeatedTroopsInfantry.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18786" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18787-DefeatedTroopsMagicLeader.xml b/data/templates/npc/monster/18787-DefeatedTroopsMagicLeader.xml
index 34a4605d8..3bc9a5cc8 100644
--- a/data/templates/npc/monster/18787-DefeatedTroopsMagicLeader.xml
+++ b/data/templates/npc/monster/18787-DefeatedTroopsMagicLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18787" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18788-DefeatedTroopsMagician.xml b/data/templates/npc/monster/18788-DefeatedTroopsMagician.xml
index 18847bdbc..240a4a3fc 100644
--- a/data/templates/npc/monster/18788-DefeatedTroopsMagician.xml
+++ b/data/templates/npc/monster/18788-DefeatedTroopsMagician.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18788" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18789-DefeatedTroopsMagicSoldier.xml b/data/templates/npc/monster/18789-DefeatedTroopsMagicSoldier.xml
index 79f9c9c3d..97e517e70 100644
--- a/data/templates/npc/monster/18789-DefeatedTroopsMagicSoldier.xml
+++ b/data/templates/npc/monster/18789-DefeatedTroopsMagicSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18789" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18790-DefeatedTroopsHealer.xml b/data/templates/npc/monster/18790-DefeatedTroopsHealer.xml
index 036a9a6f3..08c885674 100644
--- a/data/templates/npc/monster/18790-DefeatedTroopsHealer.xml
+++ b/data/templates/npc/monster/18790-DefeatedTroopsHealer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18790" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18791-DefeatedTroopsJavelinThrower.xml b/data/templates/npc/monster/18791-DefeatedTroopsJavelinThrower.xml
index 5415e7048..d362fd8fe 100644
--- a/data/templates/npc/monster/18791-DefeatedTroopsJavelinThrower.xml
+++ b/data/templates/npc/monster/18791-DefeatedTroopsJavelinThrower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18791" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18792-DefeatedTroopsJavelinThrower.xml b/data/templates/npc/monster/18792-DefeatedTroopsJavelinThrower.xml
index 63654b0a1..2c68a27a0 100644
--- a/data/templates/npc/monster/18792-DefeatedTroopsJavelinThrower.xml
+++ b/data/templates/npc/monster/18792-DefeatedTroopsJavelinThrower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18792" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18793-BizarreCocoon.xml b/data/templates/npc/monster/18793-BizarreCocoon.xml
index 10621b589..6333d2d9a 100644
--- a/data/templates/npc/monster/18793-BizarreCocoon.xml
+++ b/data/templates/npc/monster/18793-BizarreCocoon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18793" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18794-BizarreCocoon.xml b/data/templates/npc/monster/18794-BizarreCocoon.xml
index 82b674fe7..5d2eaab48 100644
--- a/data/templates/npc/monster/18794-BizarreCocoon.xml
+++ b/data/templates/npc/monster/18794-BizarreCocoon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18794" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18795-BizarreCocoon.xml b/data/templates/npc/monster/18795-BizarreCocoon.xml
index 2689d0775..c767841e5 100644
--- a/data/templates/npc/monster/18795-BizarreCocoon.xml
+++ b/data/templates/npc/monster/18795-BizarreCocoon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18795" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18796-BizarreCocoon.xml b/data/templates/npc/monster/18796-BizarreCocoon.xml
index 773ad73f3..ba2b6aeef 100644
--- a/data/templates/npc/monster/18796-BizarreCocoon.xml
+++ b/data/templates/npc/monster/18796-BizarreCocoon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18796" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18797-BizarreCocoon.xml b/data/templates/npc/monster/18797-BizarreCocoon.xml
index c43d26005..cc5ce2a2e 100644
--- a/data/templates/npc/monster/18797-BizarreCocoon.xml
+++ b/data/templates/npc/monster/18797-BizarreCocoon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18797" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18798-BizarreCocoon.xml b/data/templates/npc/monster/18798-BizarreCocoon.xml
index 2da70dcaf..4040de137 100644
--- a/data/templates/npc/monster/18798-BizarreCocoon.xml
+++ b/data/templates/npc/monster/18798-BizarreCocoon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18798" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18799-NewbornLavasaurus.xml b/data/templates/npc/monster/18799-NewbornLavasaurus.xml
index 9d02df1c8..bd491bd60 100644
--- a/data/templates/npc/monster/18799-NewbornLavasaurus.xml
+++ b/data/templates/npc/monster/18799-NewbornLavasaurus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18799" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18800-FledglingLavasaurus.xml b/data/templates/npc/monster/18800-FledglingLavasaurus.xml
index 2d98b2067..7cd97191d 100644
--- a/data/templates/npc/monster/18800-FledglingLavasaurus.xml
+++ b/data/templates/npc/monster/18800-FledglingLavasaurus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18800" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18801-AdultLavasaurus.xml b/data/templates/npc/monster/18801-AdultLavasaurus.xml
index 2d85dafe6..f344fd7ec 100644
--- a/data/templates/npc/monster/18801-AdultLavasaurus.xml
+++ b/data/templates/npc/monster/18801-AdultLavasaurus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18801" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18802-ElderlyLavasaurus.xml b/data/templates/npc/monster/18802-ElderlyLavasaurus.xml
index 82d39a4b6..586ee4754 100644
--- a/data/templates/npc/monster/18802-ElderlyLavasaurus.xml
+++ b/data/templates/npc/monster/18802-ElderlyLavasaurus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18802" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18803-AncientLavasaurus.xml b/data/templates/npc/monster/18803-AncientLavasaurus.xml
index b282e840b..2e9b29f9e 100644
--- a/data/templates/npc/monster/18803-AncientLavasaurus.xml
+++ b/data/templates/npc/monster/18803-AncientLavasaurus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18803" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18804-TarBeetle.xml b/data/templates/npc/monster/18804-TarBeetle.xml
index fc83adf25..a5e0828d0 100644
--- a/data/templates/npc/monster/18804-TarBeetle.xml
+++ b/data/templates/npc/monster/18804-TarBeetle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18804" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="false" attackable="true">
diff --git a/data/templates/npc/monster/18805-WasteLandfillMachine.xml b/data/templates/npc/monster/18805-WasteLandfillMachine.xml
index 28974cd3f..89d7cd6d2 100644
--- a/data/templates/npc/monster/18805-WasteLandfillMachine.xml
+++ b/data/templates/npc/monster/18805-WasteLandfillMachine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18805" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18806-BrazierOfPurity.xml b/data/templates/npc/monster/18806-BrazierOfPurity.xml
index 165814391..91edcf0a3 100644
--- a/data/templates/npc/monster/18806-BrazierOfPurity.xml
+++ b/data/templates/npc/monster/18806-BrazierOfPurity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18806" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18807-FrightenedRagnaOrc.xml b/data/templates/npc/monster/18807-FrightenedRagnaOrc.xml
index 0975d9435..9489b3acb 100644
--- a/data/templates/npc/monster/18807-FrightenedRagnaOrc.xml
+++ b/data/templates/npc/monster/18807-FrightenedRagnaOrc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18807" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18808-DarkShamanVarangka.xml b/data/templates/npc/monster/18808-DarkShamanVarangka.xml
index 24299e735..7cfb6f254 100644
--- a/data/templates/npc/monster/18808-DarkShamanVarangka.xml
+++ b/data/templates/npc/monster/18808-DarkShamanVarangka.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18808" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18809-VarangkaSRetainer.xml b/data/templates/npc/monster/18809-VarangkaSRetainer.xml
index 85455838e..d7712cc83 100644
--- a/data/templates/npc/monster/18809-VarangkaSRetainer.xml
+++ b/data/templates/npc/monster/18809-VarangkaSRetainer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18809" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18810-VarangkaSPage.xml b/data/templates/npc/monster/18810-VarangkaSPage.xml
index 96f5a3a8d..3b29f9384 100644
--- a/data/templates/npc/monster/18810-VarangkaSPage.xml
+++ b/data/templates/npc/monster/18810-VarangkaSPage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18810" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18811-GuardianOfTheAltar.xml b/data/templates/npc/monster/18811-GuardianOfTheAltar.xml
index f80e4d52f..d11325330 100644
--- a/data/templates/npc/monster/18811-GuardianOfTheAltar.xml
+++ b/data/templates/npc/monster/18811-GuardianOfTheAltar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18811" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18812-KashaSEye.xml b/data/templates/npc/monster/18812-KashaSEye.xml
index 3c69a82d4..29796c0cb 100644
--- a/data/templates/npc/monster/18812-KashaSEye.xml
+++ b/data/templates/npc/monster/18812-KashaSEye.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18812" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18813-KashaSEye.xml b/data/templates/npc/monster/18813-KashaSEye.xml
index e66618dd1..eda7989cc 100644
--- a/data/templates/npc/monster/18813-KashaSEye.xml
+++ b/data/templates/npc/monster/18813-KashaSEye.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18813" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18814-KashaSEye.xml b/data/templates/npc/monster/18814-KashaSEye.xml
index 6881614a5..07247517f 100644
--- a/data/templates/npc/monster/18814-KashaSEye.xml
+++ b/data/templates/npc/monster/18814-KashaSEye.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18814" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18815-GuardOfTheGrave.xml b/data/templates/npc/monster/18815-GuardOfTheGrave.xml
index 17d0d8c54..37c6749fd 100644
--- a/data/templates/npc/monster/18815-GuardOfTheGrave.xml
+++ b/data/templates/npc/monster/18815-GuardOfTheGrave.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18815" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18816-ChieftainSTreasureChest.xml b/data/templates/npc/monster/18816-ChieftainSTreasureChest.xml
index f56a49462..6842243ae 100644
--- a/data/templates/npc/monster/18816-ChieftainSTreasureChest.xml
+++ b/data/templates/npc/monster/18816-ChieftainSTreasureChest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18816" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18817-InvaderMartyrOfNightmare.xml b/data/templates/npc/monster/18817-InvaderMartyrOfNightmare.xml
index 992b11b62..54ac13adc 100644
--- a/data/templates/npc/monster/18817-InvaderMartyrOfNightmare.xml
+++ b/data/templates/npc/monster/18817-InvaderMartyrOfNightmare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18817" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18818-NihilInvaderMartyr.xml b/data/templates/npc/monster/18818-NihilInvaderMartyr.xml
index 59a04cc14..c701c117b 100644
--- a/data/templates/npc/monster/18818-NihilInvaderMartyr.xml
+++ b/data/templates/npc/monster/18818-NihilInvaderMartyr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18818" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18819-NihilInvaderTreasureChest.xml b/data/templates/npc/monster/18819-NihilInvaderTreasureChest.xml
index 989fba935..9cf77dbd9 100644
--- a/data/templates/npc/monster/18819-NihilInvaderTreasureChest.xml
+++ b/data/templates/npc/monster/18819-NihilInvaderTreasureChest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18819" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18820-NihilInvaderTreasureChest.xml b/data/templates/npc/monster/18820-NihilInvaderTreasureChest.xml
index 5715bd7e1..879978a9d 100644
--- a/data/templates/npc/monster/18820-NihilInvaderTreasureChest.xml
+++ b/data/templates/npc/monster/18820-NihilInvaderTreasureChest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18820" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18821-MutantMartyr.xml b/data/templates/npc/monster/18821-MutantMartyr.xml
index 20d373bfa..d917e6192 100644
--- a/data/templates/npc/monster/18821-MutantMartyr.xml
+++ b/data/templates/npc/monster/18821-MutantMartyr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18821" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18822-MutantTreasureChest.xml b/data/templates/npc/monster/18822-MutantTreasureChest.xml
index e512cd1eb..26321a13c 100644
--- a/data/templates/npc/monster/18822-MutantTreasureChest.xml
+++ b/data/templates/npc/monster/18822-MutantTreasureChest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18822" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18823-MutantTreasureChest.xml b/data/templates/npc/monster/18823-MutantTreasureChest.xml
index e8efb7137..fe3debc00 100644
--- a/data/templates/npc/monster/18823-MutantTreasureChest.xml
+++ b/data/templates/npc/monster/18823-MutantTreasureChest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18823" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18862-TantaLizardmanGuard.xml b/data/templates/npc/monster/18862-TantaLizardmanGuard.xml
index c7cafddb6..07ac7a8e7 100644
--- a/data/templates/npc/monster/18862-TantaLizardmanGuard.xml
+++ b/data/templates/npc/monster/18862-TantaLizardmanGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18862" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18863-SeerUgoros.xml b/data/templates/npc/monster/18863-SeerUgoros.xml
index e7333923d..a698d424b 100644
--- a/data/templates/npc/monster/18863-SeerUgoros.xml
+++ b/data/templates/npc/monster/18863-SeerUgoros.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18863" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18864-FantasyMushroom.xml b/data/templates/npc/monster/18864-FantasyMushroom.xml
index d78a8ccae..8bf0dd976 100644
--- a/data/templates/npc/monster/18864-FantasyMushroom.xml
+++ b/data/templates/npc/monster/18864-FantasyMushroom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18864" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18865-StickyMushroom.xml b/data/templates/npc/monster/18865-StickyMushroom.xml
index 827477cd0..32cf101f8 100644
--- a/data/templates/npc/monster/18865-StickyMushroom.xml
+++ b/data/templates/npc/monster/18865-StickyMushroom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18865" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18866-RainbowFrog.xml b/data/templates/npc/monster/18866-RainbowFrog.xml
index 1abb82b76..d02ace699 100644
--- a/data/templates/npc/monster/18866-RainbowFrog.xml
+++ b/data/templates/npc/monster/18866-RainbowFrog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18866" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18867-AbyssWeed.xml b/data/templates/npc/monster/18867-AbyssWeed.xml
index ccc7a7371..d6f34ba80 100644
--- a/data/templates/npc/monster/18867-AbyssWeed.xml
+++ b/data/templates/npc/monster/18867-AbyssWeed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18867" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18868-EnergyPlant.xml b/data/templates/npc/monster/18868-EnergyPlant.xml
index ada251252..05de65c64 100644
--- a/data/templates/npc/monster/18868-EnergyPlant.xml
+++ b/data/templates/npc/monster/18868-EnergyPlant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18868" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18906-FarmBandit.xml b/data/templates/npc/monster/18906-FarmBandit.xml
index 95edade68..30034b507 100644
--- a/data/templates/npc/monster/18906-FarmBandit.xml
+++ b/data/templates/npc/monster/18906-FarmBandit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18906" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18907-BeastDevourer.xml b/data/templates/npc/monster/18907-BeastDevourer.xml
index ab1714141..a60d3a153 100644
--- a/data/templates/npc/monster/18907-BeastDevourer.xml
+++ b/data/templates/npc/monster/18907-BeastDevourer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18907" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18908-SelMahumChef.xml b/data/templates/npc/monster/18908-SelMahumChef.xml
index 5bd838546..39e46e326 100644
--- a/data/templates/npc/monster/18908-SelMahumChef.xml
+++ b/data/templates/npc/monster/18908-SelMahumChef.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18908" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18909-SolinaKnights.xml b/data/templates/npc/monster/18909-SolinaKnights.xml
index 08a8fbf9d..c8b768561 100644
--- a/data/templates/npc/monster/18909-SolinaKnights.xml
+++ b/data/templates/npc/monster/18909-SolinaKnights.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18909" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18910-SolinaKnightCaptain.xml b/data/templates/npc/monster/18910-SolinaKnightCaptain.xml
index b22a3419f..91394ed8c 100644
--- a/data/templates/npc/monster/18910-SolinaKnightCaptain.xml
+++ b/data/templates/npc/monster/18910-SolinaKnightCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18910" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18912-Scarecrow.xml b/data/templates/npc/monster/18912-Scarecrow.xml
index b7e890d35..d1c227760 100644
--- a/data/templates/npc/monster/18912-Scarecrow.xml
+++ b/data/templates/npc/monster/18912-Scarecrow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18912" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/18917-PavelSafetyDevice.xml b/data/templates/npc/monster/18917-PavelSafetyDevice.xml
index 080640b57..3c62c2b8e 100644
--- a/data/templates/npc/monster/18917-PavelSafetyDevice.xml
+++ b/data/templates/npc/monster/18917-PavelSafetyDevice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="18917" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20001-Gremlin.xml b/data/templates/npc/monster/20001-Gremlin.xml
index 1696af279..1eb7b3592 100644
--- a/data/templates/npc/monster/20001-Gremlin.xml
+++ b/data/templates/npc/monster/20001-Gremlin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20001" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20002-Rabbit.xml b/data/templates/npc/monster/20002-Rabbit.xml
index e216e9679..6f540cb8b 100644
--- a/data/templates/npc/monster/20002-Rabbit.xml
+++ b/data/templates/npc/monster/20002-Rabbit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20002" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20003-Goblin.xml b/data/templates/npc/monster/20003-Goblin.xml
index e2739fe4d..b510a73f7 100644
--- a/data/templates/npc/monster/20003-Goblin.xml
+++ b/data/templates/npc/monster/20003-Goblin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20003" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20004-Imp.xml b/data/templates/npc/monster/20004-Imp.xml
index f0344e81c..b629de6d5 100644
--- a/data/templates/npc/monster/20004-Imp.xml
+++ b/data/templates/npc/monster/20004-Imp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20004" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20005-ImpElder.xml b/data/templates/npc/monster/20005-ImpElder.xml
index 39f665a70..7c7e425fd 100644
--- a/data/templates/npc/monster/20005-ImpElder.xml
+++ b/data/templates/npc/monster/20005-ImpElder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20005" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20006-OrcArcher.xml b/data/templates/npc/monster/20006-OrcArcher.xml
index 7252ae773..521c5d9aa 100644
--- a/data/templates/npc/monster/20006-OrcArcher.xml
+++ b/data/templates/npc/monster/20006-OrcArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20006" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20007-GreenFungus.xml b/data/templates/npc/monster/20007-GreenFungus.xml
index bd8cc7587..d65036a2f 100644
--- a/data/templates/npc/monster/20007-GreenFungus.xml
+++ b/data/templates/npc/monster/20007-GreenFungus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20007" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20008-FelimLizardman.xml b/data/templates/npc/monster/20008-FelimLizardman.xml
index 4864e97c4..f55e610e1 100644
--- a/data/templates/npc/monster/20008-FelimLizardman.xml
+++ b/data/templates/npc/monster/20008-FelimLizardman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20008" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20009-VukuOrc.xml b/data/templates/npc/monster/20009-VukuOrc.xml
index c7958b79f..e07e1de72 100644
--- a/data/templates/npc/monster/20009-VukuOrc.xml
+++ b/data/templates/npc/monster/20009-VukuOrc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20009" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20010-FelimLizardmanScout.xml b/data/templates/npc/monster/20010-FelimLizardmanScout.xml
index 0b649ab0b..144d86779 100644
--- a/data/templates/npc/monster/20010-FelimLizardmanScout.xml
+++ b/data/templates/npc/monster/20010-FelimLizardmanScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20010" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20011-VukuOrcArcher.xml b/data/templates/npc/monster/20011-VukuOrcArcher.xml
index d608e21e8..3b78f57a6 100644
--- a/data/templates/npc/monster/20011-VukuOrcArcher.xml
+++ b/data/templates/npc/monster/20011-VukuOrcArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20011" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20012-GoraWerewolf.xml b/data/templates/npc/monster/20012-GoraWerewolf.xml
index adb1dcaff..18b365e79 100644
--- a/data/templates/npc/monster/20012-GoraWerewolf.xml
+++ b/data/templates/npc/monster/20012-GoraWerewolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20012" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20013-Dryad.xml b/data/templates/npc/monster/20013-Dryad.xml
index b5c4dbbe2..702d84659 100644
--- a/data/templates/npc/monster/20013-Dryad.xml
+++ b/data/templates/npc/monster/20013-Dryad.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20013" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20014-FelimLizardmanWarrior.xml b/data/templates/npc/monster/20014-FelimLizardmanWarrior.xml
index 7e74ab9d2..03dd1e4bd 100644
--- a/data/templates/npc/monster/20014-FelimLizardmanWarrior.xml
+++ b/data/templates/npc/monster/20014-FelimLizardmanWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20014" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20015-MarshZombie.xml b/data/templates/npc/monster/20015-MarshZombie.xml
index 7c387c9d2..291224f2b 100644
--- a/data/templates/npc/monster/20015-MarshZombie.xml
+++ b/data/templates/npc/monster/20015-MarshZombie.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20015" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20016-StoneGolem.xml b/data/templates/npc/monster/20016-StoneGolem.xml
index 024b02b68..342ea755e 100644
--- a/data/templates/npc/monster/20016-StoneGolem.xml
+++ b/data/templates/npc/monster/20016-StoneGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20016" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20017-VukuOrcFighter.xml b/data/templates/npc/monster/20017-VukuOrcFighter.xml
index 0df0b7eff..e7ba13679 100644
--- a/data/templates/npc/monster/20017-VukuOrcFighter.xml
+++ b/data/templates/npc/monster/20017-VukuOrcFighter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20017" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20018-CarnivorousFungus.xml b/data/templates/npc/monster/20018-CarnivorousFungus.xml
index 81fb4891f..3829c3f1a 100644
--- a/data/templates/npc/monster/20018-CarnivorousFungus.xml
+++ b/data/templates/npc/monster/20018-CarnivorousFungus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20018" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20019-DryadElder.xml b/data/templates/npc/monster/20019-DryadElder.xml
index 074d914aa..c72f79ed4 100644
--- a/data/templates/npc/monster/20019-DryadElder.xml
+++ b/data/templates/npc/monster/20019-DryadElder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20019" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20020-MarshZombieLord.xml b/data/templates/npc/monster/20020-MarshZombieLord.xml
index 587c49ba2..3c59930c9 100644
--- a/data/templates/npc/monster/20020-MarshZombieLord.xml
+++ b/data/templates/npc/monster/20020-MarshZombieLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20020" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20021-RedBear.xml b/data/templates/npc/monster/20021-RedBear.xml
index 25e52d988..61087f3f6 100644
--- a/data/templates/npc/monster/20021-RedBear.xml
+++ b/data/templates/npc/monster/20021-RedBear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20021" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20022-MiserySkeleton.xml b/data/templates/npc/monster/20022-MiserySkeleton.xml
index 6a7d5b271..7855b7c76 100644
--- a/data/templates/npc/monster/20022-MiserySkeleton.xml
+++ b/data/templates/npc/monster/20022-MiserySkeleton.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20022" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20023-ShadowBeast.xml b/data/templates/npc/monster/20023-ShadowBeast.xml
index c7527a5df..aa07e8fdb 100644
--- a/data/templates/npc/monster/20023-ShadowBeast.xml
+++ b/data/templates/npc/monster/20023-ShadowBeast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20023" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20024-LangkLizardmanWarrior.xml b/data/templates/npc/monster/20024-LangkLizardmanWarrior.xml
index f4ec222d1..7dfbb7cb4 100644
--- a/data/templates/npc/monster/20024-LangkLizardmanWarrior.xml
+++ b/data/templates/npc/monster/20024-LangkLizardmanWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20024" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20025-LesserDarkHorror.xml b/data/templates/npc/monster/20025-LesserDarkHorror.xml
index 635df5836..dee388259 100644
--- a/data/templates/npc/monster/20025-LesserDarkHorror.xml
+++ b/data/templates/npc/monster/20025-LesserDarkHorror.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20025" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20026-RuinZombie.xml b/data/templates/npc/monster/20026-RuinZombie.xml
index e8ec27d68..c78f2b883 100644
--- a/data/templates/npc/monster/20026-RuinZombie.xml
+++ b/data/templates/npc/monster/20026-RuinZombie.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20026" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20027-LangkLizardmanScout.xml b/data/templates/npc/monster/20027-LangkLizardmanScout.xml
index 199629353..466ccd255 100644
--- a/data/templates/npc/monster/20027-LangkLizardmanScout.xml
+++ b/data/templates/npc/monster/20027-LangkLizardmanScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20027" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20028-Pincher.xml b/data/templates/npc/monster/20028-Pincher.xml
index 12a3c9b71..737690d5c 100644
--- a/data/templates/npc/monster/20028-Pincher.xml
+++ b/data/templates/npc/monster/20028-Pincher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20028" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20029-RuinZombieLeader.xml b/data/templates/npc/monster/20029-RuinZombieLeader.xml
index 8ee04dfb9..b6385d115 100644
--- a/data/templates/npc/monster/20029-RuinZombieLeader.xml
+++ b/data/templates/npc/monster/20029-RuinZombieLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20029" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20030-LangkLizardman.xml b/data/templates/npc/monster/20030-LangkLizardman.xml
index 83cd3e1b8..f0f17d683 100644
--- a/data/templates/npc/monster/20030-LangkLizardman.xml
+++ b/data/templates/npc/monster/20030-LangkLizardman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20030" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20031-OmenBeast.xml b/data/templates/npc/monster/20031-OmenBeast.xml
index 1f66f6053..bcac0a504 100644
--- a/data/templates/npc/monster/20031-OmenBeast.xml
+++ b/data/templates/npc/monster/20031-OmenBeast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20031" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20032-Pinrul.xml b/data/templates/npc/monster/20032-Pinrul.xml
index 6821e62e7..d1b71497d 100644
--- a/data/templates/npc/monster/20032-Pinrul.xml
+++ b/data/templates/npc/monster/20032-Pinrul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20032" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20033-ShadeHorror.xml b/data/templates/npc/monster/20033-ShadeHorror.xml
index 069ef523c..b84081575 100644
--- a/data/templates/npc/monster/20033-ShadeHorror.xml
+++ b/data/templates/npc/monster/20033-ShadeHorror.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20033" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20034-Prowler.xml b/data/templates/npc/monster/20034-Prowler.xml
index 7a8781e47..7042aea0f 100644
--- a/data/templates/npc/monster/20034-Prowler.xml
+++ b/data/templates/npc/monster/20034-Prowler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20034" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20035-TrackerSkeleton.xml b/data/templates/npc/monster/20035-TrackerSkeleton.xml
index c7598a85f..8135a571d 100644
--- a/data/templates/npc/monster/20035-TrackerSkeleton.xml
+++ b/data/templates/npc/monster/20035-TrackerSkeleton.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20035" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20036-Lirein.xml b/data/templates/npc/monster/20036-Lirein.xml
index 8d3c93324..582698f24 100644
--- a/data/templates/npc/monster/20036-Lirein.xml
+++ b/data/templates/npc/monster/20036-Lirein.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20036" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20037-ManaSeeker.xml b/data/templates/npc/monster/20037-ManaSeeker.xml
index 18851e66a..43450dec6 100644
--- a/data/templates/npc/monster/20037-ManaSeeker.xml
+++ b/data/templates/npc/monster/20037-ManaSeeker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20037" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20038-VenomousSpider.xml b/data/templates/npc/monster/20038-VenomousSpider.xml
index f0882d5fd..b3d30b31d 100644
--- a/data/templates/npc/monster/20038-VenomousSpider.xml
+++ b/data/templates/npc/monster/20038-VenomousSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20038" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20039-ScavengerWererat.xml b/data/templates/npc/monster/20039-ScavengerWererat.xml
index 6fa29b1c4..06464338c 100644
--- a/data/templates/npc/monster/20039-ScavengerWererat.xml
+++ b/data/templates/npc/monster/20039-ScavengerWererat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20039" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20040-SukarWererat.xml b/data/templates/npc/monster/20040-SukarWererat.xml
index 28d0e81d6..39dc4a8d4 100644
--- a/data/templates/npc/monster/20040-SukarWererat.xml
+++ b/data/templates/npc/monster/20040-SukarWererat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20040" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20041-TaintedZombie.xml b/data/templates/npc/monster/20041-TaintedZombie.xml
index c77a67850..566922087 100644
--- a/data/templates/npc/monster/20041-TaintedZombie.xml
+++ b/data/templates/npc/monster/20041-TaintedZombie.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20041" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20042-TrackerSkeletonLeader.xml b/data/templates/npc/monster/20042-TrackerSkeletonLeader.xml
index 48eb2b24c..9c3836e17 100644
--- a/data/templates/npc/monster/20042-TrackerSkeletonLeader.xml
+++ b/data/templates/npc/monster/20042-TrackerSkeletonLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20042" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20043-ArachnidTracker.xml b/data/templates/npc/monster/20043-ArachnidTracker.xml
index c060117d9..8104eb423 100644
--- a/data/templates/npc/monster/20043-ArachnidTracker.xml
+++ b/data/templates/npc/monster/20043-ArachnidTracker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20043" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20044-LireinElder.xml b/data/templates/npc/monster/20044-LireinElder.xml
index 85a58ffe0..ba4df5055 100644
--- a/data/templates/npc/monster/20044-LireinElder.xml
+++ b/data/templates/npc/monster/20044-LireinElder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20044" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20045-SkeletonScout.xml b/data/templates/npc/monster/20045-SkeletonScout.xml
index 4e977c8f1..22c490d3a 100644
--- a/data/templates/npc/monster/20045-SkeletonScout.xml
+++ b/data/templates/npc/monster/20045-SkeletonScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20045" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20046-StinkZombie.xml b/data/templates/npc/monster/20046-StinkZombie.xml
index eb26925c4..60ce219c2 100644
--- a/data/templates/npc/monster/20046-StinkZombie.xml
+++ b/data/templates/npc/monster/20046-StinkZombie.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20046" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20047-SukarWereratLeader.xml b/data/templates/npc/monster/20047-SukarWereratLeader.xml
index 0af7b140a..f558b4e85 100644
--- a/data/templates/npc/monster/20047-SukarWereratLeader.xml
+++ b/data/templates/npc/monster/20047-SukarWereratLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20047" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20048-LesserSuccubus.xml b/data/templates/npc/monster/20048-LesserSuccubus.xml
index dbcaaa030..f9d4ff09f 100644
--- a/data/templates/npc/monster/20048-LesserSuccubus.xml
+++ b/data/templates/npc/monster/20048-LesserSuccubus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20048" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20049-Lycanthrope.xml b/data/templates/npc/monster/20049-Lycanthrope.xml
index 125e86cb2..33f9da161 100644
--- a/data/templates/npc/monster/20049-Lycanthrope.xml
+++ b/data/templates/npc/monster/20049-Lycanthrope.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20049" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20050-ArachnidPredator.xml b/data/templates/npc/monster/20050-ArachnidPredator.xml
index d12f14857..acb31859e 100644
--- a/data/templates/npc/monster/20050-ArachnidPredator.xml
+++ b/data/templates/npc/monster/20050-ArachnidPredator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20050" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20051-SkeletonBowman.xml b/data/templates/npc/monster/20051-SkeletonBowman.xml
index 507d84e5a..87da5be26 100644
--- a/data/templates/npc/monster/20051-SkeletonBowman.xml
+++ b/data/templates/npc/monster/20051-SkeletonBowman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20051" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20052-LesserSuccubusTuren.xml b/data/templates/npc/monster/20052-LesserSuccubusTuren.xml
index 26542f240..4273495fb 100644
--- a/data/templates/npc/monster/20052-LesserSuccubusTuren.xml
+++ b/data/templates/npc/monster/20052-LesserSuccubusTuren.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20052" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20053-OlMahumPatrol.xml b/data/templates/npc/monster/20053-OlMahumPatrol.xml
index 933710123..28de5fa02 100644
--- a/data/templates/npc/monster/20053-OlMahumPatrol.xml
+++ b/data/templates/npc/monster/20053-OlMahumPatrol.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20053" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20054-RuinSpartoi.xml b/data/templates/npc/monster/20054-RuinSpartoi.xml
index fb08587aa..780def231 100644
--- a/data/templates/npc/monster/20054-RuinSpartoi.xml
+++ b/data/templates/npc/monster/20054-RuinSpartoi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20054" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20055-WanderingEye.xml b/data/templates/npc/monster/20055-WanderingEye.xml
index 10c2732b6..79d412a7b 100644
--- a/data/templates/npc/monster/20055-WanderingEye.xml
+++ b/data/templates/npc/monster/20055-WanderingEye.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20055" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20056-DreVanulDisposer.xml b/data/templates/npc/monster/20056-DreVanulDisposer.xml
index b8cc277cc..b8b8f53aa 100644
--- a/data/templates/npc/monster/20056-DreVanulDisposer.xml
+++ b/data/templates/npc/monster/20056-DreVanulDisposer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20056" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20057-LesserSuccubusTilfo.xml b/data/templates/npc/monster/20057-LesserSuccubusTilfo.xml
index 152d2cc50..d0eb86ad2 100644
--- a/data/templates/npc/monster/20057-LesserSuccubusTilfo.xml
+++ b/data/templates/npc/monster/20057-LesserSuccubusTilfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20057" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20058-OlMahumGuard.xml b/data/templates/npc/monster/20058-OlMahumGuard.xml
index 9c8418718..efe66661e 100644
--- a/data/templates/npc/monster/20058-OlMahumGuard.xml
+++ b/data/templates/npc/monster/20058-OlMahumGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20058" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20059-HungryEye.xml b/data/templates/npc/monster/20059-HungryEye.xml
index 582e3c09e..329ba5894 100644
--- a/data/templates/npc/monster/20059-HungryEye.xml
+++ b/data/templates/npc/monster/20059-HungryEye.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20059" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20060-RagingSpartoi.xml b/data/templates/npc/monster/20060-RagingSpartoi.xml
index 2bb435b7a..3a8b26a9d 100644
--- a/data/templates/npc/monster/20060-RagingSpartoi.xml
+++ b/data/templates/npc/monster/20060-RagingSpartoi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20060" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20061-OlMahumStraggler.xml b/data/templates/npc/monster/20061-OlMahumStraggler.xml
index 4b401ef42..c0727461d 100644
--- a/data/templates/npc/monster/20061-OlMahumStraggler.xml
+++ b/data/templates/npc/monster/20061-OlMahumStraggler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20061" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20062-TumranBugbear.xml b/data/templates/npc/monster/20062-TumranBugbear.xml
index f8ca7a79a..2b86b81e9 100644
--- a/data/templates/npc/monster/20062-TumranBugbear.xml
+++ b/data/templates/npc/monster/20062-TumranBugbear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20062" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20063-OlMahumShooter.xml b/data/templates/npc/monster/20063-OlMahumShooter.xml
index 09b7ceb86..8f80b6ae9 100644
--- a/data/templates/npc/monster/20063-OlMahumShooter.xml
+++ b/data/templates/npc/monster/20063-OlMahumShooter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20063" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20064-TumranBugbearWarrior.xml b/data/templates/npc/monster/20064-TumranBugbearWarrior.xml
index e484f5303..f0c8338a6 100644
--- a/data/templates/npc/monster/20064-TumranBugbearWarrior.xml
+++ b/data/templates/npc/monster/20064-TumranBugbearWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20064" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20065-OlMahumPatrolman.xml b/data/templates/npc/monster/20065-OlMahumPatrolman.xml
index c1290cfde..71c92e3f8 100644
--- a/data/templates/npc/monster/20065-OlMahumPatrolman.xml
+++ b/data/templates/npc/monster/20065-OlMahumPatrolman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20065" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20066-OlMahumCaptain.xml b/data/templates/npc/monster/20066-OlMahumCaptain.xml
index ac97352c6..56485fc09 100644
--- a/data/templates/npc/monster/20066-OlMahumCaptain.xml
+++ b/data/templates/npc/monster/20066-OlMahumCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20066" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20067-MonsterEyeWatcher.xml b/data/templates/npc/monster/20067-MonsterEyeWatcher.xml
index c27a68648..c9bda97ff 100644
--- a/data/templates/npc/monster/20067-MonsterEyeWatcher.xml
+++ b/data/templates/npc/monster/20067-MonsterEyeWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20067" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20068-MonsterEyeDestroyer.xml b/data/templates/npc/monster/20068-MonsterEyeDestroyer.xml
index b7b180ab5..2695d54ae 100644
--- a/data/templates/npc/monster/20068-MonsterEyeDestroyer.xml
+++ b/data/templates/npc/monster/20068-MonsterEyeDestroyer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20068" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20069-SeluLizardmanScout.xml b/data/templates/npc/monster/20069-SeluLizardmanScout.xml
index 345f16112..4e424d8a2 100644
--- a/data/templates/npc/monster/20069-SeluLizardmanScout.xml
+++ b/data/templates/npc/monster/20069-SeluLizardmanScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20069" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20070-LesserBasilisk.xml b/data/templates/npc/monster/20070-LesserBasilisk.xml
index bbde20cc1..7f35f03c2 100644
--- a/data/templates/npc/monster/20070-LesserBasilisk.xml
+++ b/data/templates/npc/monster/20070-LesserBasilisk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20070" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20071-SeluLizardmanWarrior.xml b/data/templates/npc/monster/20071-SeluLizardmanWarrior.xml
index 401ecbda3..7b915ee60 100644
--- a/data/templates/npc/monster/20071-SeluLizardmanWarrior.xml
+++ b/data/templates/npc/monster/20071-SeluLizardmanWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20071" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20072-Basilisk.xml b/data/templates/npc/monster/20072-Basilisk.xml
index 6860b8201..d6b9bdd44 100644
--- a/data/templates/npc/monster/20072-Basilisk.xml
+++ b/data/templates/npc/monster/20072-Basilisk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20072" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20073-OlMahumLegionnaire.xml b/data/templates/npc/monster/20073-OlMahumLegionnaire.xml
index b84b8dd0f..9742d7bbc 100644
--- a/data/templates/npc/monster/20073-OlMahumLegionnaire.xml
+++ b/data/templates/npc/monster/20073-OlMahumLegionnaire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20073" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20074-Androscorpio.xml b/data/templates/npc/monster/20074-Androscorpio.xml
index 391fff16f..956011e06 100644
--- a/data/templates/npc/monster/20074-Androscorpio.xml
+++ b/data/templates/npc/monster/20074-Androscorpio.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20074" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20075-AntLarva.xml b/data/templates/npc/monster/20075-AntLarva.xml
index 283dc5935..7d746e34d 100644
--- a/data/templates/npc/monster/20075-AntLarva.xml
+++ b/data/templates/npc/monster/20075-AntLarva.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20075" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20076-OlMahumCommander.xml b/data/templates/npc/monster/20076-OlMahumCommander.xml
index 008660f25..f838092f6 100644
--- a/data/templates/npc/monster/20076-OlMahumCommander.xml
+++ b/data/templates/npc/monster/20076-OlMahumCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20076" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20077-AndroscorpioHunter.xml b/data/templates/npc/monster/20077-AndroscorpioHunter.xml
index 1592f1583..fdaba4e44 100644
--- a/data/templates/npc/monster/20077-AndroscorpioHunter.xml
+++ b/data/templates/npc/monster/20077-AndroscorpioHunter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20077" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20078-WhisperingWind.xml b/data/templates/npc/monster/20078-WhisperingWind.xml
index f99e0be95..b857ea55a 100644
--- a/data/templates/npc/monster/20078-WhisperingWind.xml
+++ b/data/templates/npc/monster/20078-WhisperingWind.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20078" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20079-Ant.xml b/data/templates/npc/monster/20079-Ant.xml
index cf2db6fb7..7508909d1 100644
--- a/data/templates/npc/monster/20079-Ant.xml
+++ b/data/templates/npc/monster/20079-Ant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20079" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20080-AntCaptain.xml b/data/templates/npc/monster/20080-AntCaptain.xml
index 760aa5f7c..a06e73038 100644
--- a/data/templates/npc/monster/20080-AntCaptain.xml
+++ b/data/templates/npc/monster/20080-AntCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20080" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20081-AntOverseer.xml b/data/templates/npc/monster/20081-AntOverseer.xml
index 4b3430611..c99463122 100644
--- a/data/templates/npc/monster/20081-AntOverseer.xml
+++ b/data/templates/npc/monster/20081-AntOverseer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20081" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20082-AntRecruit.xml b/data/templates/npc/monster/20082-AntRecruit.xml
index 692efce94..7aa2ab278 100644
--- a/data/templates/npc/monster/20082-AntRecruit.xml
+++ b/data/templates/npc/monster/20082-AntRecruit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20082" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20083-GraniteGolem.xml b/data/templates/npc/monster/20083-GraniteGolem.xml
index f6d1022a9..4bb3fb74e 100644
--- a/data/templates/npc/monster/20083-GraniteGolem.xml
+++ b/data/templates/npc/monster/20083-GraniteGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20083" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20084-AntPatrol.xml b/data/templates/npc/monster/20084-AntPatrol.xml
index f13fa600b..19442fa19 100644
--- a/data/templates/npc/monster/20084-AntPatrol.xml
+++ b/data/templates/npc/monster/20084-AntPatrol.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20084" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20085-Puncher.xml b/data/templates/npc/monster/20085-Puncher.xml
index d2aa8808e..7fb306f0b 100644
--- a/data/templates/npc/monster/20085-Puncher.xml
+++ b/data/templates/npc/monster/20085-Puncher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20085" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20086-AntGuard.xml b/data/templates/npc/monster/20086-AntGuard.xml
index 21ae6aae1..fa97155df 100644
--- a/data/templates/npc/monster/20086-AntGuard.xml
+++ b/data/templates/npc/monster/20086-AntGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20086" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20087-AntSoldier.xml b/data/templates/npc/monster/20087-AntSoldier.xml
index 35a11c4e1..7c7bebf1f 100644
--- a/data/templates/npc/monster/20087-AntSoldier.xml
+++ b/data/templates/npc/monster/20087-AntSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20087" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20088-AntWarriorCaptain.xml b/data/templates/npc/monster/20088-AntWarriorCaptain.xml
index 6bd439db0..4f4fbb1f0 100644
--- a/data/templates/npc/monster/20088-AntWarriorCaptain.xml
+++ b/data/templates/npc/monster/20088-AntWarriorCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20088" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20089-NobleAnt.xml b/data/templates/npc/monster/20089-NobleAnt.xml
index da00001af..41d7223d8 100644
--- a/data/templates/npc/monster/20089-NobleAnt.xml
+++ b/data/templates/npc/monster/20089-NobleAnt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20089" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20090-NobleAntLeader.xml b/data/templates/npc/monster/20090-NobleAntLeader.xml
index 3147266a7..1df83924c 100644
--- a/data/templates/npc/monster/20090-NobleAntLeader.xml
+++ b/data/templates/npc/monster/20090-NobleAntLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20090" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20091-YoungFox.xml b/data/templates/npc/monster/20091-YoungFox.xml
index 57d38bab1..5c7a247db 100644
--- a/data/templates/npc/monster/20091-YoungFox.xml
+++ b/data/templates/npc/monster/20091-YoungFox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20091" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20092-MonsterEye.xml b/data/templates/npc/monster/20092-MonsterEye.xml
index dd107836b..a464ce5e5 100644
--- a/data/templates/npc/monster/20092-MonsterEye.xml
+++ b/data/templates/npc/monster/20092-MonsterEye.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20092" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20093-OrcFighter.xml b/data/templates/npc/monster/20093-OrcFighter.xml
index ef92d83f6..018c2ea9f 100644
--- a/data/templates/npc/monster/20093-OrcFighter.xml
+++ b/data/templates/npc/monster/20093-OrcFighter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20093" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20094-OrcMarksman.xml b/data/templates/npc/monster/20094-OrcMarksman.xml
index 3980cd077..5cf8a134d 100644
--- a/data/templates/npc/monster/20094-OrcMarksman.xml
+++ b/data/templates/npc/monster/20094-OrcMarksman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20094" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20095-VampireBat.xml b/data/templates/npc/monster/20095-VampireBat.xml
index a02c06584..e90ec5e38 100644
--- a/data/templates/npc/monster/20095-VampireBat.xml
+++ b/data/templates/npc/monster/20095-VampireBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20095" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20096-OrcLieutenant.xml b/data/templates/npc/monster/20096-OrcLieutenant.xml
index a41d21818..af4277111 100644
--- a/data/templates/npc/monster/20096-OrcLieutenant.xml
+++ b/data/templates/npc/monster/20096-OrcLieutenant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20096" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20097-DrillBat.xml b/data/templates/npc/monster/20097-DrillBat.xml
index 3d7ab3a96..c093ed507 100644
--- a/data/templates/npc/monster/20097-DrillBat.xml
+++ b/data/templates/npc/monster/20097-DrillBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20097" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20098-OrcFighterLeader.xml b/data/templates/npc/monster/20098-OrcFighterLeader.xml
index f2dedffd2..21dd2477e 100644
--- a/data/templates/npc/monster/20098-OrcFighterLeader.xml
+++ b/data/templates/npc/monster/20098-OrcFighterLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20098" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20099-Skeleton.xml b/data/templates/npc/monster/20099-Skeleton.xml
index cae33ae0c..2ab15724d 100644
--- a/data/templates/npc/monster/20099-Skeleton.xml
+++ b/data/templates/npc/monster/20099-Skeleton.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20099" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20100-SkeletonArcher.xml b/data/templates/npc/monster/20100-SkeletonArcher.xml
index 07828be67..bbb95907e 100644
--- a/data/templates/npc/monster/20100-SkeletonArcher.xml
+++ b/data/templates/npc/monster/20100-SkeletonArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20100" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20101-Crasher.xml b/data/templates/npc/monster/20101-Crasher.xml
index d8f5614b2..77290a010 100644
--- a/data/templates/npc/monster/20101-Crasher.xml
+++ b/data/templates/npc/monster/20101-Crasher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20101" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20102-SkeletonMarksman.xml b/data/templates/npc/monster/20102-SkeletonMarksman.xml
index 978ef0f3c..09feb4298 100644
--- a/data/templates/npc/monster/20102-SkeletonMarksman.xml
+++ b/data/templates/npc/monster/20102-SkeletonMarksman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20102" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20103-GiantSpider.xml b/data/templates/npc/monster/20103-GiantSpider.xml
index aa8f940a1..fcb6bc8b6 100644
--- a/data/templates/npc/monster/20103-GiantSpider.xml
+++ b/data/templates/npc/monster/20103-GiantSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20103" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20104-SkeletonLord.xml b/data/templates/npc/monster/20104-SkeletonLord.xml
index dfdcc68cd..c81a953b6 100644
--- a/data/templates/npc/monster/20104-SkeletonLord.xml
+++ b/data/templates/npc/monster/20104-SkeletonLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20104" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20105-DarkHorror.xml b/data/templates/npc/monster/20105-DarkHorror.xml
index 9030b94aa..d20adcc52 100644
--- a/data/templates/npc/monster/20105-DarkHorror.xml
+++ b/data/templates/npc/monster/20105-DarkHorror.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20105" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20106-TalonSpider.xml b/data/templates/npc/monster/20106-TalonSpider.xml
index 0d036c0f6..1adaf7ad1 100644
--- a/data/templates/npc/monster/20106-TalonSpider.xml
+++ b/data/templates/npc/monster/20106-TalonSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20106" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20107-Wererat.xml b/data/templates/npc/monster/20107-Wererat.xml
index fe286069d..4675c37fa 100644
--- a/data/templates/npc/monster/20107-Wererat.xml
+++ b/data/templates/npc/monster/20107-Wererat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20107" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20108-BladeSpider.xml b/data/templates/npc/monster/20108-BladeSpider.xml
index 87cea2c2b..af4b5a8cd 100644
--- a/data/templates/npc/monster/20108-BladeSpider.xml
+++ b/data/templates/npc/monster/20108-BladeSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20108" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20109-Salamander.xml b/data/templates/npc/monster/20109-Salamander.xml
index 20518988d..d0896560c 100644
--- a/data/templates/npc/monster/20109-Salamander.xml
+++ b/data/templates/npc/monster/20109-Salamander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20109" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20110-Undine.xml b/data/templates/npc/monster/20110-Undine.xml
index 5203fb1f0..620670049 100644
--- a/data/templates/npc/monster/20110-Undine.xml
+++ b/data/templates/npc/monster/20110-Undine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20110" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20111-WereratLeader.xml b/data/templates/npc/monster/20111-WereratLeader.xml
index 12ac2d095..017bd3507 100644
--- a/data/templates/npc/monster/20111-WereratLeader.xml
+++ b/data/templates/npc/monster/20111-WereratLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20111" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20112-SalamanderElder.xml b/data/templates/npc/monster/20112-SalamanderElder.xml
index fadf5844d..b46eda2b4 100644
--- a/data/templates/npc/monster/20112-SalamanderElder.xml
+++ b/data/templates/npc/monster/20112-SalamanderElder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20112" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20113-UndineElder.xml b/data/templates/npc/monster/20113-UndineElder.xml
index a460fbed7..6ef1ca051 100644
--- a/data/templates/npc/monster/20113-UndineElder.xml
+++ b/data/templates/npc/monster/20113-UndineElder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20113" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20114-SalamanderNoble.xml b/data/templates/npc/monster/20114-SalamanderNoble.xml
index 09cd3989b..ff94070dd 100644
--- a/data/templates/npc/monster/20114-SalamanderNoble.xml
+++ b/data/templates/npc/monster/20114-SalamanderNoble.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20114" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20115-UndineNoble.xml b/data/templates/npc/monster/20115-UndineNoble.xml
index 121664dc3..bec651fc9 100644
--- a/data/templates/npc/monster/20115-UndineNoble.xml
+++ b/data/templates/npc/monster/20115-UndineNoble.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20115" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20116-Fox.xml b/data/templates/npc/monster/20116-Fox.xml
index 483091dc9..e3ccdfb95 100644
--- a/data/templates/npc/monster/20116-Fox.xml
+++ b/data/templates/npc/monster/20116-Fox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20116" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20117-DreVanul.xml b/data/templates/npc/monster/20117-DreVanul.xml
index 94d960bd9..780413573 100644
--- a/data/templates/npc/monster/20117-DreVanul.xml
+++ b/data/templates/npc/monster/20117-DreVanul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20117" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20118-DreVanulScout.xml b/data/templates/npc/monster/20118-DreVanulScout.xml
index 3f97280d0..01e247e7d 100644
--- a/data/templates/npc/monster/20118-DreVanulScout.xml
+++ b/data/templates/npc/monster/20118-DreVanulScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20118" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20119-ElderFox.xml b/data/templates/npc/monster/20119-ElderFox.xml
index c3ee10c58..75e34c403 100644
--- a/data/templates/npc/monster/20119-ElderFox.xml
+++ b/data/templates/npc/monster/20119-ElderFox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20119" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20120-Wolf.xml b/data/templates/npc/monster/20120-Wolf.xml
index bad5dde26..dfc4997a6 100644
--- a/data/templates/npc/monster/20120-Wolf.xml
+++ b/data/templates/npc/monster/20120-Wolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20120" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20121-GiantToad.xml b/data/templates/npc/monster/20121-GiantToad.xml
index 352324338..3cda31ed1 100644
--- a/data/templates/npc/monster/20121-GiantToad.xml
+++ b/data/templates/npc/monster/20121-GiantToad.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20121" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20130-Orc.xml b/data/templates/npc/monster/20130-Orc.xml
index 003dd0a3a..8360474de 100644
--- a/data/templates/npc/monster/20130-Orc.xml
+++ b/data/templates/npc/monster/20130-Orc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20130" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20131-OrcGrunt.xml b/data/templates/npc/monster/20131-OrcGrunt.xml
index 473106aec..269064ead 100644
--- a/data/templates/npc/monster/20131-OrcGrunt.xml
+++ b/data/templates/npc/monster/20131-OrcGrunt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20131" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20132-Werewolf.xml b/data/templates/npc/monster/20132-Werewolf.xml
index aa7d44af1..58e71fbb8 100644
--- a/data/templates/npc/monster/20132-Werewolf.xml
+++ b/data/templates/npc/monster/20132-Werewolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20132" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20133-Bugbear.xml b/data/templates/npc/monster/20133-Bugbear.xml
index bfcc7dff6..6e1d02900 100644
--- a/data/templates/npc/monster/20133-Bugbear.xml
+++ b/data/templates/npc/monster/20133-Bugbear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20133" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20134-CaveMaiden.xml b/data/templates/npc/monster/20134-CaveMaiden.xml
index 1d3e23c13..2b378d1af 100644
--- a/data/templates/npc/monster/20134-CaveMaiden.xml
+++ b/data/templates/npc/monster/20134-CaveMaiden.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20134" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20135-Alligator.xml b/data/templates/npc/monster/20135-Alligator.xml
index 37065a73d..eb87c3403 100644
--- a/data/templates/npc/monster/20135-Alligator.xml
+++ b/data/templates/npc/monster/20135-Alligator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20135" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20136-DeathKnight.xml b/data/templates/npc/monster/20136-DeathKnight.xml
index 813972aa1..f87eac8ed 100644
--- a/data/templates/npc/monster/20136-DeathKnight.xml
+++ b/data/templates/npc/monster/20136-DeathKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20136" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20137-Drake.xml b/data/templates/npc/monster/20137-Drake.xml
index e558ebe1c..bd80fc997 100644
--- a/data/templates/npc/monster/20137-Drake.xml
+++ b/data/templates/npc/monster/20137-Drake.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20137" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20138-Gargoyle.xml b/data/templates/npc/monster/20138-Gargoyle.xml
index 86c80a553..3acc1c3da 100644
--- a/data/templates/npc/monster/20138-Gargoyle.xml
+++ b/data/templates/npc/monster/20138-Gargoyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20138" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20139-GiantBee.xml b/data/templates/npc/monster/20139-GiantBee.xml
index 5ca9695e5..9ff6d2c5c 100644
--- a/data/templates/npc/monster/20139-GiantBee.xml
+++ b/data/templates/npc/monster/20139-GiantBee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20139" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20140-GiantLeech.xml b/data/templates/npc/monster/20140-GiantLeech.xml
index 66c0b1107..39143e372 100644
--- a/data/templates/npc/monster/20140-GiantLeech.xml
+++ b/data/templates/npc/monster/20140-GiantLeech.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20140" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20141-GiantWildHog.xml b/data/templates/npc/monster/20141-GiantWildHog.xml
index da279b69d..d97b868cb 100644
--- a/data/templates/npc/monster/20141-GiantWildHog.xml
+++ b/data/templates/npc/monster/20141-GiantWildHog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20141" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20142-Griffon.xml b/data/templates/npc/monster/20142-Griffon.xml
index 8d3dad187..4d71bc1a6 100644
--- a/data/templates/npc/monster/20142-Griffon.xml
+++ b/data/templates/npc/monster/20142-Griffon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20142" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20143-Grizzly.xml b/data/templates/npc/monster/20143-Grizzly.xml
index 76e7893e0..10b385678 100644
--- a/data/templates/npc/monster/20143-Grizzly.xml
+++ b/data/templates/npc/monster/20143-Grizzly.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20143" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20144-HangmanTree.xml b/data/templates/npc/monster/20144-HangmanTree.xml
index b8560a541..9dc6c0d23 100644
--- a/data/templates/npc/monster/20144-HangmanTree.xml
+++ b/data/templates/npc/monster/20144-HangmanTree.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20144" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20145-Harpy.xml b/data/templates/npc/monster/20145-Harpy.xml
index cb5d966b8..b963deb45 100644
--- a/data/templates/npc/monster/20145-Harpy.xml
+++ b/data/templates/npc/monster/20145-Harpy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20145" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20146-HeadlessKnight.xml b/data/templates/npc/monster/20146-HeadlessKnight.xml
index 24a1528e8..8429f542d 100644
--- a/data/templates/npc/monster/20146-HeadlessKnight.xml
+++ b/data/templates/npc/monster/20146-HeadlessKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20146" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20147-Hobgoblin.xml b/data/templates/npc/monster/20147-Hobgoblin.xml
index 3322c45dd..8b8372e05 100644
--- a/data/templates/npc/monster/20147-Hobgoblin.xml
+++ b/data/templates/npc/monster/20147-Hobgoblin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20147" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20148-HungrySpirit.xml b/data/templates/npc/monster/20148-HungrySpirit.xml
index 967076178..edb611d48 100644
--- a/data/templates/npc/monster/20148-HungrySpirit.xml
+++ b/data/templates/npc/monster/20148-HungrySpirit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20148" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20149-IronGolem.xml b/data/templates/npc/monster/20149-IronGolem.xml
index 36f19d65f..1c315ed03 100644
--- a/data/templates/npc/monster/20149-IronGolem.xml
+++ b/data/templates/npc/monster/20149-IronGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20149" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20150-KingBugbear.xml b/data/templates/npc/monster/20150-KingBugbear.xml
index 5cf0acc58..89ee0a853 100644
--- a/data/templates/npc/monster/20150-KingBugbear.xml
+++ b/data/templates/npc/monster/20150-KingBugbear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20150" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20151-Kobold.xml b/data/templates/npc/monster/20151-Kobold.xml
index a49c941df..c036548fc 100644
--- a/data/templates/npc/monster/20151-Kobold.xml
+++ b/data/templates/npc/monster/20151-Kobold.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20151" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20152-Lizardman.xml b/data/templates/npc/monster/20152-Lizardman.xml
index 4ed6b1ca8..3c0021199 100644
--- a/data/templates/npc/monster/20152-Lizardman.xml
+++ b/data/templates/npc/monster/20152-Lizardman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20152" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20153-MagicalWeaver.xml b/data/templates/npc/monster/20153-MagicalWeaver.xml
index ff09053bd..0a69d6f02 100644
--- a/data/templates/npc/monster/20153-MagicalWeaver.xml
+++ b/data/templates/npc/monster/20153-MagicalWeaver.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20153" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20154-MandragoraSprout.xml b/data/templates/npc/monster/20154-MandragoraSprout.xml
index cd1ec773d..aee0de080 100644
--- a/data/templates/npc/monster/20154-MandragoraSprout.xml
+++ b/data/templates/npc/monster/20154-MandragoraSprout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20154" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20155-MandragoraSapling.xml b/data/templates/npc/monster/20155-MandragoraSapling.xml
index 9ae8b93cf..988e0c290 100644
--- a/data/templates/npc/monster/20155-MandragoraSapling.xml
+++ b/data/templates/npc/monster/20155-MandragoraSapling.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20155" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20156-MandragoraBlossom.xml b/data/templates/npc/monster/20156-MandragoraBlossom.xml
index 6d0f8bf13..7742e26b5 100644
--- a/data/templates/npc/monster/20156-MandragoraBlossom.xml
+++ b/data/templates/npc/monster/20156-MandragoraBlossom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20156" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20157-MarshStakato.xml b/data/templates/npc/monster/20157-MarshStakato.xml
index e5101ffed..f720ddc95 100644
--- a/data/templates/npc/monster/20157-MarshStakato.xml
+++ b/data/templates/npc/monster/20157-MarshStakato.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20157" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20158-Medusa.xml b/data/templates/npc/monster/20158-Medusa.xml
index e5b7bfb49..40db933fa 100644
--- a/data/templates/npc/monster/20158-Medusa.xml
+++ b/data/templates/npc/monster/20158-Medusa.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20158" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20159-Minotaur.xml b/data/templates/npc/monster/20159-Minotaur.xml
index e3d42e194..104089e7f 100644
--- a/data/templates/npc/monster/20159-Minotaur.xml
+++ b/data/templates/npc/monster/20159-Minotaur.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20159" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20160-NeerCrawler.xml b/data/templates/npc/monster/20160-NeerCrawler.xml
index a03c35c04..1c8a4fece 100644
--- a/data/templates/npc/monster/20160-NeerCrawler.xml
+++ b/data/templates/npc/monster/20160-NeerCrawler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20160" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20161-OelMahum.xml b/data/templates/npc/monster/20161-OelMahum.xml
index 3a6ce9638..0734de9fd 100644
--- a/data/templates/npc/monster/20161-OelMahum.xml
+++ b/data/templates/npc/monster/20161-OelMahum.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20161" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20162-Ogre.xml b/data/templates/npc/monster/20162-Ogre.xml
index 409ddb312..ac4c66112 100644
--- a/data/templates/npc/monster/20162-Ogre.xml
+++ b/data/templates/npc/monster/20162-Ogre.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20162" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20163-OlMahum.xml b/data/templates/npc/monster/20163-OlMahum.xml
index 11842e8fc..79e0998f7 100644
--- a/data/templates/npc/monster/20163-OlMahum.xml
+++ b/data/templates/npc/monster/20163-OlMahum.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20163" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20164-OlMahumArcher.xml b/data/templates/npc/monster/20164-OlMahumArcher.xml
index 0ea922ba4..9abcd98d4 100644
--- a/data/templates/npc/monster/20164-OlMahumArcher.xml
+++ b/data/templates/npc/monster/20164-OlMahumArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20164" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20165-OlMahumChampion.xml b/data/templates/npc/monster/20165-OlMahumChampion.xml
index 50e1443ab..f226ef12a 100644
--- a/data/templates/npc/monster/20165-OlMahumChampion.xml
+++ b/data/templates/npc/monster/20165-OlMahumChampion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20165" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20166-Succubus.xml b/data/templates/npc/monster/20166-Succubus.xml
index 6fdd0da5b..4413b64fc 100644
--- a/data/templates/npc/monster/20166-Succubus.xml
+++ b/data/templates/npc/monster/20166-Succubus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20166" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20167-SerpentSlave.xml b/data/templates/npc/monster/20167-SerpentSlave.xml
index 14c329983..9d32c7a56 100644
--- a/data/templates/npc/monster/20167-SerpentSlave.xml
+++ b/data/templates/npc/monster/20167-SerpentSlave.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20167" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20168-Silenos.xml b/data/templates/npc/monster/20168-Silenos.xml
index f53e95bcf..0d958cbde 100644
--- a/data/templates/npc/monster/20168-Silenos.xml
+++ b/data/templates/npc/monster/20168-Silenos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20168" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20169-SkeletonRoyalGuard.xml b/data/templates/npc/monster/20169-SkeletonRoyalGuard.xml
index 79d1c7c05..3a48c3c89 100644
--- a/data/templates/npc/monster/20169-SkeletonRoyalGuard.xml
+++ b/data/templates/npc/monster/20169-SkeletonRoyalGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20169" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20170-Spartoi.xml b/data/templates/npc/monster/20170-Spartoi.xml
index ebeaed5da..cd643190d 100644
--- a/data/templates/npc/monster/20170-Spartoi.xml
+++ b/data/templates/npc/monster/20170-Spartoi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20170" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20171-Specter.xml b/data/templates/npc/monster/20171-Specter.xml
index 68bd5338b..507efb25c 100644
--- a/data/templates/npc/monster/20171-Specter.xml
+++ b/data/templates/npc/monster/20171-Specter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20171" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20172-Sylph.xml b/data/templates/npc/monster/20172-Sylph.xml
index 78021da5c..d203b62eb 100644
--- a/data/templates/npc/monster/20172-Sylph.xml
+++ b/data/templates/npc/monster/20172-Sylph.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20172" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20173-Troll.xml b/data/templates/npc/monster/20173-Troll.xml
index 842c7b594..a6bb7df78 100644
--- a/data/templates/npc/monster/20173-Troll.xml
+++ b/data/templates/npc/monster/20173-Troll.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20173" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20174-TwoHeadedGiant.xml b/data/templates/npc/monster/20174-TwoHeadedGiant.xml
index 3e174cc38..72312b84b 100644
--- a/data/templates/npc/monster/20174-TwoHeadedGiant.xml
+++ b/data/templates/npc/monster/20174-TwoHeadedGiant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20174" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20175-WalkingFungus.xml b/data/templates/npc/monster/20175-WalkingFungus.xml
index 27636f43e..4cffc4c9b 100644
--- a/data/templates/npc/monster/20175-WalkingFungus.xml
+++ b/data/templates/npc/monster/20175-WalkingFungus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20175" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20176-Wyrm.xml b/data/templates/npc/monster/20176-Wyrm.xml
index 45c1d7447..be5c731cc 100644
--- a/data/templates/npc/monster/20176-Wyrm.xml
+++ b/data/templates/npc/monster/20176-Wyrm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20176" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20177-Zombie.xml b/data/templates/npc/monster/20177-Zombie.xml
index e64414152..81b0d8d00 100644
--- a/data/templates/npc/monster/20177-Zombie.xml
+++ b/data/templates/npc/monster/20177-Zombie.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20177" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20189-Puma.xml b/data/templates/npc/monster/20189-Puma.xml
index 13cddce8b..73ef89b4f 100644
--- a/data/templates/npc/monster/20189-Puma.xml
+++ b/data/templates/npc/monster/20189-Puma.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20189" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20190-SkeletonMarauder.xml b/data/templates/npc/monster/20190-SkeletonMarauder.xml
index 0452541de..bee7aa011 100644
--- a/data/templates/npc/monster/20190-SkeletonMarauder.xml
+++ b/data/templates/npc/monster/20190-SkeletonMarauder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20190" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20191-SkeletonRaider.xml b/data/templates/npc/monster/20191-SkeletonRaider.xml
index 8514193fd..274c66ab2 100644
--- a/data/templates/npc/monster/20191-SkeletonRaider.xml
+++ b/data/templates/npc/monster/20191-SkeletonRaider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20191" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20192-Tyrant.xml b/data/templates/npc/monster/20192-Tyrant.xml
index 5c8eb9edd..b208c301a 100644
--- a/data/templates/npc/monster/20192-Tyrant.xml
+++ b/data/templates/npc/monster/20192-Tyrant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20192" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20193-TyrantKingpin.xml b/data/templates/npc/monster/20193-TyrantKingpin.xml
index c5ac839c1..2b5176e8f 100644
--- a/data/templates/npc/monster/20193-TyrantKingpin.xml
+++ b/data/templates/npc/monster/20193-TyrantKingpin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20193" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20194-QueenUndine.xml b/data/templates/npc/monster/20194-QueenUndine.xml
index 48b00fb36..ae3ea6aa0 100644
--- a/data/templates/npc/monster/20194-QueenUndine.xml
+++ b/data/templates/npc/monster/20194-QueenUndine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20194" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20197-SorrowMaiden.xml b/data/templates/npc/monster/20197-SorrowMaiden.xml
index 471c048c9..49a3bdc56 100644
--- a/data/templates/npc/monster/20197-SorrowMaiden.xml
+++ b/data/templates/npc/monster/20197-SorrowMaiden.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20197" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20198-NeerGhoulBerserker.xml b/data/templates/npc/monster/20198-NeerGhoulBerserker.xml
index 4c14b176d..3fd049c1e 100644
--- a/data/templates/npc/monster/20198-NeerGhoulBerserker.xml
+++ b/data/templates/npc/monster/20198-NeerGhoulBerserker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20198" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20199-AmberBasilisk.xml b/data/templates/npc/monster/20199-AmberBasilisk.xml
index f95c2b2d1..c85a7faad 100644
--- a/data/templates/npc/monster/20199-AmberBasilisk.xml
+++ b/data/templates/npc/monster/20199-AmberBasilisk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20199" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20200-Strain.xml b/data/templates/npc/monster/20200-Strain.xml
index a39984d49..cd63f2aeb 100644
--- a/data/templates/npc/monster/20200-Strain.xml
+++ b/data/templates/npc/monster/20200-Strain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20200" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20201-Ghoul.xml b/data/templates/npc/monster/20201-Ghoul.xml
index ff8cce392..891b90491 100644
--- a/data/templates/npc/monster/20201-Ghoul.xml
+++ b/data/templates/npc/monster/20201-Ghoul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20201" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20202-DeadSeeker.xml b/data/templates/npc/monster/20202-DeadSeeker.xml
index d5e82931c..fa6571092 100644
--- a/data/templates/npc/monster/20202-DeadSeeker.xml
+++ b/data/templates/npc/monster/20202-DeadSeeker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20202" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20203-DionGrizzly.xml b/data/templates/npc/monster/20203-DionGrizzly.xml
index eae04ecc5..536ac6c40 100644
--- a/data/templates/npc/monster/20203-DionGrizzly.xml
+++ b/data/templates/npc/monster/20203-DionGrizzly.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20203" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20204-BloodyBee.xml b/data/templates/npc/monster/20204-BloodyBee.xml
index d9ffbed6c..fbe9da643 100644
--- a/data/templates/npc/monster/20204-BloodyBee.xml
+++ b/data/templates/npc/monster/20204-BloodyBee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20204" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20205-DireWolf.xml b/data/templates/npc/monster/20205-DireWolf.xml
index fa7a6ea30..f6f23bf3c 100644
--- a/data/templates/npc/monster/20205-DireWolf.xml
+++ b/data/templates/npc/monster/20205-DireWolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20205" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20206-KadifWerewolf.xml b/data/templates/npc/monster/20206-KadifWerewolf.xml
index 43b4edcd2..968fab824 100644
--- a/data/templates/npc/monster/20206-KadifWerewolf.xml
+++ b/data/templates/npc/monster/20206-KadifWerewolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20206" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20207-OlMahumGuerilla.xml b/data/templates/npc/monster/20207-OlMahumGuerilla.xml
index 6900dffb3..3297f9efb 100644
--- a/data/templates/npc/monster/20207-OlMahumGuerilla.xml
+++ b/data/templates/npc/monster/20207-OlMahumGuerilla.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20207" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20208-OlMahumRaider.xml b/data/templates/npc/monster/20208-OlMahumRaider.xml
index 5726bf193..7059e40f5 100644
--- a/data/templates/npc/monster/20208-OlMahumRaider.xml
+++ b/data/templates/npc/monster/20208-OlMahumRaider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20208" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20209-OlMahumMarksman.xml b/data/templates/npc/monster/20209-OlMahumMarksman.xml
index f35f0c176..650191fd0 100644
--- a/data/templates/npc/monster/20209-OlMahumMarksman.xml
+++ b/data/templates/npc/monster/20209-OlMahumMarksman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20209" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20210-OlMahumSergeant.xml b/data/templates/npc/monster/20210-OlMahumSergeant.xml
index c602d789d..c46cce543 100644
--- a/data/templates/npc/monster/20210-OlMahumSergeant.xml
+++ b/data/templates/npc/monster/20210-OlMahumSergeant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20210" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20211-OlMahumCaptain.xml b/data/templates/npc/monster/20211-OlMahumCaptain.xml
index 5eb461144..041e31248 100644
--- a/data/templates/npc/monster/20211-OlMahumCaptain.xml
+++ b/data/templates/npc/monster/20211-OlMahumCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20211" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20212-BloodyAxeTurmak.xml b/data/templates/npc/monster/20212-BloodyAxeTurmak.xml
index 56f4b899f..5b9e8afe0 100644
--- a/data/templates/npc/monster/20212-BloodyAxeTurmak.xml
+++ b/data/templates/npc/monster/20212-BloodyAxeTurmak.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20212" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20213-Porta.xml b/data/templates/npc/monster/20213-Porta.xml
index 9353d167f..730883a34 100644
--- a/data/templates/npc/monster/20213-Porta.xml
+++ b/data/templates/npc/monster/20213-Porta.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20213" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20214-Excuro.xml b/data/templates/npc/monster/20214-Excuro.xml
index 684d1288a..236750caf 100644
--- a/data/templates/npc/monster/20214-Excuro.xml
+++ b/data/templates/npc/monster/20214-Excuro.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20214" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20215-Mordeo.xml b/data/templates/npc/monster/20215-Mordeo.xml
index b1669d470..744454179 100644
--- a/data/templates/npc/monster/20215-Mordeo.xml
+++ b/data/templates/npc/monster/20215-Mordeo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20215" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20216-Ricenseo.xml b/data/templates/npc/monster/20216-Ricenseo.xml
index 749c8f132..11b2977ca 100644
--- a/data/templates/npc/monster/20216-Ricenseo.xml
+++ b/data/templates/npc/monster/20216-Ricenseo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20216" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20217-Krator.xml b/data/templates/npc/monster/20217-Krator.xml
index f5e6250a4..97efc160c 100644
--- a/data/templates/npc/monster/20217-Krator.xml
+++ b/data/templates/npc/monster/20217-Krator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20217" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20218-Premo.xml b/data/templates/npc/monster/20218-Premo.xml
index d6ddf1162..a702edb8c 100644
--- a/data/templates/npc/monster/20218-Premo.xml
+++ b/data/templates/npc/monster/20218-Premo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20218" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20219-Validus.xml b/data/templates/npc/monster/20219-Validus.xml
index 1a2c15cf7..b9f4aeac2 100644
--- a/data/templates/npc/monster/20219-Validus.xml
+++ b/data/templates/npc/monster/20219-Validus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20219" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20220-Dicor.xml b/data/templates/npc/monster/20220-Dicor.xml
index d1826d7fd..92335c373 100644
--- a/data/templates/npc/monster/20220-Dicor.xml
+++ b/data/templates/npc/monster/20220-Dicor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20220" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20221-Perum.xml b/data/templates/npc/monster/20221-Perum.xml
index 5a41446c6..733351253 100644
--- a/data/templates/npc/monster/20221-Perum.xml
+++ b/data/templates/npc/monster/20221-Perum.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20221" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20222-Torfe.xml b/data/templates/npc/monster/20222-Torfe.xml
index 774e6b6f1..f7897abd0 100644
--- a/data/templates/npc/monster/20222-Torfe.xml
+++ b/data/templates/npc/monster/20222-Torfe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20222" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20223-MandragoraSprout.xml b/data/templates/npc/monster/20223-MandragoraSprout.xml
index 4fc329dee..2e1ea8e91 100644
--- a/data/templates/npc/monster/20223-MandragoraSprout.xml
+++ b/data/templates/npc/monster/20223-MandragoraSprout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20223" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20224-OlMahumRanger.xml b/data/templates/npc/monster/20224-OlMahumRanger.xml
index d9f6be9c2..6c2a2443a 100644
--- a/data/templates/npc/monster/20224-OlMahumRanger.xml
+++ b/data/templates/npc/monster/20224-OlMahumRanger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20224" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20225-GiantMistLeech.xml b/data/templates/npc/monster/20225-GiantMistLeech.xml
index 3d0a5f9fa..a4a3eac31 100644
--- a/data/templates/npc/monster/20225-GiantMistLeech.xml
+++ b/data/templates/npc/monster/20225-GiantMistLeech.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20225" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20226-GrayAnt.xml b/data/templates/npc/monster/20226-GrayAnt.xml
index 899f4a8c8..9e73b68bf 100644
--- a/data/templates/npc/monster/20226-GrayAnt.xml
+++ b/data/templates/npc/monster/20226-GrayAnt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20226" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20227-HorrorMistRipper.xml b/data/templates/npc/monster/20227-HorrorMistRipper.xml
index bce267cda..84389ce3d 100644
--- a/data/templates/npc/monster/20227-HorrorMistRipper.xml
+++ b/data/templates/npc/monster/20227-HorrorMistRipper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20227" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20228-GiantCrimsonAnt.xml b/data/templates/npc/monster/20228-GiantCrimsonAnt.xml
index fb64291ed..c7fa2a56a 100644
--- a/data/templates/npc/monster/20228-GiantCrimsonAnt.xml
+++ b/data/templates/npc/monster/20228-GiantCrimsonAnt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20228" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20229-StingerWasp.xml b/data/templates/npc/monster/20229-StingerWasp.xml
index f3fe9f25e..4aa59a04d 100644
--- a/data/templates/npc/monster/20229-StingerWasp.xml
+++ b/data/templates/npc/monster/20229-StingerWasp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20229" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20230-MarshStakatoWorker.xml b/data/templates/npc/monster/20230-MarshStakatoWorker.xml
index ebf0d2d0b..a0fcd0f5a 100644
--- a/data/templates/npc/monster/20230-MarshStakatoWorker.xml
+++ b/data/templates/npc/monster/20230-MarshStakatoWorker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20230" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20231-ToadLord.xml b/data/templates/npc/monster/20231-ToadLord.xml
index 70a83366e..c691779bf 100644
--- a/data/templates/npc/monster/20231-ToadLord.xml
+++ b/data/templates/npc/monster/20231-ToadLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20231" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20232-MarshStakatoSoldier.xml b/data/templates/npc/monster/20232-MarshStakatoSoldier.xml
index 5fb1e4a35..d0b443e7d 100644
--- a/data/templates/npc/monster/20232-MarshStakatoSoldier.xml
+++ b/data/templates/npc/monster/20232-MarshStakatoSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20232" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20233-MarshSpider.xml b/data/templates/npc/monster/20233-MarshSpider.xml
index 77636d9a4..874bc5ed2 100644
--- a/data/templates/npc/monster/20233-MarshSpider.xml
+++ b/data/templates/npc/monster/20233-MarshSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20233" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20234-MarshStakatoDrone.xml b/data/templates/npc/monster/20234-MarshStakatoDrone.xml
index 9675fe092..9ee42ce5d 100644
--- a/data/templates/npc/monster/20234-MarshStakatoDrone.xml
+++ b/data/templates/npc/monster/20234-MarshStakatoDrone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20234" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20235-Shackle.xml b/data/templates/npc/monster/20235-Shackle.xml
index c30008e80..681669d55 100644
--- a/data/templates/npc/monster/20235-Shackle.xml
+++ b/data/templates/npc/monster/20235-Shackle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20235" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20236-CaveServant.xml b/data/templates/npc/monster/20236-CaveServant.xml
index 816fa7ff6..b97345ec8 100644
--- a/data/templates/npc/monster/20236-CaveServant.xml
+++ b/data/templates/npc/monster/20236-CaveServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20236" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20237-CaveServantArcher.xml b/data/templates/npc/monster/20237-CaveServantArcher.xml
index dbee88b16..2dd1fcc94 100644
--- a/data/templates/npc/monster/20237-CaveServantArcher.xml
+++ b/data/templates/npc/monster/20237-CaveServantArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20237" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20238-CaveServantWarrior.xml b/data/templates/npc/monster/20238-CaveServantWarrior.xml
index 31d4d523a..15179f20b 100644
--- a/data/templates/npc/monster/20238-CaveServantWarrior.xml
+++ b/data/templates/npc/monster/20238-CaveServantWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20238" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20239-CaveServantCaptain.xml b/data/templates/npc/monster/20239-CaveServantCaptain.xml
index 8e0f98055..21287b2a6 100644
--- a/data/templates/npc/monster/20239-CaveServantCaptain.xml
+++ b/data/templates/npc/monster/20239-CaveServantCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20239" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20240-RoyalCaveServant.xml b/data/templates/npc/monster/20240-RoyalCaveServant.xml
index 1628a0183..d4ff07950 100644
--- a/data/templates/npc/monster/20240-RoyalCaveServant.xml
+++ b/data/templates/npc/monster/20240-RoyalCaveServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20240" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20241-HunterGargoyle.xml b/data/templates/npc/monster/20241-HunterGargoyle.xml
index c4f946d7e..9f8be058b 100644
--- a/data/templates/npc/monster/20241-HunterGargoyle.xml
+++ b/data/templates/npc/monster/20241-HunterGargoyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20241" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20242-DustwindGargoyle.xml b/data/templates/npc/monster/20242-DustwindGargoyle.xml
index 29b27726a..120e0e268 100644
--- a/data/templates/npc/monster/20242-DustwindGargoyle.xml
+++ b/data/templates/npc/monster/20242-DustwindGargoyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20242" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20243-ThunderWyrm.xml b/data/templates/npc/monster/20243-ThunderWyrm.xml
index 74fdce2b4..d609cfae7 100644
--- a/data/templates/npc/monster/20243-ThunderWyrm.xml
+++ b/data/templates/npc/monster/20243-ThunderWyrm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20243" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20244-MalrukSuccubus.xml b/data/templates/npc/monster/20244-MalrukSuccubus.xml
index e636ddd95..11d6dfd00 100644
--- a/data/templates/npc/monster/20244-MalrukSuccubus.xml
+++ b/data/templates/npc/monster/20244-MalrukSuccubus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20244" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20245-MalrukSuccubusTuren.xml b/data/templates/npc/monster/20245-MalrukSuccubusTuren.xml
index 8c5a7ecd0..276411f4f 100644
--- a/data/templates/npc/monster/20245-MalrukSuccubusTuren.xml
+++ b/data/templates/npc/monster/20245-MalrukSuccubusTuren.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20245" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20246-CaveKeeper.xml b/data/templates/npc/monster/20246-CaveKeeper.xml
index a81209d65..b735178c6 100644
--- a/data/templates/npc/monster/20246-CaveKeeper.xml
+++ b/data/templates/npc/monster/20246-CaveKeeper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20246" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20248-TurakBugbear.xml b/data/templates/npc/monster/20248-TurakBugbear.xml
index a8da2a8dc..c46224618 100644
--- a/data/templates/npc/monster/20248-TurakBugbear.xml
+++ b/data/templates/npc/monster/20248-TurakBugbear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20248" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20249-TurakBugbearWarrior.xml b/data/templates/npc/monster/20249-TurakBugbearWarrior.xml
index f6a0a6862..577272385 100644
--- a/data/templates/npc/monster/20249-TurakBugbearWarrior.xml
+++ b/data/templates/npc/monster/20249-TurakBugbearWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20249" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20250-GlassJaguar.xml b/data/templates/npc/monster/20250-GlassJaguar.xml
index 355647d65..08e83f996 100644
--- a/data/templates/npc/monster/20250-GlassJaguar.xml
+++ b/data/templates/npc/monster/20250-GlassJaguar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20250" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20251-DeluLizardman.xml b/data/templates/npc/monster/20251-DeluLizardman.xml
index 95778e204..0da105586 100644
--- a/data/templates/npc/monster/20251-DeluLizardman.xml
+++ b/data/templates/npc/monster/20251-DeluLizardman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20251" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20252-DeluLizardmanScout.xml b/data/templates/npc/monster/20252-DeluLizardmanScout.xml
index fa4a2d270..5ac7c5ced 100644
--- a/data/templates/npc/monster/20252-DeluLizardmanScout.xml
+++ b/data/templates/npc/monster/20252-DeluLizardmanScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20252" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20253-DeluLizardmanWarrior.xml b/data/templates/npc/monster/20253-DeluLizardmanWarrior.xml
index fcb49040b..65dc17606 100644
--- a/data/templates/npc/monster/20253-DeluLizardmanWarrior.xml
+++ b/data/templates/npc/monster/20253-DeluLizardmanWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20253" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20254-SkeletonAxeman.xml b/data/templates/npc/monster/20254-SkeletonAxeman.xml
index 01a116796..cf6b0cc29 100644
--- a/data/templates/npc/monster/20254-SkeletonAxeman.xml
+++ b/data/templates/npc/monster/20254-SkeletonAxeman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20254" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20255-BaturOrc.xml b/data/templates/npc/monster/20255-BaturOrc.xml
index 9010e0f70..af7ddf5da 100644
--- a/data/templates/npc/monster/20255-BaturOrc.xml
+++ b/data/templates/npc/monster/20255-BaturOrc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20255" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20256-BaturOrcArcher.xml b/data/templates/npc/monster/20256-BaturOrcArcher.xml
index 6d0b97217..fcf224c68 100644
--- a/data/templates/npc/monster/20256-BaturOrcArcher.xml
+++ b/data/templates/npc/monster/20256-BaturOrcArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20256" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20257-BaturOrcWarrior.xml b/data/templates/npc/monster/20257-BaturOrcWarrior.xml
index 5297227f4..936a274d0 100644
--- a/data/templates/npc/monster/20257-BaturOrcWarrior.xml
+++ b/data/templates/npc/monster/20257-BaturOrcWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20257" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20258-BaturOrcShaman.xml b/data/templates/npc/monster/20258-BaturOrcShaman.xml
index 937cf9ffb..2fa1b0fdc 100644
--- a/data/templates/npc/monster/20258-BaturOrcShaman.xml
+++ b/data/templates/npc/monster/20258-BaturOrcShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20258" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20259-BaturOrcOverlord.xml b/data/templates/npc/monster/20259-BaturOrcOverlord.xml
index d099450ee..ccabff1f7 100644
--- a/data/templates/npc/monster/20259-BaturOrcOverlord.xml
+++ b/data/templates/npc/monster/20259-BaturOrcOverlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20259" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20260-OrcChampion.xml b/data/templates/npc/monster/20260-OrcChampion.xml
index c1016f346..5f6784904 100644
--- a/data/templates/npc/monster/20260-OrcChampion.xml
+++ b/data/templates/npc/monster/20260-OrcChampion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20260" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20261-OrcShaman.xml b/data/templates/npc/monster/20261-OrcShaman.xml
index bc3b24979..15fdb4879 100644
--- a/data/templates/npc/monster/20261-OrcShaman.xml
+++ b/data/templates/npc/monster/20261-OrcShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20261" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20265-MonsterEyeSearcher.xml b/data/templates/npc/monster/20265-MonsterEyeSearcher.xml
index 7f8116363..0ed20c134 100644
--- a/data/templates/npc/monster/20265-MonsterEyeSearcher.xml
+++ b/data/templates/npc/monster/20265-MonsterEyeSearcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20265" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20266-MonsterEyeGazer.xml b/data/templates/npc/monster/20266-MonsterEyeGazer.xml
index c8832276c..a280c90ec 100644
--- a/data/templates/npc/monster/20266-MonsterEyeGazer.xml
+++ b/data/templates/npc/monster/20266-MonsterEyeGazer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20266" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20267-BrekaOrc.xml b/data/templates/npc/monster/20267-BrekaOrc.xml
index ae37dc797..6321d87c7 100644
--- a/data/templates/npc/monster/20267-BrekaOrc.xml
+++ b/data/templates/npc/monster/20267-BrekaOrc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20267" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20268-BrekaOrcArcher.xml b/data/templates/npc/monster/20268-BrekaOrcArcher.xml
index b3b5726fd..5ca9d8960 100644
--- a/data/templates/npc/monster/20268-BrekaOrcArcher.xml
+++ b/data/templates/npc/monster/20268-BrekaOrcArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20268" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20269-BrekaOrcShaman.xml b/data/templates/npc/monster/20269-BrekaOrcShaman.xml
index 7c9bf0bc5..46fd323be 100644
--- a/data/templates/npc/monster/20269-BrekaOrcShaman.xml
+++ b/data/templates/npc/monster/20269-BrekaOrcShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20269" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20270-BrekaOrcOverlord.xml b/data/templates/npc/monster/20270-BrekaOrcOverlord.xml
index 49e00d539..814e310d7 100644
--- a/data/templates/npc/monster/20270-BrekaOrcOverlord.xml
+++ b/data/templates/npc/monster/20270-BrekaOrcOverlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20270" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20271-BrekaOrcWarrior.xml b/data/templates/npc/monster/20271-BrekaOrcWarrior.xml
index 21a13d132..889e10271 100644
--- a/data/templates/npc/monster/20271-BrekaOrcWarrior.xml
+++ b/data/templates/npc/monster/20271-BrekaOrcWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20271" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20272-CaveServant.xml b/data/templates/npc/monster/20272-CaveServant.xml
index 5d36ebbad..a5f130139 100644
--- a/data/templates/npc/monster/20272-CaveServant.xml
+++ b/data/templates/npc/monster/20272-CaveServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20272" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20273-CaveServantArcher.xml b/data/templates/npc/monster/20273-CaveServantArcher.xml
index ee90c2960..1040345a5 100644
--- a/data/templates/npc/monster/20273-CaveServantArcher.xml
+++ b/data/templates/npc/monster/20273-CaveServantArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20273" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20274-CaveServantWarrior.xml b/data/templates/npc/monster/20274-CaveServantWarrior.xml
index 27b8fbeae..c5d916b2e 100644
--- a/data/templates/npc/monster/20274-CaveServantWarrior.xml
+++ b/data/templates/npc/monster/20274-CaveServantWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20274" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20275-CaveServantCaptain.xml b/data/templates/npc/monster/20275-CaveServantCaptain.xml
index 33e20988d..04166f63d 100644
--- a/data/templates/npc/monster/20275-CaveServantCaptain.xml
+++ b/data/templates/npc/monster/20275-CaveServantCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20275" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20276-RoyalCaveServant.xml b/data/templates/npc/monster/20276-RoyalCaveServant.xml
index fa6f34826..61ec1fe27 100644
--- a/data/templates/npc/monster/20276-RoyalCaveServant.xml
+++ b/data/templates/npc/monster/20276-RoyalCaveServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20276" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20277-CaveKeeper.xml b/data/templates/npc/monster/20277-CaveKeeper.xml
index 3d69d1998..b9788cc0e 100644
--- a/data/templates/npc/monster/20277-CaveKeeper.xml
+++ b/data/templates/npc/monster/20277-CaveKeeper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20277" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20279-Shackle.xml b/data/templates/npc/monster/20279-Shackle.xml
index 0fcd77c2a..42b523e16 100644
--- a/data/templates/npc/monster/20279-Shackle.xml
+++ b/data/templates/npc/monster/20279-Shackle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20279" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20280-HeadlessKnight.xml b/data/templates/npc/monster/20280-HeadlessKnight.xml
index ef03dbd10..192b3d3e7 100644
--- a/data/templates/npc/monster/20280-HeadlessKnight.xml
+++ b/data/templates/npc/monster/20280-HeadlessKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20280" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20281-DustwindGargoyle.xml b/data/templates/npc/monster/20281-DustwindGargoyle.xml
index 2c03e00d6..36263c7f2 100644
--- a/data/templates/npc/monster/20281-DustwindGargoyle.xml
+++ b/data/templates/npc/monster/20281-DustwindGargoyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20281" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20282-ThunderWyrm.xml b/data/templates/npc/monster/20282-ThunderWyrm.xml
index 405be2989..c46bd4ebd 100644
--- a/data/templates/npc/monster/20282-ThunderWyrm.xml
+++ b/data/templates/npc/monster/20282-ThunderWyrm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20282" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20283-MalrukSuccubus.xml b/data/templates/npc/monster/20283-MalrukSuccubus.xml
index a26014e6d..da493137c 100644
--- a/data/templates/npc/monster/20283-MalrukSuccubus.xml
+++ b/data/templates/npc/monster/20283-MalrukSuccubus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20283" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20284-MalrukSuccubusTuren.xml b/data/templates/npc/monster/20284-MalrukSuccubusTuren.xml
index b64d4b70d..5f1b6d0bb 100644
--- a/data/templates/npc/monster/20284-MalrukSuccubusTuren.xml
+++ b/data/templates/npc/monster/20284-MalrukSuccubusTuren.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20284" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20285-Drake.xml b/data/templates/npc/monster/20285-Drake.xml
index b486be3d9..745177659 100644
--- a/data/templates/npc/monster/20285-Drake.xml
+++ b/data/templates/npc/monster/20285-Drake.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20285" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20286-HunterGargoyle.xml b/data/templates/npc/monster/20286-HunterGargoyle.xml
index 9896381e8..62389d1d6 100644
--- a/data/templates/npc/monster/20286-HunterGargoyle.xml
+++ b/data/templates/npc/monster/20286-HunterGargoyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20286" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20287-CaveMaiden.xml b/data/templates/npc/monster/20287-CaveMaiden.xml
index 00e437915..8139bdee3 100644
--- a/data/templates/npc/monster/20287-CaveMaiden.xml
+++ b/data/templates/npc/monster/20287-CaveMaiden.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20287" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20291-EnkuOrcChampion.xml b/data/templates/npc/monster/20291-EnkuOrcChampion.xml
index 96cf20d54..71ab93d40 100644
--- a/data/templates/npc/monster/20291-EnkuOrcChampion.xml
+++ b/data/templates/npc/monster/20291-EnkuOrcChampion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20291" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20292-EnkuOrcShaman.xml b/data/templates/npc/monster/20292-EnkuOrcShaman.xml
index 8fed61673..b64f9063b 100644
--- a/data/templates/npc/monster/20292-EnkuOrcShaman.xml
+++ b/data/templates/npc/monster/20292-EnkuOrcShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20292" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20293-VirudLizardman.xml b/data/templates/npc/monster/20293-VirudLizardman.xml
index abddd0ee9..9cbcdab29 100644
--- a/data/templates/npc/monster/20293-VirudLizardman.xml
+++ b/data/templates/npc/monster/20293-VirudLizardman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20293" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20294-VirudLizardmanMatriarch.xml b/data/templates/npc/monster/20294-VirudLizardmanMatriarch.xml
index d58d145f3..aeb95f773 100644
--- a/data/templates/npc/monster/20294-VirudLizardmanMatriarch.xml
+++ b/data/templates/npc/monster/20294-VirudLizardmanMatriarch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20294" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20295-VirudLizardmanWarrior.xml b/data/templates/npc/monster/20295-VirudLizardmanWarrior.xml
index bc73b85bf..497754ee6 100644
--- a/data/templates/npc/monster/20295-VirudLizardmanWarrior.xml
+++ b/data/templates/npc/monster/20295-VirudLizardmanWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20295" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20296-VirudLizardmanScout.xml b/data/templates/npc/monster/20296-VirudLizardmanScout.xml
index 8523d6a19..639865d99 100644
--- a/data/templates/npc/monster/20296-VirudLizardmanScout.xml
+++ b/data/templates/npc/monster/20296-VirudLizardmanScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20296" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20297-VirudLizardmanShaman.xml b/data/templates/npc/monster/20297-VirudLizardmanShaman.xml
index c4220b04b..7023cabdd 100644
--- a/data/templates/npc/monster/20297-VirudLizardmanShaman.xml
+++ b/data/templates/npc/monster/20297-VirudLizardmanShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20297" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20298-VirudLizardmanShaman.xml b/data/templates/npc/monster/20298-VirudLizardmanShaman.xml
index aa26856fe..d65e7f9c3 100644
--- a/data/templates/npc/monster/20298-VirudLizardmanShaman.xml
+++ b/data/templates/npc/monster/20298-VirudLizardmanShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20298" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20299-ZentaLizardman.xml b/data/templates/npc/monster/20299-ZentaLizardman.xml
index 99696614f..75c5ab0de 100644
--- a/data/templates/npc/monster/20299-ZentaLizardman.xml
+++ b/data/templates/npc/monster/20299-ZentaLizardman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20299" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20300-ZentaLizardmanMatriarch.xml b/data/templates/npc/monster/20300-ZentaLizardmanMatriarch.xml
index cdbdfbc52..1364edb6e 100644
--- a/data/templates/npc/monster/20300-ZentaLizardmanMatriarch.xml
+++ b/data/templates/npc/monster/20300-ZentaLizardmanMatriarch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20300" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20301-ZentaLizardmanScout.xml b/data/templates/npc/monster/20301-ZentaLizardmanScout.xml
index bfe18fcee..b8073d38e 100644
--- a/data/templates/npc/monster/20301-ZentaLizardmanScout.xml
+++ b/data/templates/npc/monster/20301-ZentaLizardmanScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20301" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20302-ZentaLizardmanWarrior.xml b/data/templates/npc/monster/20302-ZentaLizardmanWarrior.xml
index 6a53b7c18..8e21165bd 100644
--- a/data/templates/npc/monster/20302-ZentaLizardmanWarrior.xml
+++ b/data/templates/npc/monster/20302-ZentaLizardmanWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20302" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20303-ZentaLizardmanShaman.xml b/data/templates/npc/monster/20303-ZentaLizardmanShaman.xml
index dd207a834..cc998db38 100644
--- a/data/templates/npc/monster/20303-ZentaLizardmanShaman.xml
+++ b/data/templates/npc/monster/20303-ZentaLizardmanShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20303" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20304-MarshStakatoQueen.xml b/data/templates/npc/monster/20304-MarshStakatoQueen.xml
index 98776f27d..c89233bfe 100644
--- a/data/templates/npc/monster/20304-MarshStakatoQueen.xml
+++ b/data/templates/npc/monster/20304-MarshStakatoQueen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20304" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20305-Grave.xml b/data/templates/npc/monster/20305-Grave.xml
index 0a065af4b..3d4ef9302 100644
--- a/data/templates/npc/monster/20305-Grave.xml
+++ b/data/templates/npc/monster/20305-Grave.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20305" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20307-GarumWerewolf.xml b/data/templates/npc/monster/20307-GarumWerewolf.xml
index ff524de64..9ca83b9b0 100644
--- a/data/templates/npc/monster/20307-GarumWerewolf.xml
+++ b/data/templates/npc/monster/20307-GarumWerewolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20307" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20308-HookSpider.xml b/data/templates/npc/monster/20308-HookSpider.xml
index 76ecea59a..180b12928 100644
--- a/data/templates/npc/monster/20308-HookSpider.xml
+++ b/data/templates/npc/monster/20308-HookSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20308" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20309-BrownFox.xml b/data/templates/npc/monster/20309-BrownFox.xml
index b341e47bc..87418cbab 100644
--- a/data/templates/npc/monster/20309-BrownFox.xml
+++ b/data/templates/npc/monster/20309-BrownFox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20309" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20310-BrownBear.xml b/data/templates/npc/monster/20310-BrownBear.xml
index 009eeeef6..b346a6fe2 100644
--- a/data/templates/npc/monster/20310-BrownBear.xml
+++ b/data/templates/npc/monster/20310-BrownBear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20310" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20311-RakeclawImp.xml b/data/templates/npc/monster/20311-RakeclawImp.xml
index 4db661161..4cd406414 100644
--- a/data/templates/npc/monster/20311-RakeclawImp.xml
+++ b/data/templates/npc/monster/20311-RakeclawImp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20311" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20312-RakeclawImpHunter.xml b/data/templates/npc/monster/20312-RakeclawImpHunter.xml
index 6a9f0b1b0..81a6fe7f3 100644
--- a/data/templates/npc/monster/20312-RakeclawImpHunter.xml
+++ b/data/templates/npc/monster/20312-RakeclawImpHunter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20312" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20313-RakeclawImpChieftain.xml b/data/templates/npc/monster/20313-RakeclawImpChieftain.xml
index 461a28312..acfe71c4b 100644
--- a/data/templates/npc/monster/20313-RakeclawImpChieftain.xml
+++ b/data/templates/npc/monster/20313-RakeclawImpChieftain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20313" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20314-GreatWhiteShark.xml b/data/templates/npc/monster/20314-GreatWhiteShark.xml
index 594aeb2f5..8794a0452 100644
--- a/data/templates/npc/monster/20314-GreatWhiteShark.xml
+++ b/data/templates/npc/monster/20314-GreatWhiteShark.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20314" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20316-DarkwingBat.xml b/data/templates/npc/monster/20316-DarkwingBat.xml
index db4b8bb69..2ca89b929 100644
--- a/data/templates/npc/monster/20316-DarkwingBat.xml
+++ b/data/templates/npc/monster/20316-DarkwingBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20316" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20317-BlackWolf.xml b/data/templates/npc/monster/20317-BlackWolf.xml
index 6a81251bf..b28978ad9 100644
--- a/data/templates/npc/monster/20317-BlackWolf.xml
+++ b/data/templates/npc/monster/20317-BlackWolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20317" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20318-BlackTimberWolf.xml b/data/templates/npc/monster/20318-BlackTimberWolf.xml
index a176b39bf..0d3c921b5 100644
--- a/data/templates/npc/monster/20318-BlackTimberWolf.xml
+++ b/data/templates/npc/monster/20318-BlackTimberWolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20318" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20319-GoblinGraveRobber.xml b/data/templates/npc/monster/20319-GoblinGraveRobber.xml
index 9e7e4a680..5704be3b9 100644
--- a/data/templates/npc/monster/20319-GoblinGraveRobber.xml
+++ b/data/templates/npc/monster/20319-GoblinGraveRobber.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20319" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20320-GoblinTombRaiderLeader.xml b/data/templates/npc/monster/20320-GoblinTombRaiderLeader.xml
index 12c379e85..d9428a230 100644
--- a/data/templates/npc/monster/20320-GoblinTombRaiderLeader.xml
+++ b/data/templates/npc/monster/20320-GoblinTombRaiderLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20320" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20321-GoblinThief.xml b/data/templates/npc/monster/20321-GoblinThief.xml
index aa4201758..e16d402ac 100644
--- a/data/templates/npc/monster/20321-GoblinThief.xml
+++ b/data/templates/npc/monster/20321-GoblinThief.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20321" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20322-GoblinBrigand.xml b/data/templates/npc/monster/20322-GoblinBrigand.xml
index 1be687507..231ccd7f8 100644
--- a/data/templates/npc/monster/20322-GoblinBrigand.xml
+++ b/data/templates/npc/monster/20322-GoblinBrigand.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20322" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20323-GoblinBrigandLeader.xml b/data/templates/npc/monster/20323-GoblinBrigandLeader.xml
index c2ea620b2..e8fe3b2c0 100644
--- a/data/templates/npc/monster/20323-GoblinBrigandLeader.xml
+++ b/data/templates/npc/monster/20323-GoblinBrigandLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20323" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20324-GoblinBrigandLieutenant.xml b/data/templates/npc/monster/20324-GoblinBrigandLieutenant.xml
index 7ee28d9b8..b560650f2 100644
--- a/data/templates/npc/monster/20324-GoblinBrigandLieutenant.xml
+++ b/data/templates/npc/monster/20324-GoblinBrigandLieutenant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20324" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20325-GoblinRaider.xml b/data/templates/npc/monster/20325-GoblinRaider.xml
index 4ca4d3ca2..bea14594c 100644
--- a/data/templates/npc/monster/20325-GoblinRaider.xml
+++ b/data/templates/npc/monster/20325-GoblinRaider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20325" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20326-GoblinScout.xml b/data/templates/npc/monster/20326-GoblinScout.xml
index 97e0a5744..eb815be69 100644
--- a/data/templates/npc/monster/20326-GoblinScout.xml
+++ b/data/templates/npc/monster/20326-GoblinScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20326" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20327-GoblinSnooper.xml b/data/templates/npc/monster/20327-GoblinSnooper.xml
index 750f9839c..8a748b8f2 100644
--- a/data/templates/npc/monster/20327-GoblinSnooper.xml
+++ b/data/templates/npc/monster/20327-GoblinSnooper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20327" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20328-GoblinLookout.xml b/data/templates/npc/monster/20328-GoblinLookout.xml
index 5b582df6e..c87d955ad 100644
--- a/data/templates/npc/monster/20328-GoblinLookout.xml
+++ b/data/templates/npc/monster/20328-GoblinLookout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20328" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20329-GhostGuardian.xml b/data/templates/npc/monster/20329-GhostGuardian.xml
index 288888b0f..0cbda0760 100644
--- a/data/templates/npc/monster/20329-GhostGuardian.xml
+++ b/data/templates/npc/monster/20329-GhostGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20329" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20330-MineshaftBat.xml b/data/templates/npc/monster/20330-MineshaftBat.xml
index dee8f3649..51289022b 100644
--- a/data/templates/npc/monster/20330-MineshaftBat.xml
+++ b/data/templates/npc/monster/20330-MineshaftBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20330" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20331-MonsterEyeTracker.xml b/data/templates/npc/monster/20331-MonsterEyeTracker.xml
index d92ae8b64..6a4e06746 100644
--- a/data/templates/npc/monster/20331-MonsterEyeTracker.xml
+++ b/data/templates/npc/monster/20331-MonsterEyeTracker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20331" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20333-GreystoneGolem.xml b/data/templates/npc/monster/20333-GreystoneGolem.xml
index cf239c53d..015db189e 100644
--- a/data/templates/npc/monster/20333-GreystoneGolem.xml
+++ b/data/templates/npc/monster/20333-GreystoneGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20333" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20334-GremlinScavenger.xml b/data/templates/npc/monster/20334-GremlinScavenger.xml
index ffa706d19..5cf7cecff 100644
--- a/data/templates/npc/monster/20334-GremlinScavenger.xml
+++ b/data/templates/npc/monster/20334-GremlinScavenger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20334" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20335-GrizzlyBear.xml b/data/templates/npc/monster/20335-GrizzlyBear.xml
index fa2001f1e..ab5236fac 100644
--- a/data/templates/npc/monster/20335-GrizzlyBear.xml
+++ b/data/templates/npc/monster/20335-GrizzlyBear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20335" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20336-GreenDryad.xml b/data/templates/npc/monster/20336-GreenDryad.xml
index 04f591783..5c356aab7 100644
--- a/data/templates/npc/monster/20336-GreenDryad.xml
+++ b/data/templates/npc/monster/20336-GreenDryad.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20336" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20337-LongtailFox.xml b/data/templates/npc/monster/20337-LongtailFox.xml
index ed97bd4d1..dd41cd57b 100644
--- a/data/templates/npc/monster/20337-LongtailFox.xml
+++ b/data/templates/npc/monster/20337-LongtailFox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20337" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20338-NightmareWeaver.xml b/data/templates/npc/monster/20338-NightmareWeaver.xml
index 04d3b01cd..30968bb7b 100644
--- a/data/templates/npc/monster/20338-NightmareWeaver.xml
+++ b/data/templates/npc/monster/20338-NightmareWeaver.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20338" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20340-SlaveSkeleton.xml b/data/templates/npc/monster/20340-SlaveSkeleton.xml
index 6ff8bed66..e1803df89 100644
--- a/data/templates/npc/monster/20340-SlaveSkeleton.xml
+++ b/data/templates/npc/monster/20340-SlaveSkeleton.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20340" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20341-UndeadSlave.xml b/data/templates/npc/monster/20341-UndeadSlave.xml
index 39aeec4d0..b1c3b16aa 100644
--- a/data/templates/npc/monster/20341-UndeadSlave.xml
+++ b/data/templates/npc/monster/20341-UndeadSlave.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20341" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20342-WerewolfChieftain.xml b/data/templates/npc/monster/20342-WerewolfChieftain.xml
index ff96deeed..40668177a 100644
--- a/data/templates/npc/monster/20342-WerewolfChieftain.xml
+++ b/data/templates/npc/monster/20342-WerewolfChieftain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20342" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20343-WerewolfHunter.xml b/data/templates/npc/monster/20343-WerewolfHunter.xml
index 7b4fbac4b..3d2a41205 100644
--- a/data/templates/npc/monster/20343-WerewolfHunter.xml
+++ b/data/templates/npc/monster/20343-WerewolfHunter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20343" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20345-DarkTerror.xml b/data/templates/npc/monster/20345-DarkTerror.xml
index a63ea6148..9e78fbb53 100644
--- a/data/templates/npc/monster/20345-DarkTerror.xml
+++ b/data/templates/npc/monster/20345-DarkTerror.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20345" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20346-DarkstoneGolem.xml b/data/templates/npc/monster/20346-DarkstoneGolem.xml
index d6d98ce0e..854cc0f40 100644
--- a/data/templates/npc/monster/20346-DarkstoneGolem.xml
+++ b/data/templates/npc/monster/20346-DarkstoneGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20346" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20347-DoomWraith.xml b/data/templates/npc/monster/20347-DoomWraith.xml
index dcf4f2dd7..4398a2a48 100644
--- a/data/templates/npc/monster/20347-DoomWraith.xml
+++ b/data/templates/npc/monster/20347-DoomWraith.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20347" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20348-CaveSpider.xml b/data/templates/npc/monster/20348-CaveSpider.xml
index efc692b1d..f39da61e7 100644
--- a/data/templates/npc/monster/20348-CaveSpider.xml
+++ b/data/templates/npc/monster/20348-CaveSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20348" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20349-CaveBat.xml b/data/templates/npc/monster/20349-CaveBat.xml
index 6d337e025..d6cd0b6b5 100644
--- a/data/templates/npc/monster/20349-CaveBat.xml
+++ b/data/templates/npc/monster/20349-CaveBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20349" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20350-CaveFangSpider.xml b/data/templates/npc/monster/20350-CaveFangSpider.xml
index 1641b938c..4961f0113 100644
--- a/data/templates/npc/monster/20350-CaveFangSpider.xml
+++ b/data/templates/npc/monster/20350-CaveFangSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20350" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20351-DreVanulTracker.xml b/data/templates/npc/monster/20351-DreVanulTracker.xml
index da174c396..7091ae9fa 100644
--- a/data/templates/npc/monster/20351-DreVanulTracker.xml
+++ b/data/templates/npc/monster/20351-DreVanulTracker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20351" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20352-DreVanulSlayer.xml b/data/templates/npc/monster/20352-DreVanulSlayer.xml
index bb3e3bc25..578ca7ea2 100644
--- a/data/templates/npc/monster/20352-DreVanulSlayer.xml
+++ b/data/templates/npc/monster/20352-DreVanulSlayer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20352" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20353-DreVanulBeholder.xml b/data/templates/npc/monster/20353-DreVanulBeholder.xml
index ac02a184e..4713c079b 100644
--- a/data/templates/npc/monster/20353-DreVanulBeholder.xml
+++ b/data/templates/npc/monster/20353-DreVanulBeholder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20353" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20354-DwarfGhost.xml b/data/templates/npc/monster/20354-DwarfGhost.xml
index d164334ab..fb1f773c8 100644
--- a/data/templates/npc/monster/20354-DwarfGhost.xml
+++ b/data/templates/npc/monster/20354-DwarfGhost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20354" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20356-LangkLizardmanLeader.xml b/data/templates/npc/monster/20356-LangkLizardmanLeader.xml
index fb1b1831a..c51bd647c 100644
--- a/data/templates/npc/monster/20356-LangkLizardmanLeader.xml
+++ b/data/templates/npc/monster/20356-LangkLizardmanLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20356" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20357-LangkLizardmanLieutenant.xml b/data/templates/npc/monster/20357-LangkLizardmanLieutenant.xml
index 8cf1c1f22..cb06768c5 100644
--- a/data/templates/npc/monster/20357-LangkLizardmanLieutenant.xml
+++ b/data/templates/npc/monster/20357-LangkLizardmanLieutenant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20357" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20358-RatmanHunter.xml b/data/templates/npc/monster/20358-RatmanHunter.xml
index 2a8000752..ec1a8c51b 100644
--- a/data/templates/npc/monster/20358-RatmanHunter.xml
+++ b/data/templates/npc/monster/20358-RatmanHunter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20358" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20359-RatmanWarrior.xml b/data/templates/npc/monster/20359-RatmanWarrior.xml
index 4ffe509fc..df03c0200 100644
--- a/data/templates/npc/monster/20359-RatmanWarrior.xml
+++ b/data/templates/npc/monster/20359-RatmanWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20359" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20360-RatmanSpy.xml b/data/templates/npc/monster/20360-RatmanSpy.xml
index 2e915bf8f..394e196d1 100644
--- a/data/templates/npc/monster/20360-RatmanSpy.xml
+++ b/data/templates/npc/monster/20360-RatmanSpy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20360" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20361-TunathOrcMarksman.xml b/data/templates/npc/monster/20361-TunathOrcMarksman.xml
index 9a8032033..6efa8c6fe 100644
--- a/data/templates/npc/monster/20361-TunathOrcMarksman.xml
+++ b/data/templates/npc/monster/20361-TunathOrcMarksman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20361" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20362-TunathOrcWarrior.xml b/data/templates/npc/monster/20362-TunathOrcWarrior.xml
index edbd7af20..bc7650632 100644
--- a/data/templates/npc/monster/20362-TunathOrcWarrior.xml
+++ b/data/templates/npc/monster/20362-TunathOrcWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20362" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20363-MarakuWerewolf.xml b/data/templates/npc/monster/20363-MarakuWerewolf.xml
index f22549143..04aafb2b4 100644
--- a/data/templates/npc/monster/20363-MarakuWerewolf.xml
+++ b/data/templates/npc/monster/20363-MarakuWerewolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20363" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20364-MarakuWerewolfChieftain.xml b/data/templates/npc/monster/20364-MarakuWerewolfChieftain.xml
index 54dbce3e2..1cd5dcff0 100644
--- a/data/templates/npc/monster/20364-MarakuWerewolfChieftain.xml
+++ b/data/templates/npc/monster/20364-MarakuWerewolfChieftain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20364" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20365-MountainFungus.xml b/data/templates/npc/monster/20365-MountainFungus.xml
index 7ccb8aa8e..6674e1866 100644
--- a/data/templates/npc/monster/20365-MountainFungus.xml
+++ b/data/templates/npc/monster/20365-MountainFungus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20365" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20367-MerkenisEscort.xml b/data/templates/npc/monster/20367-MerkenisEscort.xml
index 85bf06d62..6d15244af 100644
--- a/data/templates/npc/monster/20367-MerkenisEscort.xml
+++ b/data/templates/npc/monster/20367-MerkenisEscort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20367" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20368-GraveKeeper.xml b/data/templates/npc/monster/20368-GraveKeeper.xml
index 3ec154f65..4154021bd 100644
--- a/data/templates/npc/monster/20368-GraveKeeper.xml
+++ b/data/templates/npc/monster/20368-GraveKeeper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20368" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20369-MoonstoneBeast.xml b/data/templates/npc/monster/20369-MoonstoneBeast.xml
index 5d8b091e6..4b9b75e40 100644
--- a/data/templates/npc/monster/20369-MoonstoneBeast.xml
+++ b/data/templates/npc/monster/20369-MoonstoneBeast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20369" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20370-BarbedBat.xml b/data/templates/npc/monster/20370-BarbedBat.xml
index dd6add7c5..5faf0f0da 100644
--- a/data/templates/npc/monster/20370-BarbedBat.xml
+++ b/data/templates/npc/monster/20370-BarbedBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20370" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20371-MistTerror.xml b/data/templates/npc/monster/20371-MistTerror.xml
index 103829701..1974059bc 100644
--- a/data/templates/npc/monster/20371-MistTerror.xml
+++ b/data/templates/npc/monster/20371-MistTerror.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20371" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20372-BaraqOrcFighter.xml b/data/templates/npc/monster/20372-BaraqOrcFighter.xml
index 63184f095..78365d469 100644
--- a/data/templates/npc/monster/20372-BaraqOrcFighter.xml
+++ b/data/templates/npc/monster/20372-BaraqOrcFighter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20372" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20373-BaraqOrcWarriorLeader.xml b/data/templates/npc/monster/20373-BaraqOrcWarriorLeader.xml
index 3f40b0c25..4ee4f90b1 100644
--- a/data/templates/npc/monster/20373-BaraqOrcWarriorLeader.xml
+++ b/data/templates/npc/monster/20373-BaraqOrcWarriorLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20373" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20374-BarankaSGuard.xml b/data/templates/npc/monster/20374-BarankaSGuard.xml
index 8805d9c88..f1165bbec 100644
--- a/data/templates/npc/monster/20374-BarankaSGuard.xml
+++ b/data/templates/npc/monster/20374-BarankaSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20374" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20375-BarankaSEscort.xml b/data/templates/npc/monster/20375-BarankaSEscort.xml
index 842a061ee..b31afa6e9 100644
--- a/data/templates/npc/monster/20375-BarankaSEscort.xml
+++ b/data/templates/npc/monster/20375-BarankaSEscort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20375" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20376-VarikanBrigandLeader.xml b/data/templates/npc/monster/20376-VarikanBrigandLeader.xml
index 96387b6d9..828bbb366 100644
--- a/data/templates/npc/monster/20376-VarikanBrigandLeader.xml
+++ b/data/templates/npc/monster/20376-VarikanBrigandLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20376" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20377-VarikaSBandit.xml b/data/templates/npc/monster/20377-VarikaSBandit.xml
index fc6214228..678ba971c 100644
--- a/data/templates/npc/monster/20377-VarikaSBandit.xml
+++ b/data/templates/npc/monster/20377-VarikaSBandit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20377" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20378-StoneGiant.xml b/data/templates/npc/monster/20378-StoneGiant.xml
index e7e6552a4..1e9e14c40 100644
--- a/data/templates/npc/monster/20378-StoneGiant.xml
+++ b/data/templates/npc/monster/20378-StoneGiant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20378" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20379-StoneSoldier.xml b/data/templates/npc/monster/20379-StoneSoldier.xml
index b3062005b..794b6c32a 100644
--- a/data/templates/npc/monster/20379-StoneSoldier.xml
+++ b/data/templates/npc/monster/20379-StoneSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20379" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20380-StoneGuardian.xml b/data/templates/npc/monster/20380-StoneGuardian.xml
index 49c6e5721..76d6f0bb3 100644
--- a/data/templates/npc/monster/20380-StoneGuardian.xml
+++ b/data/templates/npc/monster/20380-StoneGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20380" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20381-VaissOrc.xml b/data/templates/npc/monster/20381-VaissOrc.xml
index 71b7883f5..d95524534 100644
--- a/data/templates/npc/monster/20381-VaissOrc.xml
+++ b/data/templates/npc/monster/20381-VaissOrc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20381" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20382-VaissOrcWarriorLeader.xml b/data/templates/npc/monster/20382-VaissOrcWarriorLeader.xml
index f5a4074cd..1405ac05b 100644
--- a/data/templates/npc/monster/20382-VaissOrcWarriorLeader.xml
+++ b/data/templates/npc/monster/20382-VaissOrcWarriorLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20382" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20383-ArachnidHunter.xml b/data/templates/npc/monster/20383-ArachnidHunter.xml
index 064813937..8453d497a 100644
--- a/data/templates/npc/monster/20383-ArachnidHunter.xml
+++ b/data/templates/npc/monster/20383-ArachnidHunter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20383" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20385-BalorOrcArcher.xml b/data/templates/npc/monster/20385-BalorOrcArcher.xml
index a4a004ed1..bcb05bfb6 100644
--- a/data/templates/npc/monster/20385-BalorOrcArcher.xml
+++ b/data/templates/npc/monster/20385-BalorOrcArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20385" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20386-BalorOrcFighter.xml b/data/templates/npc/monster/20386-BalorOrcFighter.xml
index 41a829e64..51bfd038b 100644
--- a/data/templates/npc/monster/20386-BalorOrcFighter.xml
+++ b/data/templates/npc/monster/20386-BalorOrcFighter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20386" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20387-BalorOrcFighterLeader.xml b/data/templates/npc/monster/20387-BalorOrcFighterLeader.xml
index 69b2afb02..0cadd1ff8 100644
--- a/data/templates/npc/monster/20387-BalorOrcFighterLeader.xml
+++ b/data/templates/npc/monster/20387-BalorOrcFighterLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20387" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20388-BalorOrcLieutenant.xml b/data/templates/npc/monster/20388-BalorOrcLieutenant.xml
index 5936e4a51..2087e4d05 100644
--- a/data/templates/npc/monster/20388-BalorOrcLieutenant.xml
+++ b/data/templates/npc/monster/20388-BalorOrcLieutenant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20388" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20389-BoogleRatman.xml b/data/templates/npc/monster/20389-BoogleRatman.xml
index c4bf4eff8..9a884e685 100644
--- a/data/templates/npc/monster/20389-BoogleRatman.xml
+++ b/data/templates/npc/monster/20389-BoogleRatman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20389" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20390-BoogleRatmanLeader.xml b/data/templates/npc/monster/20390-BoogleRatmanLeader.xml
index 6106668f2..9ea6bfda1 100644
--- a/data/templates/npc/monster/20390-BoogleRatmanLeader.xml
+++ b/data/templates/npc/monster/20390-BoogleRatmanLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20390" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20391-RedFox.xml b/data/templates/npc/monster/20391-RedFox.xml
index 882c3ac94..46d29927f 100644
--- a/data/templates/npc/monster/20391-RedFox.xml
+++ b/data/templates/npc/monster/20391-RedFox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20391" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20392-RedeyeBat.xml b/data/templates/npc/monster/20392-RedeyeBat.xml
index 2845bde98..8f87bc241 100644
--- a/data/templates/npc/monster/20392-RedeyeBat.xml
+++ b/data/templates/npc/monster/20392-RedeyeBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20392" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20393-RedScavengerSpider.xml b/data/templates/npc/monster/20393-RedScavengerSpider.xml
index e1192c8cb..532f1a3ad 100644
--- a/data/templates/npc/monster/20393-RedScavengerSpider.xml
+++ b/data/templates/npc/monster/20393-RedScavengerSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20393" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20394-CrimsonTarantula.xml b/data/templates/npc/monster/20394-CrimsonTarantula.xml
index 787215f0f..965dbb78e 100644
--- a/data/templates/npc/monster/20394-CrimsonTarantula.xml
+++ b/data/templates/npc/monster/20394-CrimsonTarantula.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20394" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20398-Vrykolakas.xml b/data/templates/npc/monster/20398-Vrykolakas.xml
index 6f9b8fc53..21746f93b 100644
--- a/data/templates/npc/monster/20398-Vrykolakas.xml
+++ b/data/templates/npc/monster/20398-Vrykolakas.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20398" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20399-VrykolakasWolfkin.xml b/data/templates/npc/monster/20399-VrykolakasWolfkin.xml
index fdd961685..1abcb8aec 100644
--- a/data/templates/npc/monster/20399-VrykolakasWolfkin.xml
+++ b/data/templates/npc/monster/20399-VrykolakasWolfkin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20399" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20400-BloodFungus.xml b/data/templates/npc/monster/20400-BloodFungus.xml
index 173cb5125..39d884552 100644
--- a/data/templates/npc/monster/20400-BloodFungus.xml
+++ b/data/templates/npc/monster/20400-BloodFungus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20400" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20401-VeelanBugbear.xml b/data/templates/npc/monster/20401-VeelanBugbear.xml
index 3561c75c3..042543825 100644
--- a/data/templates/npc/monster/20401-VeelanBugbear.xml
+++ b/data/templates/npc/monster/20401-VeelanBugbear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20401" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20402-VeelanBugbearWarrior.xml b/data/templates/npc/monster/20402-VeelanBugbearWarrior.xml
index 14f971b68..5edb02d91 100644
--- a/data/templates/npc/monster/20402-VeelanBugbearWarrior.xml
+++ b/data/templates/npc/monster/20402-VeelanBugbearWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20402" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20403-HunterTarantula.xml b/data/templates/npc/monster/20403-HunterTarantula.xml
index 05bfdac01..4c463447d 100644
--- a/data/templates/npc/monster/20403-HunterTarantula.xml
+++ b/data/templates/npc/monster/20403-HunterTarantula.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20403" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20404-SilentHorror.xml b/data/templates/npc/monster/20404-SilentHorror.xml
index f625393b2..593d9a699 100644
--- a/data/templates/npc/monster/20404-SilentHorror.xml
+++ b/data/templates/npc/monster/20404-SilentHorror.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20404" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20405-YoungBrownFox.xml b/data/templates/npc/monster/20405-YoungBrownFox.xml
index ca8c62a2e..780081e59 100644
--- a/data/templates/npc/monster/20405-YoungBrownFox.xml
+++ b/data/templates/npc/monster/20405-YoungBrownFox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20405" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20406-YoungRedFox.xml b/data/templates/npc/monster/20406-YoungRedFox.xml
index 0a1e3486a..d723a9e0f 100644
--- a/data/templates/npc/monster/20406-YoungRedFox.xml
+++ b/data/templates/npc/monster/20406-YoungRedFox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20406" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20407-YoungCrimsonFox.xml b/data/templates/npc/monster/20407-YoungCrimsonFox.xml
index 84e7cff08..204508511 100644
--- a/data/templates/npc/monster/20407-YoungCrimsonFox.xml
+++ b/data/templates/npc/monster/20407-YoungCrimsonFox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20407" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20410-ScavengerSpider.xml b/data/templates/npc/monster/20410-ScavengerSpider.xml
index 47f65eba5..e5d5b276c 100644
--- a/data/templates/npc/monster/20410-ScavengerSpider.xml
+++ b/data/templates/npc/monster/20410-ScavengerSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20410" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20411-ScavengerBat.xml b/data/templates/npc/monster/20411-ScavengerBat.xml
index d8355bee7..758f3df37 100644
--- a/data/templates/npc/monster/20411-ScavengerBat.xml
+++ b/data/templates/npc/monster/20411-ScavengerBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20411" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20412-Susceptor.xml b/data/templates/npc/monster/20412-Susceptor.xml
index 74d04ae3a..ee866e726 100644
--- a/data/templates/npc/monster/20412-Susceptor.xml
+++ b/data/templates/npc/monster/20412-Susceptor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20412" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20415-ScarletSalamander.xml b/data/templates/npc/monster/20415-ScarletSalamander.xml
index 16f0ac705..74ea32675 100644
--- a/data/templates/npc/monster/20415-ScarletSalamander.xml
+++ b/data/templates/npc/monster/20415-ScarletSalamander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20415" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20416-ScarletSalamanderElder.xml b/data/templates/npc/monster/20416-ScarletSalamanderElder.xml
index 378241565..b8ee1adaa 100644
--- a/data/templates/npc/monster/20416-ScarletSalamanderElder.xml
+++ b/data/templates/npc/monster/20416-ScarletSalamanderElder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20416" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20418-CrystallineBeast.xml b/data/templates/npc/monster/20418-CrystallineBeast.xml
index 78f2b523b..ab3fa47de 100644
--- a/data/templates/npc/monster/20418-CrystallineBeast.xml
+++ b/data/templates/npc/monster/20418-CrystallineBeast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20418" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20419-AkasteSuccubus.xml b/data/templates/npc/monster/20419-AkasteSuccubus.xml
index fbd1a62f6..adb94ee2e 100644
--- a/data/templates/npc/monster/20419-AkasteSuccubus.xml
+++ b/data/templates/npc/monster/20419-AkasteSuccubus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20419" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20420-AkasteSuccubusTuren.xml b/data/templates/npc/monster/20420-AkasteSuccubusTuren.xml
index 909114633..7c488adc1 100644
--- a/data/templates/npc/monster/20420-AkasteSuccubusTuren.xml
+++ b/data/templates/npc/monster/20420-AkasteSuccubusTuren.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20420" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20421-AkasteSuccubusTilfo.xml b/data/templates/npc/monster/20421-AkasteSuccubusTilfo.xml
index cef7809f9..0e1e1ee9a 100644
--- a/data/templates/npc/monster/20421-AkasteSuccubusTilfo.xml
+++ b/data/templates/npc/monster/20421-AkasteSuccubusTilfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20421" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20422-AkasteBoneWarlord.xml b/data/templates/npc/monster/20422-AkasteBoneWarlord.xml
index 1ce521981..f485910ae 100644
--- a/data/templates/npc/monster/20422-AkasteBoneWarlord.xml
+++ b/data/templates/npc/monster/20422-AkasteBoneWarlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20422" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20423-AkasteBoneArcher.xml b/data/templates/npc/monster/20423-AkasteBoneArcher.xml
index 4f98598b6..9785d81cb 100644
--- a/data/templates/npc/monster/20423-AkasteBoneArcher.xml
+++ b/data/templates/npc/monster/20423-AkasteBoneArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20423" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20424-AkasteBoneLord.xml b/data/templates/npc/monster/20424-AkasteBoneLord.xml
index 3abc6d6b2..9be95eaca 100644
--- a/data/templates/npc/monster/20424-AkasteBoneLord.xml
+++ b/data/templates/npc/monster/20424-AkasteBoneLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20424" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20425-AkasteBoneSoldier.xml b/data/templates/npc/monster/20425-AkasteBoneSoldier.xml
index 831885c4d..88bb9f93d 100644
--- a/data/templates/npc/monster/20425-AkasteBoneSoldier.xml
+++ b/data/templates/npc/monster/20425-AkasteBoneSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20425" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20426-EvilEye.xml b/data/templates/npc/monster/20426-EvilEye.xml
index 4cf6b94bd..fb6e8e99e 100644
--- a/data/templates/npc/monster/20426-EvilEye.xml
+++ b/data/templates/npc/monster/20426-EvilEye.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20426" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20427-EvilEyeWatcher.xml b/data/templates/npc/monster/20427-EvilEyeWatcher.xml
index 27adcf6a9..9cad4e43d 100644
--- a/data/templates/npc/monster/20427-EvilEyeWatcher.xml
+++ b/data/templates/npc/monster/20427-EvilEyeWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20427" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20428-EvilEyePatroller.xml b/data/templates/npc/monster/20428-EvilEyePatroller.xml
index 1729ae45a..96d18719e 100644
--- a/data/templates/npc/monster/20428-EvilEyePatroller.xml
+++ b/data/templates/npc/monster/20428-EvilEyePatroller.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20428" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20429-EvilEyeLookout.xml b/data/templates/npc/monster/20429-EvilEyeLookout.xml
index 8a602ae17..287d0c1c9 100644
--- a/data/templates/npc/monster/20429-EvilEyeLookout.xml
+++ b/data/templates/npc/monster/20429-EvilEyeLookout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20429" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20431-ElfGhost.xml b/data/templates/npc/monster/20431-ElfGhost.xml
index 3c391cead..435e11cf3 100644
--- a/data/templates/npc/monster/20431-ElfGhost.xml
+++ b/data/templates/npc/monster/20431-ElfGhost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20431" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20432-Elpy.xml b/data/templates/npc/monster/20432-Elpy.xml
index 42bc75a3b..d852ebee8 100644
--- a/data/templates/npc/monster/20432-Elpy.xml
+++ b/data/templates/npc/monster/20432-Elpy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20432" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20433-FesteringBat.xml b/data/templates/npc/monster/20433-FesteringBat.xml
index ce45d9978..9a6b5f63e 100644
--- a/data/templates/npc/monster/20433-FesteringBat.xml
+++ b/data/templates/npc/monster/20433-FesteringBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20433" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20435-OpalBeast.xml b/data/templates/npc/monster/20435-OpalBeast.xml
index 6935e2419..9010d1d48 100644
--- a/data/templates/npc/monster/20435-OpalBeast.xml
+++ b/data/templates/npc/monster/20435-OpalBeast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20435" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20436-OlMahumSupplier.xml b/data/templates/npc/monster/20436-OlMahumSupplier.xml
index 7cae3aea3..23a743df5 100644
--- a/data/templates/npc/monster/20436-OlMahumSupplier.xml
+++ b/data/templates/npc/monster/20436-OlMahumSupplier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20436" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20437-OlMahumRecruit.xml b/data/templates/npc/monster/20437-OlMahumRecruit.xml
index 45bf7aa9a..edd1e2474 100644
--- a/data/templates/npc/monster/20437-OlMahumRecruit.xml
+++ b/data/templates/npc/monster/20437-OlMahumRecruit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20437" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20438-OlMahumGeneral.xml b/data/templates/npc/monster/20438-OlMahumGeneral.xml
index cef113e05..4ee471d2e 100644
--- a/data/templates/npc/monster/20438-OlMahumGeneral.xml
+++ b/data/templates/npc/monster/20438-OlMahumGeneral.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20438" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20439-OlMahumOfficer.xml b/data/templates/npc/monster/20439-OlMahumOfficer.xml
index f6cadad8a..6258ce586 100644
--- a/data/templates/npc/monster/20439-OlMahumOfficer.xml
+++ b/data/templates/npc/monster/20439-OlMahumOfficer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20439" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20440-ElderBrownFox.xml b/data/templates/npc/monster/20440-ElderBrownFox.xml
index b8fe25b58..a85701993 100644
--- a/data/templates/npc/monster/20440-ElderBrownFox.xml
+++ b/data/templates/npc/monster/20440-ElderBrownFox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20440" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20441-ElderLongtailFox.xml b/data/templates/npc/monster/20441-ElderLongtailFox.xml
index 4a3624126..43879c542 100644
--- a/data/templates/npc/monster/20441-ElderLongtailFox.xml
+++ b/data/templates/npc/monster/20441-ElderLongtailFox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20441" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20442-ElderWolf.xml b/data/templates/npc/monster/20442-ElderWolf.xml
index 23443f297..20edf3348 100644
--- a/data/templates/npc/monster/20442-ElderWolf.xml
+++ b/data/templates/npc/monster/20442-ElderWolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20442" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20443-ElderRedFox.xml b/data/templates/npc/monster/20443-ElderRedFox.xml
index 6a6af7207..f31003586 100644
--- a/data/templates/npc/monster/20443-ElderRedFox.xml
+++ b/data/templates/npc/monster/20443-ElderRedFox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20443" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20444-ElderPrairieFox.xml b/data/templates/npc/monster/20444-ElderPrairieFox.xml
index 75ff7aaf9..9c4edf52f 100644
--- a/data/templates/npc/monster/20444-ElderPrairieFox.xml
+++ b/data/templates/npc/monster/20444-ElderPrairieFox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20444" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20445-UthankaPirate.xml b/data/templates/npc/monster/20445-UthankaPirate.xml
index 2eccf2f28..6291b31eb 100644
--- a/data/templates/npc/monster/20445-UthankaPirate.xml
+++ b/data/templates/npc/monster/20445-UthankaPirate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20445" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20446-UtukuOrc.xml b/data/templates/npc/monster/20446-UtukuOrc.xml
index 0ce976061..c5215d0b8 100644
--- a/data/templates/npc/monster/20446-UtukuOrc.xml
+++ b/data/templates/npc/monster/20446-UtukuOrc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20446" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20447-UtukuOrcArcher.xml b/data/templates/npc/monster/20447-UtukuOrcArcher.xml
index ac32eff4c..c5feb8408 100644
--- a/data/templates/npc/monster/20447-UtukuOrcArcher.xml
+++ b/data/templates/npc/monster/20447-UtukuOrcArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20447" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20448-UtukuOrcGrunt.xml b/data/templates/npc/monster/20448-UtukuOrcGrunt.xml
index 1db608a83..2ad277215 100644
--- a/data/templates/npc/monster/20448-UtukuOrcGrunt.xml
+++ b/data/templates/npc/monster/20448-UtukuOrcGrunt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20448" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20449-WillOWisp.xml b/data/templates/npc/monster/20449-WillOWisp.xml
index 4a030cfa3..1b671f42b 100644
--- a/data/templates/npc/monster/20449-WillOWisp.xml
+++ b/data/templates/npc/monster/20449-WillOWisp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20449" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20450-RelicWerewolf.xml b/data/templates/npc/monster/20450-RelicWerewolf.xml
index 63f9f60ab..84b923528 100644
--- a/data/templates/npc/monster/20450-RelicWerewolf.xml
+++ b/data/templates/npc/monster/20450-RelicWerewolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20450" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20451-RelicSpartoi.xml b/data/templates/npc/monster/20451-RelicSpartoi.xml
index f067fa7b8..b3455057c 100644
--- a/data/templates/npc/monster/20451-RelicSpartoi.xml
+++ b/data/templates/npc/monster/20451-RelicSpartoi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20451" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20453-HumanGhost.xml b/data/templates/npc/monster/20453-HumanGhost.xml
index 1e7ffa62e..9f4a5b6de 100644
--- a/data/templates/npc/monster/20453-HumanGhost.xml
+++ b/data/templates/npc/monster/20453-HumanGhost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20453" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20454-OblivionWatcher.xml b/data/templates/npc/monster/20454-OblivionWatcher.xml
index 4664b7e34..0aff8d1e3 100644
--- a/data/templates/npc/monster/20454-OblivionWatcher.xml
+++ b/data/templates/npc/monster/20454-OblivionWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20454" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20455-DoomSoldier.xml b/data/templates/npc/monster/20455-DoomSoldier.xml
index d245780fc..8f07f0797 100644
--- a/data/templates/npc/monster/20455-DoomSoldier.xml
+++ b/data/templates/npc/monster/20455-DoomSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20455" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20456-AshenWolf.xml b/data/templates/npc/monster/20456-AshenWolf.xml
index cdfe31541..0a673b062 100644
--- a/data/templates/npc/monster/20456-AshenWolf.xml
+++ b/data/templates/npc/monster/20456-AshenWolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20456" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20457-ZombieSoldier.xml b/data/templates/npc/monster/20457-ZombieSoldier.xml
index f95688200..347fbc95f 100644
--- a/data/templates/npc/monster/20457-ZombieSoldier.xml
+++ b/data/templates/npc/monster/20457-ZombieSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20457" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20458-ZombieWarrior.xml b/data/templates/npc/monster/20458-ZombieWarrior.xml
index b04a270f5..f96a06387 100644
--- a/data/templates/npc/monster/20458-ZombieWarrior.xml
+++ b/data/templates/npc/monster/20458-ZombieWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20458" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20460-CrimsonSpider.xml b/data/templates/npc/monster/20460-CrimsonSpider.xml
index 269ac1832..181e8063e 100644
--- a/data/templates/npc/monster/20460-CrimsonSpider.xml
+++ b/data/templates/npc/monster/20460-CrimsonSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20460" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20461-DungeonSpider.xml b/data/templates/npc/monster/20461-DungeonSpider.xml
index 7b6820327..18b11cc43 100644
--- a/data/templates/npc/monster/20461-DungeonSpider.xml
+++ b/data/templates/npc/monster/20461-DungeonSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20461" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20462-CaveBladeSpider.xml b/data/templates/npc/monster/20462-CaveBladeSpider.xml
index 83025b334..58b414787 100644
--- a/data/templates/npc/monster/20462-CaveBladeSpider.xml
+++ b/data/templates/npc/monster/20462-CaveBladeSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20462" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20463-DungeonSkeletonArcher.xml b/data/templates/npc/monster/20463-DungeonSkeletonArcher.xml
index 119c040c0..df0b12865 100644
--- a/data/templates/npc/monster/20463-DungeonSkeletonArcher.xml
+++ b/data/templates/npc/monster/20463-DungeonSkeletonArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20463" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20464-DungeonSkeleton.xml b/data/templates/npc/monster/20464-DungeonSkeleton.xml
index d68f5c852..eca265cfe 100644
--- a/data/templates/npc/monster/20464-DungeonSkeleton.xml
+++ b/data/templates/npc/monster/20464-DungeonSkeleton.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20464" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20465-PrairieFox.xml b/data/templates/npc/monster/20465-PrairieFox.xml
index 5bea1300a..135f3213b 100644
--- a/data/templates/npc/monster/20465-PrairieFox.xml
+++ b/data/templates/npc/monster/20465-PrairieFox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20465" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20466-PincerSpider.xml b/data/templates/npc/monster/20466-PincerSpider.xml
index b3c330c12..dcfe9996e 100644
--- a/data/templates/npc/monster/20466-PincerSpider.xml
+++ b/data/templates/npc/monster/20466-PincerSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20466" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20468-KabooOrc.xml b/data/templates/npc/monster/20468-KabooOrc.xml
index 5738c46f5..cc2717d10 100644
--- a/data/templates/npc/monster/20468-KabooOrc.xml
+++ b/data/templates/npc/monster/20468-KabooOrc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20468" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20469-KabooOrcArcher.xml b/data/templates/npc/monster/20469-KabooOrcArcher.xml
index 672793b8a..aa2dc7c8e 100644
--- a/data/templates/npc/monster/20469-KabooOrcArcher.xml
+++ b/data/templates/npc/monster/20469-KabooOrcArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20469" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20470-KabooOrcGrunt.xml b/data/templates/npc/monster/20470-KabooOrcGrunt.xml
index 82cb4365b..4278da0f1 100644
--- a/data/templates/npc/monster/20470-KabooOrcGrunt.xml
+++ b/data/templates/npc/monster/20470-KabooOrcGrunt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20470" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20471-KabooOrcFighter.xml b/data/templates/npc/monster/20471-KabooOrcFighter.xml
index e3e16da31..7534ce286 100644
--- a/data/templates/npc/monster/20471-KabooOrcFighter.xml
+++ b/data/templates/npc/monster/20471-KabooOrcFighter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20471" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20472-KabooOrcFighterLeader.xml b/data/templates/npc/monster/20472-KabooOrcFighterLeader.xml
index 6c0660b22..23bf43fd0 100644
--- a/data/templates/npc/monster/20472-KabooOrcFighterLeader.xml
+++ b/data/templates/npc/monster/20472-KabooOrcFighterLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20472" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20473-KabooOrcFighterLieutenant.xml b/data/templates/npc/monster/20473-KabooOrcFighterLieutenant.xml
index b99cfe25f..e4b4cb7d4 100644
--- a/data/templates/npc/monster/20473-KabooOrcFighterLieutenant.xml
+++ b/data/templates/npc/monster/20473-KabooOrcFighterLieutenant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20473" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20474-KashaSpider.xml b/data/templates/npc/monster/20474-KashaSpider.xml
index 998e01a5f..a73e439fc 100644
--- a/data/templates/npc/monster/20474-KashaSpider.xml
+++ b/data/templates/npc/monster/20474-KashaSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20474" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20475-KashaWolf.xml b/data/templates/npc/monster/20475-KashaWolf.xml
index 6f222d8a3..cb80f2ad2 100644
--- a/data/templates/npc/monster/20475-KashaWolf.xml
+++ b/data/templates/npc/monster/20475-KashaWolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20475" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20476-KashaFangSpider.xml b/data/templates/npc/monster/20476-KashaFangSpider.xml
index 55c58dca3..b52fe88fc 100644
--- a/data/templates/npc/monster/20476-KashaFangSpider.xml
+++ b/data/templates/npc/monster/20476-KashaFangSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20476" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20477-KashaTimberWolf.xml b/data/templates/npc/monster/20477-KashaTimberWolf.xml
index 7d0089491..e0437f6f0 100644
--- a/data/templates/npc/monster/20477-KashaTimberWolf.xml
+++ b/data/templates/npc/monster/20477-KashaTimberWolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20477" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20478-KashaBladeSpider.xml b/data/templates/npc/monster/20478-KashaBladeSpider.xml
index 1af50f9e3..e2c684d95 100644
--- a/data/templates/npc/monster/20478-KashaBladeSpider.xml
+++ b/data/templates/npc/monster/20478-KashaBladeSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20478" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20479-KashaBear.xml b/data/templates/npc/monster/20479-KashaBear.xml
index b1477d78c..a5005baff 100644
--- a/data/templates/npc/monster/20479-KashaBear.xml
+++ b/data/templates/npc/monster/20479-KashaBear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20479" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20480-BladeBat.xml b/data/templates/npc/monster/20480-BladeBat.xml
index 459517b09..ea35cdf28 100644
--- a/data/templates/npc/monster/20480-BladeBat.xml
+++ b/data/templates/npc/monster/20480-BladeBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20480" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20481-BeardedKeltir.xml b/data/templates/npc/monster/20481-BeardedKeltir.xml
index 047cf0ab4..29e600191 100644
--- a/data/templates/npc/monster/20481-BeardedKeltir.xml
+++ b/data/templates/npc/monster/20481-BeardedKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20481" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20483-CorpseCandle.xml b/data/templates/npc/monster/20483-CorpseCandle.xml
index 105fca5b4..a5590359e 100644
--- a/data/templates/npc/monster/20483-CorpseCandle.xml
+++ b/data/templates/npc/monster/20483-CorpseCandle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20483" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20487-KurukaRatman.xml b/data/templates/npc/monster/20487-KurukaRatman.xml
index 646e877b1..6b3d2f2e7 100644
--- a/data/templates/npc/monster/20487-KurukaRatman.xml
+++ b/data/templates/npc/monster/20487-KurukaRatman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20487" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20488-KurukaRatmanHunter.xml b/data/templates/npc/monster/20488-KurukaRatmanHunter.xml
index c27c775e1..67ced0335 100644
--- a/data/templates/npc/monster/20488-KurukaRatmanHunter.xml
+++ b/data/templates/npc/monster/20488-KurukaRatmanHunter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20488" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20489-QuicksilverBeast.xml b/data/templates/npc/monster/20489-QuicksilverBeast.xml
index 1c68f013f..9e1e09de4 100644
--- a/data/templates/npc/monster/20489-QuicksilverBeast.xml
+++ b/data/templates/npc/monster/20489-QuicksilverBeast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20489" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20490-DeathDoll.xml b/data/templates/npc/monster/20490-DeathDoll.xml
index 15745797d..82a1c4c38 100644
--- a/data/templates/npc/monster/20490-DeathDoll.xml
+++ b/data/templates/npc/monster/20490-DeathDoll.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20490" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20491-CryptHorror.xml b/data/templates/npc/monster/20491-CryptHorror.xml
index ffa67fa73..640f2ebaa 100644
--- a/data/templates/npc/monster/20491-CryptHorror.xml
+++ b/data/templates/npc/monster/20491-CryptHorror.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20491" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20492-KirunakSGuards.xml b/data/templates/npc/monster/20492-KirunakSGuards.xml
index 9f4d8424b..84fbf7b9f 100644
--- a/data/templates/npc/monster/20492-KirunakSGuards.xml
+++ b/data/templates/npc/monster/20492-KirunakSGuards.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20492" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20494-TurekWarHound.xml b/data/templates/npc/monster/20494-TurekWarHound.xml
index 8f14385a4..9ba1837d6 100644
--- a/data/templates/npc/monster/20494-TurekWarHound.xml
+++ b/data/templates/npc/monster/20494-TurekWarHound.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20494" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20495-TurekOrcWarlord.xml b/data/templates/npc/monster/20495-TurekOrcWarlord.xml
index 39ba220d0..67da078f0 100644
--- a/data/templates/npc/monster/20495-TurekOrcWarlord.xml
+++ b/data/templates/npc/monster/20495-TurekOrcWarlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20495" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20496-TurekOrcArcher.xml b/data/templates/npc/monster/20496-TurekOrcArcher.xml
index 68b09ac87..74f4ceebf 100644
--- a/data/templates/npc/monster/20496-TurekOrcArcher.xml
+++ b/data/templates/npc/monster/20496-TurekOrcArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20496" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20497-TurekOrcSkirmisher.xml b/data/templates/npc/monster/20497-TurekOrcSkirmisher.xml
index 2d4d59b02..7541982c1 100644
--- a/data/templates/npc/monster/20497-TurekOrcSkirmisher.xml
+++ b/data/templates/npc/monster/20497-TurekOrcSkirmisher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20497" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20498-TurekOrcSupplier.xml b/data/templates/npc/monster/20498-TurekOrcSupplier.xml
index fbdc0832c..f43cb6bf9 100644
--- a/data/templates/npc/monster/20498-TurekOrcSupplier.xml
+++ b/data/templates/npc/monster/20498-TurekOrcSupplier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20498" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20499-TurekOrcFootman.xml b/data/templates/npc/monster/20499-TurekOrcFootman.xml
index 0e5568b38..4669a2049 100644
--- a/data/templates/npc/monster/20499-TurekOrcFootman.xml
+++ b/data/templates/npc/monster/20499-TurekOrcFootman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20499" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20500-TurekOrcSentinel.xml b/data/templates/npc/monster/20500-TurekOrcSentinel.xml
index e69bde39a..8d1ea5c6b 100644
--- a/data/templates/npc/monster/20500-TurekOrcSentinel.xml
+++ b/data/templates/npc/monster/20500-TurekOrcSentinel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20500" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20501-TurekOrcShaman.xml b/data/templates/npc/monster/20501-TurekOrcShaman.xml
index bbe18b7fd..6b73dba97 100644
--- a/data/templates/npc/monster/20501-TurekOrcShaman.xml
+++ b/data/templates/npc/monster/20501-TurekOrcShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20501" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20502-TwinkPuma.xml b/data/templates/npc/monster/20502-TwinkPuma.xml
index 0e6e22fae..bc35e34a0 100644
--- a/data/templates/npc/monster/20502-TwinkPuma.xml
+++ b/data/templates/npc/monster/20502-TwinkPuma.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20502" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20504-DreadSoldier.xml b/data/templates/npc/monster/20504-DreadSoldier.xml
index 3d086f2a0..7a8fb001a 100644
--- a/data/templates/npc/monster/20504-DreadSoldier.xml
+++ b/data/templates/npc/monster/20504-DreadSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20504" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20505-RuinBat.xml b/data/templates/npc/monster/20505-RuinBat.xml
index 6427983dd..bc0792dce 100644
--- a/data/templates/npc/monster/20505-RuinBat.xml
+++ b/data/templates/npc/monster/20505-RuinBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20505" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20506-RuinImp.xml b/data/templates/npc/monster/20506-RuinImp.xml
index 5ae272fd5..5540fb076 100644
--- a/data/templates/npc/monster/20506-RuinImp.xml
+++ b/data/templates/npc/monster/20506-RuinImp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20506" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20507-RuinImpElder.xml b/data/templates/npc/monster/20507-RuinImpElder.xml
index 589e5059e..4a7e8d8cd 100644
--- a/data/templates/npc/monster/20507-RuinImpElder.xml
+++ b/data/templates/npc/monster/20507-RuinImpElder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20507" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20508-PlunderTarantula.xml b/data/templates/npc/monster/20508-PlunderTarantula.xml
index 9908c2906..6de0868bf 100644
--- a/data/templates/npc/monster/20508-PlunderTarantula.xml
+++ b/data/templates/npc/monster/20508-PlunderTarantula.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20508" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20509-SporeFungus.xml b/data/templates/npc/monster/20509-SporeFungus.xml
index 418643e37..c9d4d1e93 100644
--- a/data/templates/npc/monster/20509-SporeFungus.xml
+++ b/data/templates/npc/monster/20509-SporeFungus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20509" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20510-Puma.xml b/data/templates/npc/monster/20510-Puma.xml
index e65ce3dd2..6c5bbd80d 100644
--- a/data/templates/npc/monster/20510-Puma.xml
+++ b/data/templates/npc/monster/20510-Puma.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20510" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20511-PitchstoneGolem.xml b/data/templates/npc/monster/20511-PitchstoneGolem.xml
index 48d95d78d..6ca9aa893 100644
--- a/data/templates/npc/monster/20511-PitchstoneGolem.xml
+++ b/data/templates/npc/monster/20511-PitchstoneGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20511" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20512-FieldStalker.xml b/data/templates/npc/monster/20512-FieldStalker.xml
index b5bd4ad87..10ada834a 100644
--- a/data/templates/npc/monster/20512-FieldStalker.xml
+++ b/data/templates/npc/monster/20512-FieldStalker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20512" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20513-SkeletonKnight.xml b/data/templates/npc/monster/20513-SkeletonKnight.xml
index 6feab81dd..6e63f7927 100644
--- a/data/templates/npc/monster/20513-SkeletonKnight.xml
+++ b/data/templates/npc/monster/20513-SkeletonKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20513" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20514-ShieldSkeleton.xml b/data/templates/npc/monster/20514-ShieldSkeleton.xml
index 98aca4295..05f2cb351 100644
--- a/data/templates/npc/monster/20514-ShieldSkeleton.xml
+++ b/data/templates/npc/monster/20514-ShieldSkeleton.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20514" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20515-SkeletonInfantryman.xml b/data/templates/npc/monster/20515-SkeletonInfantryman.xml
index 9bc89431a..4225c93eb 100644
--- a/data/templates/npc/monster/20515-SkeletonInfantryman.xml
+++ b/data/templates/npc/monster/20515-SkeletonInfantryman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20515" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20516-SkeletonSentinel.xml b/data/templates/npc/monster/20516-SkeletonSentinel.xml
index 75919fe21..7ad3ad4fc 100644
--- a/data/templates/npc/monster/20516-SkeletonSentinel.xml
+++ b/data/templates/npc/monster/20516-SkeletonSentinel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20516" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20517-SkeletonHunter.xml b/data/templates/npc/monster/20517-SkeletonHunter.xml
index d13696779..eb831cdc6 100644
--- a/data/templates/npc/monster/20517-SkeletonHunter.xml
+++ b/data/templates/npc/monster/20517-SkeletonHunter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20517" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20518-SkeletonHunterArcher.xml b/data/templates/npc/monster/20518-SkeletonHunterArcher.xml
index 4c63afdf7..23b2a809f 100644
--- a/data/templates/npc/monster/20518-SkeletonHunterArcher.xml
+++ b/data/templates/npc/monster/20518-SkeletonHunterArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20518" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20519-SkeletonPikeman.xml b/data/templates/npc/monster/20519-SkeletonPikeman.xml
index 368753c17..44282600f 100644
--- a/data/templates/npc/monster/20519-SkeletonPikeman.xml
+++ b/data/templates/npc/monster/20519-SkeletonPikeman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20519" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20520-PirateCaptainUthanka.xml b/data/templates/npc/monster/20520-PirateCaptainUthanka.xml
index 32d38785b..479b2fccb 100644
--- a/data/templates/npc/monster/20520-PirateCaptainUthanka.xml
+++ b/data/templates/npc/monster/20520-PirateCaptainUthanka.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20520" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20521-WhinstoneGolem.xml b/data/templates/npc/monster/20521-WhinstoneGolem.xml
index 0719e1e4e..00807aca2 100644
--- a/data/templates/npc/monster/20521-WhinstoneGolem.xml
+++ b/data/templates/npc/monster/20521-WhinstoneGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20521" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20522-WhiteFang.xml b/data/templates/npc/monster/20522-WhiteFang.xml
index 41d4ed047..e13e49eaa 100644
--- a/data/templates/npc/monster/20522-WhiteFang.xml
+++ b/data/templates/npc/monster/20522-WhiteFang.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20522" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20524-GreyWolfElder.xml b/data/templates/npc/monster/20524-GreyWolfElder.xml
index 1337edaa7..668384998 100644
--- a/data/templates/npc/monster/20524-GreyWolfElder.xml
+++ b/data/templates/npc/monster/20524-GreyWolfElder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20524" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20525-GrayWolf.xml b/data/templates/npc/monster/20525-GrayWolf.xml
index fc32ec2f9..724a663c9 100644
--- a/data/templates/npc/monster/20525-GrayWolf.xml
+++ b/data/templates/npc/monster/20525-GrayWolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20525" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20526-ObsidianGolem.xml b/data/templates/npc/monster/20526-ObsidianGolem.xml
index 2fb6db0f2..7918b73cb 100644
--- a/data/templates/npc/monster/20526-ObsidianGolem.xml
+++ b/data/templates/npc/monster/20526-ObsidianGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20526" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20527-GreatSnowWolf.xml b/data/templates/npc/monster/20527-GreatSnowWolf.xml
index 650d0cec2..1ffdefef3 100644
--- a/data/templates/npc/monster/20527-GreatSnowWolf.xml
+++ b/data/templates/npc/monster/20527-GreatSnowWolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20527" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20528-GoblinLord.xml b/data/templates/npc/monster/20528-GoblinLord.xml
index 1e1c6d861..ccafd236a 100644
--- a/data/templates/npc/monster/20528-GoblinLord.xml
+++ b/data/templates/npc/monster/20528-GoblinLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20528" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20529-YoungBrownKeltir.xml b/data/templates/npc/monster/20529-YoungBrownKeltir.xml
index e862c6398..4c39a01fe 100644
--- a/data/templates/npc/monster/20529-YoungBrownKeltir.xml
+++ b/data/templates/npc/monster/20529-YoungBrownKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20529" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20530-YoungRedKeltir.xml b/data/templates/npc/monster/20530-YoungRedKeltir.xml
index 497397820..90c05886c 100644
--- a/data/templates/npc/monster/20530-YoungRedKeltir.xml
+++ b/data/templates/npc/monster/20530-YoungRedKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20530" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20531-YoungPrairieKeltir.xml b/data/templates/npc/monster/20531-YoungPrairieKeltir.xml
index 52be1cc4a..a9c22159c 100644
--- a/data/templates/npc/monster/20531-YoungPrairieKeltir.xml
+++ b/data/templates/npc/monster/20531-YoungPrairieKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20531" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20532-BrownKeltir.xml b/data/templates/npc/monster/20532-BrownKeltir.xml
index 1f0d69231..5bcb125de 100644
--- a/data/templates/npc/monster/20532-BrownKeltir.xml
+++ b/data/templates/npc/monster/20532-BrownKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20532" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20533-LongtailKeltir.xml b/data/templates/npc/monster/20533-LongtailKeltir.xml
index 92f35b2d8..019475df4 100644
--- a/data/templates/npc/monster/20533-LongtailKeltir.xml
+++ b/data/templates/npc/monster/20533-LongtailKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20533" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20534-RedKeltir.xml b/data/templates/npc/monster/20534-RedKeltir.xml
index a5b7fd22b..238f5b70a 100644
--- a/data/templates/npc/monster/20534-RedKeltir.xml
+++ b/data/templates/npc/monster/20534-RedKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20534" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20535-PrairieKeltir.xml b/data/templates/npc/monster/20535-PrairieKeltir.xml
index 41123eafe..8e72ad6f3 100644
--- a/data/templates/npc/monster/20535-PrairieKeltir.xml
+++ b/data/templates/npc/monster/20535-PrairieKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20535" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20536-ElderBrownKeltir.xml b/data/templates/npc/monster/20536-ElderBrownKeltir.xml
index ea3cda244..225dda019 100644
--- a/data/templates/npc/monster/20536-ElderBrownKeltir.xml
+++ b/data/templates/npc/monster/20536-ElderBrownKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20536" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20537-ElderRedKeltir.xml b/data/templates/npc/monster/20537-ElderRedKeltir.xml
index bdb7d09fd..2061d32b6 100644
--- a/data/templates/npc/monster/20537-ElderRedKeltir.xml
+++ b/data/templates/npc/monster/20537-ElderRedKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20537" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20538-ElderPrairieKeltir.xml b/data/templates/npc/monster/20538-ElderPrairieKeltir.xml
index d745c1d73..37e7c5f71 100644
--- a/data/templates/npc/monster/20538-ElderPrairieKeltir.xml
+++ b/data/templates/npc/monster/20538-ElderPrairieKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20538" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20539-ElderLongtailKeltir.xml b/data/templates/npc/monster/20539-ElderLongtailKeltir.xml
index f4454993e..a46c727c3 100644
--- a/data/templates/npc/monster/20539-ElderLongtailKeltir.xml
+++ b/data/templates/npc/monster/20539-ElderLongtailKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20539" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20540-GemstoneBeast.xml b/data/templates/npc/monster/20540-GemstoneBeast.xml
index fe7c6a55f..9bfceb9d7 100644
--- a/data/templates/npc/monster/20540-GemstoneBeast.xml
+++ b/data/templates/npc/monster/20540-GemstoneBeast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20540" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20541-OreBat.xml b/data/templates/npc/monster/20541-OreBat.xml
index cfcd8bcfe..f13af4926 100644
--- a/data/templates/npc/monster/20541-OreBat.xml
+++ b/data/templates/npc/monster/20541-OreBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20541" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20542-SkeletonLongbowman.xml b/data/templates/npc/monster/20542-SkeletonLongbowman.xml
index 8784bcbb7..e992bb4ab 100644
--- a/data/templates/npc/monster/20542-SkeletonLongbowman.xml
+++ b/data/templates/npc/monster/20542-SkeletonLongbowman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20542" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20543-Ghost.xml b/data/templates/npc/monster/20543-Ghost.xml
index e922aa612..b0a721a17 100644
--- a/data/templates/npc/monster/20543-Ghost.xml
+++ b/data/templates/npc/monster/20543-Ghost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20543" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20544-ElderKeltir.xml b/data/templates/npc/monster/20544-ElderKeltir.xml
index b6f8a6868..751dfc080 100644
--- a/data/templates/npc/monster/20544-ElderKeltir.xml
+++ b/data/templates/npc/monster/20544-ElderKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20544" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20545-YoungKeltir.xml b/data/templates/npc/monster/20545-YoungKeltir.xml
index c8d74699a..2a3ac1345 100644
--- a/data/templates/npc/monster/20545-YoungKeltir.xml
+++ b/data/templates/npc/monster/20545-YoungKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20545" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20546-TurekOrcElder.xml b/data/templates/npc/monster/20546-TurekOrcElder.xml
index 3606962fc..f811b5c71 100644
--- a/data/templates/npc/monster/20546-TurekOrcElder.xml
+++ b/data/templates/npc/monster/20546-TurekOrcElder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20546" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20547-OlMahumReserve.xml b/data/templates/npc/monster/20547-OlMahumReserve.xml
index 1bf2cb816..0e1c53703 100644
--- a/data/templates/npc/monster/20547-OlMahumReserve.xml
+++ b/data/templates/npc/monster/20547-OlMahumReserve.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20547" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20548-OlMahumDeserter.xml b/data/templates/npc/monster/20548-OlMahumDeserter.xml
index c5eb7d8f1..22c3efec3 100644
--- a/data/templates/npc/monster/20548-OlMahumDeserter.xml
+++ b/data/templates/npc/monster/20548-OlMahumDeserter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20548" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20549-OlMahumLord.xml b/data/templates/npc/monster/20549-OlMahumLord.xml
index bf8c743d4..d7611f128 100644
--- a/data/templates/npc/monster/20549-OlMahumLord.xml
+++ b/data/templates/npc/monster/20549-OlMahumLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20549" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20550-GuardianBasilisk.xml b/data/templates/npc/monster/20550-GuardianBasilisk.xml
index a0167503a..a71d0ccba 100644
--- a/data/templates/npc/monster/20550-GuardianBasilisk.xml
+++ b/data/templates/npc/monster/20550-GuardianBasilisk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20550" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20551-RoadScavenger.xml b/data/templates/npc/monster/20551-RoadScavenger.xml
index 1cac7acff..cb7fdde08 100644
--- a/data/templates/npc/monster/20551-RoadScavenger.xml
+++ b/data/templates/npc/monster/20551-RoadScavenger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20551" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20552-FetteredSoul.xml b/data/templates/npc/monster/20552-FetteredSoul.xml
index 2bea37d42..49f90dc90 100644
--- a/data/templates/npc/monster/20552-FetteredSoul.xml
+++ b/data/templates/npc/monster/20552-FetteredSoul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20552" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20553-Windsus.xml b/data/templates/npc/monster/20553-Windsus.xml
index bd897d307..d958f69c2 100644
--- a/data/templates/npc/monster/20553-Windsus.xml
+++ b/data/templates/npc/monster/20553-Windsus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20553" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20554-Grandis.xml b/data/templates/npc/monster/20554-Grandis.xml
index b35bae077..0ae7878d8 100644
--- a/data/templates/npc/monster/20554-Grandis.xml
+++ b/data/templates/npc/monster/20554-Grandis.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20554" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20555-GiantFungus.xml b/data/templates/npc/monster/20555-GiantFungus.xml
index e42e433f4..068566061 100644
--- a/data/templates/npc/monster/20555-GiantFungus.xml
+++ b/data/templates/npc/monster/20555-GiantFungus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20555" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20556-GiantMonstereye.xml b/data/templates/npc/monster/20556-GiantMonstereye.xml
index c5cfa8317..278898389 100644
--- a/data/templates/npc/monster/20556-GiantMonstereye.xml
+++ b/data/templates/npc/monster/20556-GiantMonstereye.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20556" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20557-DireWyrm.xml b/data/templates/npc/monster/20557-DireWyrm.xml
index 384399426..d9567d367 100644
--- a/data/templates/npc/monster/20557-DireWyrm.xml
+++ b/data/templates/npc/monster/20557-DireWyrm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20557" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20558-RottingTree.xml b/data/templates/npc/monster/20558-RottingTree.xml
index 5a8f62078..adbf9741a 100644
--- a/data/templates/npc/monster/20558-RottingTree.xml
+++ b/data/templates/npc/monster/20558-RottingTree.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20558" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20559-RottingGolem.xml b/data/templates/npc/monster/20559-RottingGolem.xml
index b485d7617..f2d2be53d 100644
--- a/data/templates/npc/monster/20559-RottingGolem.xml
+++ b/data/templates/npc/monster/20559-RottingGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20559" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20560-TrisalimSpider.xml b/data/templates/npc/monster/20560-TrisalimSpider.xml
index 081bc75c3..015857829 100644
--- a/data/templates/npc/monster/20560-TrisalimSpider.xml
+++ b/data/templates/npc/monster/20560-TrisalimSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20560" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20561-TrisalimTarantula.xml b/data/templates/npc/monster/20561-TrisalimTarantula.xml
index 1d87f9840..0927c767e 100644
--- a/data/templates/npc/monster/20561-TrisalimTarantula.xml
+++ b/data/templates/npc/monster/20561-TrisalimTarantula.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20561" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20562-SporeZombie.xml b/data/templates/npc/monster/20562-SporeZombie.xml
index e7197093a..5976a5f80 100644
--- a/data/templates/npc/monster/20562-SporeZombie.xml
+++ b/data/templates/npc/monster/20562-SporeZombie.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20562" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20563-ManashenGargoyle.xml b/data/templates/npc/monster/20563-ManashenGargoyle.xml
index 02919d80f..1b0b7b1d1 100644
--- a/data/templates/npc/monster/20563-ManashenGargoyle.xml
+++ b/data/templates/npc/monster/20563-ManashenGargoyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20563" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20564-EnchantedMonstereye.xml b/data/templates/npc/monster/20564-EnchantedMonstereye.xml
index 4b7794c27..cad721d4d 100644
--- a/data/templates/npc/monster/20564-EnchantedMonstereye.xml
+++ b/data/templates/npc/monster/20564-EnchantedMonstereye.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20564" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20565-EnchantedStoneGolem.xml b/data/templates/npc/monster/20565-EnchantedStoneGolem.xml
index f2d4b1b9a..61a0fe561 100644
--- a/data/templates/npc/monster/20565-EnchantedStoneGolem.xml
+++ b/data/templates/npc/monster/20565-EnchantedStoneGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20565" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20566-EnchantedIronGolem.xml b/data/templates/npc/monster/20566-EnchantedIronGolem.xml
index cce3254a3..1103b159b 100644
--- a/data/templates/npc/monster/20566-EnchantedIronGolem.xml
+++ b/data/templates/npc/monster/20566-EnchantedIronGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20566" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20567-EnchantedGargoyle.xml b/data/templates/npc/monster/20567-EnchantedGargoyle.xml
index d6e8cd600..d2b606d3c 100644
--- a/data/templates/npc/monster/20567-EnchantedGargoyle.xml
+++ b/data/templates/npc/monster/20567-EnchantedGargoyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20567" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20568-Formor.xml b/data/templates/npc/monster/20568-Formor.xml
index 7e5ebb831..f93e4f384 100644
--- a/data/templates/npc/monster/20568-Formor.xml
+++ b/data/templates/npc/monster/20568-Formor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20568" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20569-FormorElder.xml b/data/templates/npc/monster/20569-FormorElder.xml
index 56784c961..6098cfe90 100644
--- a/data/templates/npc/monster/20569-FormorElder.xml
+++ b/data/templates/npc/monster/20569-FormorElder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20569" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20570-TarlkBugbear.xml b/data/templates/npc/monster/20570-TarlkBugbear.xml
index 608221969..92a4f1307 100644
--- a/data/templates/npc/monster/20570-TarlkBugbear.xml
+++ b/data/templates/npc/monster/20570-TarlkBugbear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20570" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20571-TarlkBugbearWarrior.xml b/data/templates/npc/monster/20571-TarlkBugbearWarrior.xml
index ea99004db..b1a3aee6a 100644
--- a/data/templates/npc/monster/20571-TarlkBugbearWarrior.xml
+++ b/data/templates/npc/monster/20571-TarlkBugbearWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20571" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20572-TarlkBugbearHighWarrior.xml b/data/templates/npc/monster/20572-TarlkBugbearHighWarrior.xml
index ab0206d05..b76eb2f3a 100644
--- a/data/templates/npc/monster/20572-TarlkBugbearHighWarrior.xml
+++ b/data/templates/npc/monster/20572-TarlkBugbearHighWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20572" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20573-TarlkBasilisk.xml b/data/templates/npc/monster/20573-TarlkBasilisk.xml
index dfda20063..aa98a019e 100644
--- a/data/templates/npc/monster/20573-TarlkBasilisk.xml
+++ b/data/templates/npc/monster/20573-TarlkBasilisk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20573" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20574-ElderTarlkBasilisk.xml b/data/templates/npc/monster/20574-ElderTarlkBasilisk.xml
index 7ae4ce5c5..ed2aee02e 100644
--- a/data/templates/npc/monster/20574-ElderTarlkBasilisk.xml
+++ b/data/templates/npc/monster/20574-ElderTarlkBasilisk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20574" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20575-OelMahumWarrior.xml b/data/templates/npc/monster/20575-OelMahumWarrior.xml
index 87d77b716..115f5d808 100644
--- a/data/templates/npc/monster/20575-OelMahumWarrior.xml
+++ b/data/templates/npc/monster/20575-OelMahumWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20575" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20576-OelMahumWitchDoctor.xml b/data/templates/npc/monster/20576-OelMahumWitchDoctor.xml
index 5d32da67e..94d83873e 100644
--- a/data/templates/npc/monster/20576-OelMahumWitchDoctor.xml
+++ b/data/templates/npc/monster/20576-OelMahumWitchDoctor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20576" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20577-LetoLizardman.xml b/data/templates/npc/monster/20577-LetoLizardman.xml
index 709079ff7..8a36d6c80 100644
--- a/data/templates/npc/monster/20577-LetoLizardman.xml
+++ b/data/templates/npc/monster/20577-LetoLizardman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20577" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20578-LetoLizardmanArcher.xml b/data/templates/npc/monster/20578-LetoLizardmanArcher.xml
index 39f80b81d..ab110f91b 100644
--- a/data/templates/npc/monster/20578-LetoLizardmanArcher.xml
+++ b/data/templates/npc/monster/20578-LetoLizardmanArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20578" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20579-LetoLizardmanSoldier.xml b/data/templates/npc/monster/20579-LetoLizardmanSoldier.xml
index a898146fb..ef9e2cda9 100644
--- a/data/templates/npc/monster/20579-LetoLizardmanSoldier.xml
+++ b/data/templates/npc/monster/20579-LetoLizardmanSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20579" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20580-LetoLizardmanWarrior.xml b/data/templates/npc/monster/20580-LetoLizardmanWarrior.xml
index c06f2064e..58c7ba7d9 100644
--- a/data/templates/npc/monster/20580-LetoLizardmanWarrior.xml
+++ b/data/templates/npc/monster/20580-LetoLizardmanWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20580" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20581-LetoLizardmanShaman.xml b/data/templates/npc/monster/20581-LetoLizardmanShaman.xml
index b83160913..f3c5edc13 100644
--- a/data/templates/npc/monster/20581-LetoLizardmanShaman.xml
+++ b/data/templates/npc/monster/20581-LetoLizardmanShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20581" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20582-LetoLizardmanOverlord.xml b/data/templates/npc/monster/20582-LetoLizardmanOverlord.xml
index ee593f474..f3a0db859 100644
--- a/data/templates/npc/monster/20582-LetoLizardmanOverlord.xml
+++ b/data/templates/npc/monster/20582-LetoLizardmanOverlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20582" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20583-TimakOrc.xml b/data/templates/npc/monster/20583-TimakOrc.xml
index 58c329b1e..cebe1ffec 100644
--- a/data/templates/npc/monster/20583-TimakOrc.xml
+++ b/data/templates/npc/monster/20583-TimakOrc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20583" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20584-TimakOrcArcher.xml b/data/templates/npc/monster/20584-TimakOrcArcher.xml
index c9b8a39f2..4bdb1eb7c 100644
--- a/data/templates/npc/monster/20584-TimakOrcArcher.xml
+++ b/data/templates/npc/monster/20584-TimakOrcArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20584" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20585-TimakOrcSoldier.xml b/data/templates/npc/monster/20585-TimakOrcSoldier.xml
index b01d2d9bc..74f84b044 100644
--- a/data/templates/npc/monster/20585-TimakOrcSoldier.xml
+++ b/data/templates/npc/monster/20585-TimakOrcSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20585" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20586-TimakOrcWarrior.xml b/data/templates/npc/monster/20586-TimakOrcWarrior.xml
index 8cacf8ee0..19adec14c 100644
--- a/data/templates/npc/monster/20586-TimakOrcWarrior.xml
+++ b/data/templates/npc/monster/20586-TimakOrcWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20586" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20587-TimakOrcShaman.xml b/data/templates/npc/monster/20587-TimakOrcShaman.xml
index ead9c7478..088943b42 100644
--- a/data/templates/npc/monster/20587-TimakOrcShaman.xml
+++ b/data/templates/npc/monster/20587-TimakOrcShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20587" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20588-TimakOrcOverlord.xml b/data/templates/npc/monster/20588-TimakOrcOverlord.xml
index cae792448..0111d79f6 100644
--- a/data/templates/npc/monster/20588-TimakOrcOverlord.xml
+++ b/data/templates/npc/monster/20588-TimakOrcOverlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20588" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20589-Fline.xml b/data/templates/npc/monster/20589-Fline.xml
index b06673336..a12eb4727 100644
--- a/data/templates/npc/monster/20589-Fline.xml
+++ b/data/templates/npc/monster/20589-Fline.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20589" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20590-Liele.xml b/data/templates/npc/monster/20590-Liele.xml
index f2e5c35cb..9729d7dce 100644
--- a/data/templates/npc/monster/20590-Liele.xml
+++ b/data/templates/npc/monster/20590-Liele.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20590" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20591-ValleyTreant.xml b/data/templates/npc/monster/20591-ValleyTreant.xml
index 374556f9b..61f86db9e 100644
--- a/data/templates/npc/monster/20591-ValleyTreant.xml
+++ b/data/templates/npc/monster/20591-ValleyTreant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20591" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20592-Satyr.xml b/data/templates/npc/monster/20592-Satyr.xml
index ca5d94b4b..3de0236e3 100644
--- a/data/templates/npc/monster/20592-Satyr.xml
+++ b/data/templates/npc/monster/20592-Satyr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20592" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20593-Unicorn.xml b/data/templates/npc/monster/20593-Unicorn.xml
index 93ba2b3bf..604b00960 100644
--- a/data/templates/npc/monster/20593-Unicorn.xml
+++ b/data/templates/npc/monster/20593-Unicorn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20593" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20594-ForestRunner.xml b/data/templates/npc/monster/20594-ForestRunner.xml
index c2d3d3995..3c1736f58 100644
--- a/data/templates/npc/monster/20594-ForestRunner.xml
+++ b/data/templates/npc/monster/20594-ForestRunner.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20594" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20595-FlineElder.xml b/data/templates/npc/monster/20595-FlineElder.xml
index 4661276ff..e9b77685d 100644
--- a/data/templates/npc/monster/20595-FlineElder.xml
+++ b/data/templates/npc/monster/20595-FlineElder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20595" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20596-LieleElder.xml b/data/templates/npc/monster/20596-LieleElder.xml
index b1e7a3cdd..bf962ed3b 100644
--- a/data/templates/npc/monster/20596-LieleElder.xml
+++ b/data/templates/npc/monster/20596-LieleElder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20596" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20597-ValleyTreantElder.xml b/data/templates/npc/monster/20597-ValleyTreantElder.xml
index 340826b95..b3348c1e9 100644
--- a/data/templates/npc/monster/20597-ValleyTreantElder.xml
+++ b/data/templates/npc/monster/20597-ValleyTreantElder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20597" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20598-SatyrElder.xml b/data/templates/npc/monster/20598-SatyrElder.xml
index ef7d9ce91..ae96afaeb 100644
--- a/data/templates/npc/monster/20598-SatyrElder.xml
+++ b/data/templates/npc/monster/20598-SatyrElder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20598" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20599-UnicornElder.xml b/data/templates/npc/monster/20599-UnicornElder.xml
index afcd6e665..4f2bad215 100644
--- a/data/templates/npc/monster/20599-UnicornElder.xml
+++ b/data/templates/npc/monster/20599-UnicornElder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20599" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20600-KarulBugbear.xml b/data/templates/npc/monster/20600-KarulBugbear.xml
index 01a079827..e3bd436ef 100644
--- a/data/templates/npc/monster/20600-KarulBugbear.xml
+++ b/data/templates/npc/monster/20600-KarulBugbear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20600" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20601-TamlinOrc.xml b/data/templates/npc/monster/20601-TamlinOrc.xml
index f1adc6455..c695ff424 100644
--- a/data/templates/npc/monster/20601-TamlinOrc.xml
+++ b/data/templates/npc/monster/20601-TamlinOrc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20601" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20602-TamlinOrcArcher.xml b/data/templates/npc/monster/20602-TamlinOrcArcher.xml
index 80e0c0c2f..0212b005b 100644
--- a/data/templates/npc/monster/20602-TamlinOrcArcher.xml
+++ b/data/templates/npc/monster/20602-TamlinOrcArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20602" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20603-KronbeSpider.xml b/data/templates/npc/monster/20603-KronbeSpider.xml
index ee3dcb675..35d9dffea 100644
--- a/data/templates/npc/monster/20603-KronbeSpider.xml
+++ b/data/templates/npc/monster/20603-KronbeSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20603" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20604-Rakin.xml b/data/templates/npc/monster/20604-Rakin.xml
index 1214d76f0..ec4e99102 100644
--- a/data/templates/npc/monster/20604-Rakin.xml
+++ b/data/templates/npc/monster/20604-Rakin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20604" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20605-WeirdDrake.xml b/data/templates/npc/monster/20605-WeirdDrake.xml
index 957b49285..ae77d1855 100644
--- a/data/templates/npc/monster/20605-WeirdDrake.xml
+++ b/data/templates/npc/monster/20605-WeirdDrake.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20605" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20606-KuranKobold.xml b/data/templates/npc/monster/20606-KuranKobold.xml
index 86c8e4ef1..590dc8cb1 100644
--- a/data/templates/npc/monster/20606-KuranKobold.xml
+++ b/data/templates/npc/monster/20606-KuranKobold.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20606" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20607-KuranKoboldWarrior.xml b/data/templates/npc/monster/20607-KuranKoboldWarrior.xml
index 6537cada5..1bb618c1e 100644
--- a/data/templates/npc/monster/20607-KuranKoboldWarrior.xml
+++ b/data/templates/npc/monster/20607-KuranKoboldWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20607" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20608-PatinArcher.xml b/data/templates/npc/monster/20608-PatinArcher.xml
index 871ae913b..34b2e387a 100644
--- a/data/templates/npc/monster/20608-PatinArcher.xml
+++ b/data/templates/npc/monster/20608-PatinArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20608" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20609-RakinSalamander.xml b/data/templates/npc/monster/20609-RakinSalamander.xml
index 587544074..620f83499 100644
--- a/data/templates/npc/monster/20609-RakinSalamander.xml
+++ b/data/templates/npc/monster/20609-RakinSalamander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20609" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20610-SentinelOfWater.xml b/data/templates/npc/monster/20610-SentinelOfWater.xml
index 35492e7bd..9e51a9836 100644
--- a/data/templates/npc/monster/20610-SentinelOfWater.xml
+++ b/data/templates/npc/monster/20610-SentinelOfWater.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20610" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20611-DreVanulWarrior.xml b/data/templates/npc/monster/20611-DreVanulWarrior.xml
index b8aecd9cf..2e2867038 100644
--- a/data/templates/npc/monster/20611-DreVanulWarrior.xml
+++ b/data/templates/npc/monster/20611-DreVanulWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20611" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20612-SalamanderRowin.xml b/data/templates/npc/monster/20612-SalamanderRowin.xml
index 74698509c..1e34c2147 100644
--- a/data/templates/npc/monster/20612-SalamanderRowin.xml
+++ b/data/templates/npc/monster/20612-SalamanderRowin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20612" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20613-LafiLizardman.xml b/data/templates/npc/monster/20613-LafiLizardman.xml
index e62b04766..c7ebdd8a0 100644
--- a/data/templates/npc/monster/20613-LafiLizardman.xml
+++ b/data/templates/npc/monster/20613-LafiLizardman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20613" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20614-LafiLizardmanScout.xml b/data/templates/npc/monster/20614-LafiLizardmanScout.xml
index 260fa5ff4..5d3697d7f 100644
--- a/data/templates/npc/monster/20614-LafiLizardmanScout.xml
+++ b/data/templates/npc/monster/20614-LafiLizardmanScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20614" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20615-RitmalSwordsman.xml b/data/templates/npc/monster/20615-RitmalSwordsman.xml
index 71d2ba079..b9c3bac6d 100644
--- a/data/templates/npc/monster/20615-RitmalSwordsman.xml
+++ b/data/templates/npc/monster/20615-RitmalSwordsman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20615" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20616-RakinUndine.xml b/data/templates/npc/monster/20616-RakinUndine.xml
index fe6c24386..7eb49201a 100644
--- a/data/templates/npc/monster/20616-RakinUndine.xml
+++ b/data/templates/npc/monster/20616-RakinUndine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20616" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20617-SentinelOfWater.xml b/data/templates/npc/monster/20617-SentinelOfWater.xml
index e8436ee9a..5eecfbe4d 100644
--- a/data/templates/npc/monster/20617-SentinelOfWater.xml
+++ b/data/templates/npc/monster/20617-SentinelOfWater.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20617" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20618-KanilSuccubus.xml b/data/templates/npc/monster/20618-KanilSuccubus.xml
index d68b748b3..97ce2ead2 100644
--- a/data/templates/npc/monster/20618-KanilSuccubus.xml
+++ b/data/templates/npc/monster/20618-KanilSuccubus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20618" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20619-RowinUndine.xml b/data/templates/npc/monster/20619-RowinUndine.xml
index e8ce84831..6c34d5fb2 100644
--- a/data/templates/npc/monster/20619-RowinUndine.xml
+++ b/data/templates/npc/monster/20619-RowinUndine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20619" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20620-CaveBeast.xml b/data/templates/npc/monster/20620-CaveBeast.xml
index 4e4eadc2a..fc55db1fd 100644
--- a/data/templates/npc/monster/20620-CaveBeast.xml
+++ b/data/templates/npc/monster/20620-CaveBeast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20620" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20621-DeathWave.xml b/data/templates/npc/monster/20621-DeathWave.xml
index ebaca7dd8..15643985d 100644
--- a/data/templates/npc/monster/20621-DeathWave.xml
+++ b/data/templates/npc/monster/20621-DeathWave.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20621" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20622-MalrukSoldier.xml b/data/templates/npc/monster/20622-MalrukSoldier.xml
index ce95e4cc5..bd9e2ecf4 100644
--- a/data/templates/npc/monster/20622-MalrukSoldier.xml
+++ b/data/templates/npc/monster/20622-MalrukSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20622" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20623-Plando.xml b/data/templates/npc/monster/20623-Plando.xml
index 6dfa61a16..6a972aa63 100644
--- a/data/templates/npc/monster/20623-Plando.xml
+++ b/data/templates/npc/monster/20623-Plando.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20623" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20624-CaveHowler.xml b/data/templates/npc/monster/20624-CaveHowler.xml
index bc86e6fd5..d870af49b 100644
--- a/data/templates/npc/monster/20624-CaveHowler.xml
+++ b/data/templates/npc/monster/20624-CaveHowler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20624" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20625-MalrukKnight.xml b/data/templates/npc/monster/20625-MalrukKnight.xml
index 955920e61..943ccc88f 100644
--- a/data/templates/npc/monster/20625-MalrukKnight.xml
+++ b/data/templates/npc/monster/20625-MalrukKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20625" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20626-MalrukBerserker.xml b/data/templates/npc/monster/20626-MalrukBerserker.xml
index 10d9ee924..1c0bb48e0 100644
--- a/data/templates/npc/monster/20626-MalrukBerserker.xml
+++ b/data/templates/npc/monster/20626-MalrukBerserker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20626" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20627-MalrukLord.xml b/data/templates/npc/monster/20627-MalrukLord.xml
index 69aa9e2a0..fadf6c552 100644
--- a/data/templates/npc/monster/20627-MalrukLord.xml
+++ b/data/templates/npc/monster/20627-MalrukLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20627" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20628-LimalKarinness.xml b/data/templates/npc/monster/20628-LimalKarinness.xml
index 2bb8463c5..e5d91f5bf 100644
--- a/data/templates/npc/monster/20628-LimalKarinness.xml
+++ b/data/templates/npc/monster/20628-LimalKarinness.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20628" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20629-Karik.xml b/data/templates/npc/monster/20629-Karik.xml
index e3e18bf16..d4fc3cd6f 100644
--- a/data/templates/npc/monster/20629-Karik.xml
+++ b/data/templates/npc/monster/20629-Karik.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20629" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20630-TaikOrc.xml b/data/templates/npc/monster/20630-TaikOrc.xml
index 625d040e3..f0a6b8c1c 100644
--- a/data/templates/npc/monster/20630-TaikOrc.xml
+++ b/data/templates/npc/monster/20630-TaikOrc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20630" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20631-TaikOrcArcher.xml b/data/templates/npc/monster/20631-TaikOrcArcher.xml
index 502586463..5bc6ffd5e 100644
--- a/data/templates/npc/monster/20631-TaikOrcArcher.xml
+++ b/data/templates/npc/monster/20631-TaikOrcArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20631" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20632-TaikOrcWarrior.xml b/data/templates/npc/monster/20632-TaikOrcWarrior.xml
index db9a962e1..908079fce 100644
--- a/data/templates/npc/monster/20632-TaikOrcWarrior.xml
+++ b/data/templates/npc/monster/20632-TaikOrcWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20632" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20633-TaikOrcShaman.xml b/data/templates/npc/monster/20633-TaikOrcShaman.xml
index a69188b9f..1eebf85d9 100644
--- a/data/templates/npc/monster/20633-TaikOrcShaman.xml
+++ b/data/templates/npc/monster/20633-TaikOrcShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20633" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20634-TaikOrcCaptain.xml b/data/templates/npc/monster/20634-TaikOrcCaptain.xml
index bff981d96..568d2fab9 100644
--- a/data/templates/npc/monster/20634-TaikOrcCaptain.xml
+++ b/data/templates/npc/monster/20634-TaikOrcCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20634" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20635-Carinkain.xml b/data/templates/npc/monster/20635-Carinkain.xml
index 603091ced..ae9b45d82 100644
--- a/data/templates/npc/monster/20635-Carinkain.xml
+++ b/data/templates/npc/monster/20635-Carinkain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20635" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20636-ForestOfMirrorsGhost.xml b/data/templates/npc/monster/20636-ForestOfMirrorsGhost.xml
index 407bc31dd..5ecbff760 100644
--- a/data/templates/npc/monster/20636-ForestOfMirrorsGhost.xml
+++ b/data/templates/npc/monster/20636-ForestOfMirrorsGhost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20636" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20637-ForestOfMirrorsGhost.xml b/data/templates/npc/monster/20637-ForestOfMirrorsGhost.xml
index 5385d14b2..33cd7a7eb 100644
--- a/data/templates/npc/monster/20637-ForestOfMirrorsGhost.xml
+++ b/data/templates/npc/monster/20637-ForestOfMirrorsGhost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20637" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20638-ForestOfMirrorsGhost.xml b/data/templates/npc/monster/20638-ForestOfMirrorsGhost.xml
index 6d936cec8..8b2473512 100644
--- a/data/templates/npc/monster/20638-ForestOfMirrorsGhost.xml
+++ b/data/templates/npc/monster/20638-ForestOfMirrorsGhost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20638" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20639-Mirror.xml b/data/templates/npc/monster/20639-Mirror.xml
index ac0202048..02e87a338 100644
--- a/data/templates/npc/monster/20639-Mirror.xml
+++ b/data/templates/npc/monster/20639-Mirror.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20639" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20640-HaritLizardman.xml b/data/templates/npc/monster/20640-HaritLizardman.xml
index dc6d0fcd6..6a611b3a7 100644
--- a/data/templates/npc/monster/20640-HaritLizardman.xml
+++ b/data/templates/npc/monster/20640-HaritLizardman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20640" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20641-HaritLizardmanGrunt.xml b/data/templates/npc/monster/20641-HaritLizardmanGrunt.xml
index fe9014064..7bc21d28e 100644
--- a/data/templates/npc/monster/20641-HaritLizardmanGrunt.xml
+++ b/data/templates/npc/monster/20641-HaritLizardmanGrunt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20641" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20642-HaritLizardmanArcher.xml b/data/templates/npc/monster/20642-HaritLizardmanArcher.xml
index 5b45bac9d..9c577622d 100644
--- a/data/templates/npc/monster/20642-HaritLizardmanArcher.xml
+++ b/data/templates/npc/monster/20642-HaritLizardmanArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20642" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20643-HaritLizardmanWarrior.xml b/data/templates/npc/monster/20643-HaritLizardmanWarrior.xml
index 5fed671c6..e1e0279cf 100644
--- a/data/templates/npc/monster/20643-HaritLizardmanWarrior.xml
+++ b/data/templates/npc/monster/20643-HaritLizardmanWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20643" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20644-HaritLizardmanShaman.xml b/data/templates/npc/monster/20644-HaritLizardmanShaman.xml
index 9e752bd85..17d5b2286 100644
--- a/data/templates/npc/monster/20644-HaritLizardmanShaman.xml
+++ b/data/templates/npc/monster/20644-HaritLizardmanShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20644" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20645-HaritLizardmanMatriarch.xml b/data/templates/npc/monster/20645-HaritLizardmanMatriarch.xml
index ebab6e917..48eeb62c8 100644
--- a/data/templates/npc/monster/20645-HaritLizardmanMatriarch.xml
+++ b/data/templates/npc/monster/20645-HaritLizardmanMatriarch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20645" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20646-Halingka.xml b/data/templates/npc/monster/20646-Halingka.xml
index 84a6c8c54..15715d18f 100644
--- a/data/templates/npc/monster/20646-Halingka.xml
+++ b/data/templates/npc/monster/20646-Halingka.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20646" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20647-Yintzu.xml b/data/templates/npc/monster/20647-Yintzu.xml
index 97db14a55..517a435cf 100644
--- a/data/templates/npc/monster/20647-Yintzu.xml
+++ b/data/templates/npc/monster/20647-Yintzu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20647" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20648-Paliote.xml b/data/templates/npc/monster/20648-Paliote.xml
index 519523b09..ef04fd798 100644
--- a/data/templates/npc/monster/20648-Paliote.xml
+++ b/data/templates/npc/monster/20648-Paliote.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20648" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20649-Hamrut.xml b/data/templates/npc/monster/20649-Hamrut.xml
index 4b80d75aa..2c2cb4179 100644
--- a/data/templates/npc/monster/20649-Hamrut.xml
+++ b/data/templates/npc/monster/20649-Hamrut.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20649" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20650-Kranrot.xml b/data/templates/npc/monster/20650-Kranrot.xml
index fdc492a4b..b7cecfa7c 100644
--- a/data/templates/npc/monster/20650-Kranrot.xml
+++ b/data/templates/npc/monster/20650-Kranrot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20650" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20651-Gamlin.xml b/data/templates/npc/monster/20651-Gamlin.xml
index 08c1bdbd9..aadd55dca 100644
--- a/data/templates/npc/monster/20651-Gamlin.xml
+++ b/data/templates/npc/monster/20651-Gamlin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20651" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20652-Leogul.xml b/data/templates/npc/monster/20652-Leogul.xml
index a54a06d99..649ceb230 100644
--- a/data/templates/npc/monster/20652-Leogul.xml
+++ b/data/templates/npc/monster/20652-Leogul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20652" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20653-LesserGiant.xml b/data/templates/npc/monster/20653-LesserGiant.xml
index 511fd4f66..05be1c358 100644
--- a/data/templates/npc/monster/20653-LesserGiant.xml
+++ b/data/templates/npc/monster/20653-LesserGiant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20653" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20654-LesserGiantSoldier.xml b/data/templates/npc/monster/20654-LesserGiantSoldier.xml
index 6b4b3f03c..8be6f8308 100644
--- a/data/templates/npc/monster/20654-LesserGiantSoldier.xml
+++ b/data/templates/npc/monster/20654-LesserGiantSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20654" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20655-LesserGiantShooter.xml b/data/templates/npc/monster/20655-LesserGiantShooter.xml
index 4706dab60..cf81fb0fb 100644
--- a/data/templates/npc/monster/20655-LesserGiantShooter.xml
+++ b/data/templates/npc/monster/20655-LesserGiantShooter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20655" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20656-LesserGiantScout.xml b/data/templates/npc/monster/20656-LesserGiantScout.xml
index 2411acef4..2e376f020 100644
--- a/data/templates/npc/monster/20656-LesserGiantScout.xml
+++ b/data/templates/npc/monster/20656-LesserGiantScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20656" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20657-LesserGiantMage.xml b/data/templates/npc/monster/20657-LesserGiantMage.xml
index a022bdb0f..95c67dcd7 100644
--- a/data/templates/npc/monster/20657-LesserGiantMage.xml
+++ b/data/templates/npc/monster/20657-LesserGiantMage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20657" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20658-LesserGiantElder.xml b/data/templates/npc/monster/20658-LesserGiantElder.xml
index c8b6faa9e..f9c91ab12 100644
--- a/data/templates/npc/monster/20658-LesserGiantElder.xml
+++ b/data/templates/npc/monster/20658-LesserGiantElder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20658" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20659-GraveWanderer.xml b/data/templates/npc/monster/20659-GraveWanderer.xml
index d6d273e1d..5ae8e8fed 100644
--- a/data/templates/npc/monster/20659-GraveWanderer.xml
+++ b/data/templates/npc/monster/20659-GraveWanderer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20659" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20660-ArcherOfGreed.xml b/data/templates/npc/monster/20660-ArcherOfGreed.xml
index a4b5c943b..c431c3df0 100644
--- a/data/templates/npc/monster/20660-ArcherOfGreed.xml
+++ b/data/templates/npc/monster/20660-ArcherOfGreed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20660" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20661-HatarRatmanThief.xml b/data/templates/npc/monster/20661-HatarRatmanThief.xml
index 8254999d6..e09c723c5 100644
--- a/data/templates/npc/monster/20661-HatarRatmanThief.xml
+++ b/data/templates/npc/monster/20661-HatarRatmanThief.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20661" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20662-HatarRatmanBoss.xml b/data/templates/npc/monster/20662-HatarRatmanBoss.xml
index 2426bdad1..502dfc7b6 100644
--- a/data/templates/npc/monster/20662-HatarRatmanBoss.xml
+++ b/data/templates/npc/monster/20662-HatarRatmanBoss.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20662" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20663-HatarHanishee.xml b/data/templates/npc/monster/20663-HatarHanishee.xml
index 120eeeee6..00fc90e72 100644
--- a/data/templates/npc/monster/20663-HatarHanishee.xml
+++ b/data/templates/npc/monster/20663-HatarHanishee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20663" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20664-Deprive.xml b/data/templates/npc/monster/20664-Deprive.xml
index 51aa565c4..da114c83b 100644
--- a/data/templates/npc/monster/20664-Deprive.xml
+++ b/data/templates/npc/monster/20664-Deprive.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20664" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20665-TaikOrcSupply.xml b/data/templates/npc/monster/20665-TaikOrcSupply.xml
index 67172c1e6..7fbb28360 100644
--- a/data/templates/npc/monster/20665-TaikOrcSupply.xml
+++ b/data/templates/npc/monster/20665-TaikOrcSupply.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20665" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20666-TaikOrcSeeker.xml b/data/templates/npc/monster/20666-TaikOrcSeeker.xml
index 708f83661..4bda4c290 100644
--- a/data/templates/npc/monster/20666-TaikOrcSeeker.xml
+++ b/data/templates/npc/monster/20666-TaikOrcSeeker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20666" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20667-Farcran.xml b/data/templates/npc/monster/20667-Farcran.xml
index e46a703d5..d71c4eefe 100644
--- a/data/templates/npc/monster/20667-Farcran.xml
+++ b/data/templates/npc/monster/20667-Farcran.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20667" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20668-GraveGuard.xml b/data/templates/npc/monster/20668-GraveGuard.xml
index 8bf04ade6..1bdc443f4 100644
--- a/data/templates/npc/monster/20668-GraveGuard.xml
+++ b/data/templates/npc/monster/20668-GraveGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20668" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20669-TaikOrcSupplyLeader.xml b/data/templates/npc/monster/20669-TaikOrcSupplyLeader.xml
index c0e8a0a12..b907330fb 100644
--- a/data/templates/npc/monster/20669-TaikOrcSupplyLeader.xml
+++ b/data/templates/npc/monster/20669-TaikOrcSupplyLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20669" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20670-CrimsonDrake.xml b/data/templates/npc/monster/20670-CrimsonDrake.xml
index ce2171922..fa06a9d36 100644
--- a/data/templates/npc/monster/20670-CrimsonDrake.xml
+++ b/data/templates/npc/monster/20670-CrimsonDrake.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20670" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20671-Kadios.xml b/data/templates/npc/monster/20671-Kadios.xml
index a3f495f0f..ead44ab79 100644
--- a/data/templates/npc/monster/20671-Kadios.xml
+++ b/data/templates/npc/monster/20671-Kadios.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20671" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20672-Trives.xml b/data/templates/npc/monster/20672-Trives.xml
index 57a5181d6..854159c09 100644
--- a/data/templates/npc/monster/20672-Trives.xml
+++ b/data/templates/npc/monster/20672-Trives.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20672" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20673-Falibati.xml b/data/templates/npc/monster/20673-Falibati.xml
index 7e855ef64..7e41f951b 100644
--- a/data/templates/npc/monster/20673-Falibati.xml
+++ b/data/templates/npc/monster/20673-Falibati.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20673" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20674-DoomKnight.xml b/data/templates/npc/monster/20674-DoomKnight.xml
index 2c83b3658..4c6a6ba95 100644
--- a/data/templates/npc/monster/20674-DoomKnight.xml
+++ b/data/templates/npc/monster/20674-DoomKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20674" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20675-Tairim.xml b/data/templates/npc/monster/20675-Tairim.xml
index 8201ae2a9..45c697dd7 100644
--- a/data/templates/npc/monster/20675-Tairim.xml
+++ b/data/templates/npc/monster/20675-Tairim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20675" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20676-JudgeOfMarsh.xml b/data/templates/npc/monster/20676-JudgeOfMarsh.xml
index d96afb016..2963fe02b 100644
--- a/data/templates/npc/monster/20676-JudgeOfMarsh.xml
+++ b/data/templates/npc/monster/20676-JudgeOfMarsh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20676" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20677-Tulben.xml b/data/templates/npc/monster/20677-Tulben.xml
index 86fe6ea74..4fe09e2a5 100644
--- a/data/templates/npc/monster/20677-Tulben.xml
+++ b/data/templates/npc/monster/20677-Tulben.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20677" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20678-TorturedUndead.xml b/data/templates/npc/monster/20678-TorturedUndead.xml
index f49178655..4bf601349 100644
--- a/data/templates/npc/monster/20678-TorturedUndead.xml
+++ b/data/templates/npc/monster/20678-TorturedUndead.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20678" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20679-MarshStalker.xml b/data/templates/npc/monster/20679-MarshStalker.xml
index 7730942b3..8d8668c1f 100644
--- a/data/templates/npc/monster/20679-MarshStalker.xml
+++ b/data/templates/npc/monster/20679-MarshStalker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20679" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20680-MarshDrake.xml b/data/templates/npc/monster/20680-MarshDrake.xml
index 3c4f0a931..45bcb0ba3 100644
--- a/data/templates/npc/monster/20680-MarshDrake.xml
+++ b/data/templates/npc/monster/20680-MarshDrake.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20680" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20681-VanorSilenos.xml b/data/templates/npc/monster/20681-VanorSilenos.xml
index d4ef1ce79..eec134861 100644
--- a/data/templates/npc/monster/20681-VanorSilenos.xml
+++ b/data/templates/npc/monster/20681-VanorSilenos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20681" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20682-VanorSilenosGrunt.xml b/data/templates/npc/monster/20682-VanorSilenosGrunt.xml
index a7d3d0180..92ac122ff 100644
--- a/data/templates/npc/monster/20682-VanorSilenosGrunt.xml
+++ b/data/templates/npc/monster/20682-VanorSilenosGrunt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20682" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20683-VanorSilenosScout.xml b/data/templates/npc/monster/20683-VanorSilenosScout.xml
index abfcdf71c..5a519d831 100644
--- a/data/templates/npc/monster/20683-VanorSilenosScout.xml
+++ b/data/templates/npc/monster/20683-VanorSilenosScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20683" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20684-VanorSilenosWarrior.xml b/data/templates/npc/monster/20684-VanorSilenosWarrior.xml
index 592613b34..161f29c73 100644
--- a/data/templates/npc/monster/20684-VanorSilenosWarrior.xml
+++ b/data/templates/npc/monster/20684-VanorSilenosWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20684" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20685-VanorSilenosShaman.xml b/data/templates/npc/monster/20685-VanorSilenosShaman.xml
index 30b2fbfc0..390d6e518 100644
--- a/data/templates/npc/monster/20685-VanorSilenosShaman.xml
+++ b/data/templates/npc/monster/20685-VanorSilenosShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20685" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20686-VanorSilenosChieftain.xml b/data/templates/npc/monster/20686-VanorSilenosChieftain.xml
index 3f5e0377d..58fc28d50 100644
--- a/data/templates/npc/monster/20686-VanorSilenosChieftain.xml
+++ b/data/templates/npc/monster/20686-VanorSilenosChieftain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20686" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20738-KoboldLooterBepook.xml b/data/templates/npc/monster/20738-KoboldLooterBepook.xml
index 78ee03125..5547a4436 100644
--- a/data/templates/npc/monster/20738-KoboldLooterBepook.xml
+++ b/data/templates/npc/monster/20738-KoboldLooterBepook.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20738" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20739-BepookSPet.xml b/data/templates/npc/monster/20739-BepookSPet.xml
index 83d45274f..eb4854485 100644
--- a/data/templates/npc/monster/20739-BepookSPet.xml
+++ b/data/templates/npc/monster/20739-BepookSPet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20739" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20742-MysticalWeaver.xml b/data/templates/npc/monster/20742-MysticalWeaver.xml
index ab9a7f568..c767153b6 100644
--- a/data/templates/npc/monster/20742-MysticalWeaver.xml
+++ b/data/templates/npc/monster/20742-MysticalWeaver.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20742" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20743-Howler.xml b/data/templates/npc/monster/20743-Howler.xml
index 1f7ecf942..193906fe5 100644
--- a/data/templates/npc/monster/20743-Howler.xml
+++ b/data/templates/npc/monster/20743-Howler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20743" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20744-RedEyeVampireBat.xml b/data/templates/npc/monster/20744-RedEyeVampireBat.xml
index e9977bd2d..8637fa661 100644
--- a/data/templates/npc/monster/20744-RedEyeVampireBat.xml
+++ b/data/templates/npc/monster/20744-RedEyeVampireBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20744" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20745-Gigantiops.xml b/data/templates/npc/monster/20745-Gigantiops.xml
index 073dce0d3..cb5602369 100644
--- a/data/templates/npc/monster/20745-Gigantiops.xml
+++ b/data/templates/npc/monster/20745-Gigantiops.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20745" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20746-YoungGigantiops.xml b/data/templates/npc/monster/20746-YoungGigantiops.xml
index af0406600..b8847c8da 100644
--- a/data/templates/npc/monster/20746-YoungGigantiops.xml
+++ b/data/templates/npc/monster/20746-YoungGigantiops.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20746" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20747-Roxide.xml b/data/templates/npc/monster/20747-Roxide.xml
index be814ac80..bb39e3357 100644
--- a/data/templates/npc/monster/20747-Roxide.xml
+++ b/data/templates/npc/monster/20747-Roxide.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20747" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20748-RoxideCohort.xml b/data/templates/npc/monster/20748-RoxideCohort.xml
index 1f035b8a7..043ff9a29 100644
--- a/data/templates/npc/monster/20748-RoxideCohort.xml
+++ b/data/templates/npc/monster/20748-RoxideCohort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20748" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20749-DeathFire.xml b/data/templates/npc/monster/20749-DeathFire.xml
index 6caefe1cb..cef840039 100644
--- a/data/templates/npc/monster/20749-DeathFire.xml
+++ b/data/templates/npc/monster/20749-DeathFire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20749" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20750-FireArcher.xml b/data/templates/npc/monster/20750-FireArcher.xml
index f784a9930..4264dd275 100644
--- a/data/templates/npc/monster/20750-FireArcher.xml
+++ b/data/templates/npc/monster/20750-FireArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20750" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20751-Snipe.xml b/data/templates/npc/monster/20751-Snipe.xml
index 8a58ff5f7..d43d8ca38 100644
--- a/data/templates/npc/monster/20751-Snipe.xml
+++ b/data/templates/npc/monster/20751-Snipe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20751" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20752-SnipeCohort.xml b/data/templates/npc/monster/20752-SnipeCohort.xml
index ce7ef161a..4951aaa8e 100644
--- a/data/templates/npc/monster/20752-SnipeCohort.xml
+++ b/data/templates/npc/monster/20752-SnipeCohort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20752" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20753-DarkLord.xml b/data/templates/npc/monster/20753-DarkLord.xml
index f2fb7ea4d..b59589249 100644
--- a/data/templates/npc/monster/20753-DarkLord.xml
+++ b/data/templates/npc/monster/20753-DarkLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20753" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20754-DarkKnight.xml b/data/templates/npc/monster/20754-DarkKnight.xml
index fb9d790cc..af543f8c4 100644
--- a/data/templates/npc/monster/20754-DarkKnight.xml
+++ b/data/templates/npc/monster/20754-DarkKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20754" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20755-Talakin.xml b/data/templates/npc/monster/20755-Talakin.xml
index 2717566ea..8a7105571 100644
--- a/data/templates/npc/monster/20755-Talakin.xml
+++ b/data/templates/npc/monster/20755-Talakin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20755" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20756-TalakinArcher.xml b/data/templates/npc/monster/20756-TalakinArcher.xml
index 4f172b275..a53c88c3d 100644
--- a/data/templates/npc/monster/20756-TalakinArcher.xml
+++ b/data/templates/npc/monster/20756-TalakinArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20756" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20757-TalakinRaider.xml b/data/templates/npc/monster/20757-TalakinRaider.xml
index c2ae9c178..f669601ba 100644
--- a/data/templates/npc/monster/20757-TalakinRaider.xml
+++ b/data/templates/npc/monster/20757-TalakinRaider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20757" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20758-DragonBearerChief.xml b/data/templates/npc/monster/20758-DragonBearerChief.xml
index b6ab1ecfb..d45be1dac 100644
--- a/data/templates/npc/monster/20758-DragonBearerChief.xml
+++ b/data/templates/npc/monster/20758-DragonBearerChief.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20758" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20759-DragonBearerWarrior.xml b/data/templates/npc/monster/20759-DragonBearerWarrior.xml
index 64e181b2e..c1814aeac 100644
--- a/data/templates/npc/monster/20759-DragonBearerWarrior.xml
+++ b/data/templates/npc/monster/20759-DragonBearerWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20759" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20760-DragonBearerArcher.xml b/data/templates/npc/monster/20760-DragonBearerArcher.xml
index 2c76e5e3a..7500af0af 100644
--- a/data/templates/npc/monster/20760-DragonBearerArcher.xml
+++ b/data/templates/npc/monster/20760-DragonBearerArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20760" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20761-Pytan.xml b/data/templates/npc/monster/20761-Pytan.xml
index 2aae87d52..0a8832eb9 100644
--- a/data/templates/npc/monster/20761-Pytan.xml
+++ b/data/templates/npc/monster/20761-Pytan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20761" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20762-PytanKnight.xml b/data/templates/npc/monster/20762-PytanKnight.xml
index c0a752520..34cbbcc3d 100644
--- a/data/templates/npc/monster/20762-PytanKnight.xml
+++ b/data/templates/npc/monster/20762-PytanKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20762" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20763-LordOfThePlains.xml b/data/templates/npc/monster/20763-LordOfThePlains.xml
index ba090ee04..62bc6bc83 100644
--- a/data/templates/npc/monster/20763-LordOfThePlains.xml
+++ b/data/templates/npc/monster/20763-LordOfThePlains.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20763" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20764-ShamanOfThePlains.xml b/data/templates/npc/monster/20764-ShamanOfThePlains.xml
index ccb1f299f..60f8baf59 100644
--- a/data/templates/npc/monster/20764-ShamanOfThePlains.xml
+++ b/data/templates/npc/monster/20764-ShamanOfThePlains.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20764" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20765-WarriorOfThePlains.xml b/data/templates/npc/monster/20765-WarriorOfThePlains.xml
index 0b0a51c2f..4cfaa2d2c 100644
--- a/data/templates/npc/monster/20765-WarriorOfThePlains.xml
+++ b/data/templates/npc/monster/20765-WarriorOfThePlains.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20765" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20766-ScoutOfThePlains.xml b/data/templates/npc/monster/20766-ScoutOfThePlains.xml
index e63347aee..6367cc374 100644
--- a/data/templates/npc/monster/20766-ScoutOfThePlains.xml
+++ b/data/templates/npc/monster/20766-ScoutOfThePlains.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20766" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20767-TimakOrcTroopLeader.xml b/data/templates/npc/monster/20767-TimakOrcTroopLeader.xml
index 6cd38ff3e..541bbe493 100644
--- a/data/templates/npc/monster/20767-TimakOrcTroopLeader.xml
+++ b/data/templates/npc/monster/20767-TimakOrcTroopLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20767" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20768-TimakOrcTroopShaman.xml b/data/templates/npc/monster/20768-TimakOrcTroopShaman.xml
index 70d0ef793..6df941f88 100644
--- a/data/templates/npc/monster/20768-TimakOrcTroopShaman.xml
+++ b/data/templates/npc/monster/20768-TimakOrcTroopShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20768" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20769-TimakOrcTroopWarrior.xml b/data/templates/npc/monster/20769-TimakOrcTroopWarrior.xml
index 05a700fa5..1e6295323 100644
--- a/data/templates/npc/monster/20769-TimakOrcTroopWarrior.xml
+++ b/data/templates/npc/monster/20769-TimakOrcTroopWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20769" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20770-TimakOrcTroopArcher.xml b/data/templates/npc/monster/20770-TimakOrcTroopArcher.xml
index 43e7dde59..1adee8b74 100644
--- a/data/templates/npc/monster/20770-TimakOrcTroopArcher.xml
+++ b/data/templates/npc/monster/20770-TimakOrcTroopArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20770" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20771-Barif.xml b/data/templates/npc/monster/20771-Barif.xml
index b28e203a4..e30c98864 100644
--- a/data/templates/npc/monster/20771-Barif.xml
+++ b/data/templates/npc/monster/20771-Barif.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20771" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20772-BarifSPet.xml b/data/templates/npc/monster/20772-BarifSPet.xml
index 4ad6614c4..f9c1fcd2b 100644
--- a/data/templates/npc/monster/20772-BarifSPet.xml
+++ b/data/templates/npc/monster/20772-BarifSPet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20772" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20773-ConjurerBatLord.xml b/data/templates/npc/monster/20773-ConjurerBatLord.xml
index b6d126bfa..ad62f07f2 100644
--- a/data/templates/npc/monster/20773-ConjurerBatLord.xml
+++ b/data/templates/npc/monster/20773-ConjurerBatLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20773" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20774-ConjurerBat.xml b/data/templates/npc/monster/20774-ConjurerBat.xml
index 178e38c6d..bcfd35288 100644
--- a/data/templates/npc/monster/20774-ConjurerBat.xml
+++ b/data/templates/npc/monster/20774-ConjurerBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20774" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20775-BugbearRaider.xml b/data/templates/npc/monster/20775-BugbearRaider.xml
index 0f8045472..fd22fbed1 100644
--- a/data/templates/npc/monster/20775-BugbearRaider.xml
+++ b/data/templates/npc/monster/20775-BugbearRaider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20775" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20776-DarkSuccubus.xml b/data/templates/npc/monster/20776-DarkSuccubus.xml
index 20b41e8ff..00a3e9f2d 100644
--- a/data/templates/npc/monster/20776-DarkSuccubus.xml
+++ b/data/templates/npc/monster/20776-DarkSuccubus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20776" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20777-HunterBear.xml b/data/templates/npc/monster/20777-HunterBear.xml
index f00d336df..dcca3056a 100644
--- a/data/templates/npc/monster/20777-HunterBear.xml
+++ b/data/templates/npc/monster/20777-HunterBear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20777" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20778-RagnaOrcOverlord.xml b/data/templates/npc/monster/20778-RagnaOrcOverlord.xml
index 121aab2d3..1d686d2a6 100644
--- a/data/templates/npc/monster/20778-RagnaOrcOverlord.xml
+++ b/data/templates/npc/monster/20778-RagnaOrcOverlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20778" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20779-RagnaOrcSeer.xml b/data/templates/npc/monster/20779-RagnaOrcSeer.xml
index 9abde9d52..f157471bd 100644
--- a/data/templates/npc/monster/20779-RagnaOrcSeer.xml
+++ b/data/templates/npc/monster/20779-RagnaOrcSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20779" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20780-BloodyAxeElite.xml b/data/templates/npc/monster/20780-BloodyAxeElite.xml
index a2df5ebc5..f49cf5bf2 100644
--- a/data/templates/npc/monster/20780-BloodyAxeElite.xml
+++ b/data/templates/npc/monster/20780-BloodyAxeElite.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20780" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20781-DeluLizardmanShaman.xml b/data/templates/npc/monster/20781-DeluLizardmanShaman.xml
index 00eff0a38..c5c60e0e6 100644
--- a/data/templates/npc/monster/20781-DeluLizardmanShaman.xml
+++ b/data/templates/npc/monster/20781-DeluLizardmanShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20781" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20782-OlMahumNovice.xml b/data/templates/npc/monster/20782-OlMahumNovice.xml
index 376bf487d..7dd16f5d0 100644
--- a/data/templates/npc/monster/20782-OlMahumNovice.xml
+++ b/data/templates/npc/monster/20782-OlMahumNovice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20782" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20783-DreadWolf.xml b/data/templates/npc/monster/20783-DreadWolf.xml
index 8ec411635..f08fcbc2a 100644
--- a/data/templates/npc/monster/20783-DreadWolf.xml
+++ b/data/templates/npc/monster/20783-DreadWolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20783" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20784-TasabaLizardman.xml b/data/templates/npc/monster/20784-TasabaLizardman.xml
index 4b514a31e..71a0c0599 100644
--- a/data/templates/npc/monster/20784-TasabaLizardman.xml
+++ b/data/templates/npc/monster/20784-TasabaLizardman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20784" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20785-TasabaLizardmanShaman.xml b/data/templates/npc/monster/20785-TasabaLizardmanShaman.xml
index bf1b5a7e6..6f109ede0 100644
--- a/data/templates/npc/monster/20785-TasabaLizardmanShaman.xml
+++ b/data/templates/npc/monster/20785-TasabaLizardmanShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20785" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20786-Lienrik.xml b/data/templates/npc/monster/20786-Lienrik.xml
index 3fcb45ec3..693254d0c 100644
--- a/data/templates/npc/monster/20786-Lienrik.xml
+++ b/data/templates/npc/monster/20786-Lienrik.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20786" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20787-LienrikLad.xml b/data/templates/npc/monster/20787-LienrikLad.xml
index 8cf8f4f8f..0606ec1ef 100644
--- a/data/templates/npc/monster/20787-LienrikLad.xml
+++ b/data/templates/npc/monster/20787-LienrikLad.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20787" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20788-Rakul.xml b/data/templates/npc/monster/20788-Rakul.xml
index 7042e87b2..093f65f0e 100644
--- a/data/templates/npc/monster/20788-Rakul.xml
+++ b/data/templates/npc/monster/20788-Rakul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20788" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20789-Crokian.xml b/data/templates/npc/monster/20789-Crokian.xml
index 6132b91ad..b1e30555e 100644
--- a/data/templates/npc/monster/20789-Crokian.xml
+++ b/data/templates/npc/monster/20789-Crokian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20789" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20790-Dailaon.xml b/data/templates/npc/monster/20790-Dailaon.xml
index 8e8ac386c..0e6c983c9 100644
--- a/data/templates/npc/monster/20790-Dailaon.xml
+++ b/data/templates/npc/monster/20790-Dailaon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20790" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20791-CrokianWarrior.xml b/data/templates/npc/monster/20791-CrokianWarrior.xml
index e82a73954..f57600449 100644
--- a/data/templates/npc/monster/20791-CrokianWarrior.xml
+++ b/data/templates/npc/monster/20791-CrokianWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20791" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20792-Farhite.xml b/data/templates/npc/monster/20792-Farhite.xml
index abbd18d3e..9bf80120b 100644
--- a/data/templates/npc/monster/20792-Farhite.xml
+++ b/data/templates/npc/monster/20792-Farhite.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20792" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20793-Nos.xml b/data/templates/npc/monster/20793-Nos.xml
index 75bae8c52..36cd4e3c0 100644
--- a/data/templates/npc/monster/20793-Nos.xml
+++ b/data/templates/npc/monster/20793-Nos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20793" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20794-BladeStakato.xml b/data/templates/npc/monster/20794-BladeStakato.xml
index f6fc5da60..210bd8765 100644
--- a/data/templates/npc/monster/20794-BladeStakato.xml
+++ b/data/templates/npc/monster/20794-BladeStakato.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20794" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20795-BladeStakatoWorker.xml b/data/templates/npc/monster/20795-BladeStakatoWorker.xml
index 6884f262c..3042f4625 100644
--- a/data/templates/npc/monster/20795-BladeStakatoWorker.xml
+++ b/data/templates/npc/monster/20795-BladeStakatoWorker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20795" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20796-BladeStakatoWarrior.xml b/data/templates/npc/monster/20796-BladeStakatoWarrior.xml
index 358e6010e..571cf44c8 100644
--- a/data/templates/npc/monster/20796-BladeStakatoWarrior.xml
+++ b/data/templates/npc/monster/20796-BladeStakatoWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20796" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20797-BladeStakatoDrone.xml b/data/templates/npc/monster/20797-BladeStakatoDrone.xml
index 7c25f59f9..526127fcd 100644
--- a/data/templates/npc/monster/20797-BladeStakatoDrone.xml
+++ b/data/templates/npc/monster/20797-BladeStakatoDrone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20797" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20798-WaterGiant.xml b/data/templates/npc/monster/20798-WaterGiant.xml
index 8a38ddeed..80523c6c2 100644
--- a/data/templates/npc/monster/20798-WaterGiant.xml
+++ b/data/templates/npc/monster/20798-WaterGiant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20798" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20799-QueenUndineLad.xml b/data/templates/npc/monster/20799-QueenUndineLad.xml
index 5b73ae9da..eed692728 100644
--- a/data/templates/npc/monster/20799-QueenUndineLad.xml
+++ b/data/templates/npc/monster/20799-QueenUndineLad.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20799" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20800-EvaSSeeker.xml b/data/templates/npc/monster/20800-EvaSSeeker.xml
index 6ffc626de..4d408ba64 100644
--- a/data/templates/npc/monster/20800-EvaSSeeker.xml
+++ b/data/templates/npc/monster/20800-EvaSSeeker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20800" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20801-TheederPiker.xml b/data/templates/npc/monster/20801-TheederPiker.xml
index e7b400a27..11e8b0acf 100644
--- a/data/templates/npc/monster/20801-TheederPiker.xml
+++ b/data/templates/npc/monster/20801-TheederPiker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20801" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20802-TheederMage.xml b/data/templates/npc/monster/20802-TheederMage.xml
index d0d295160..57e9b8b03 100644
--- a/data/templates/npc/monster/20802-TheederMage.xml
+++ b/data/templates/npc/monster/20802-TheederMage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20802" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20803-DollMaster.xml b/data/templates/npc/monster/20803-DollMaster.xml
index d35945130..4841cab33 100644
--- a/data/templates/npc/monster/20803-DollMaster.xml
+++ b/data/templates/npc/monster/20803-DollMaster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20803" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20804-CrokianLad.xml b/data/templates/npc/monster/20804-CrokianLad.xml
index 40879dcb8..042661c68 100644
--- a/data/templates/npc/monster/20804-CrokianLad.xml
+++ b/data/templates/npc/monster/20804-CrokianLad.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20804" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20805-DailaonLad.xml b/data/templates/npc/monster/20805-DailaonLad.xml
index 6b37cf70a..674bf183c 100644
--- a/data/templates/npc/monster/20805-DailaonLad.xml
+++ b/data/templates/npc/monster/20805-DailaonLad.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20805" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20806-CrokianLadWarrior.xml b/data/templates/npc/monster/20806-CrokianLadWarrior.xml
index 0cb93ae2c..0c4385f78 100644
--- a/data/templates/npc/monster/20806-CrokianLadWarrior.xml
+++ b/data/templates/npc/monster/20806-CrokianLadWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20806" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20807-FarhiteLad.xml b/data/templates/npc/monster/20807-FarhiteLad.xml
index 1841fddfa..a676ace78 100644
--- a/data/templates/npc/monster/20807-FarhiteLad.xml
+++ b/data/templates/npc/monster/20807-FarhiteLad.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20807" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20808-NosLad.xml b/data/templates/npc/monster/20808-NosLad.xml
index 81c3aed97..e88583440 100644
--- a/data/templates/npc/monster/20808-NosLad.xml
+++ b/data/templates/npc/monster/20808-NosLad.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20808" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20809-GhostOfTheTower.xml b/data/templates/npc/monster/20809-GhostOfTheTower.xml
index 6ff7ea6dc..2a8cb0c7f 100644
--- a/data/templates/npc/monster/20809-GhostOfTheTower.xml
+++ b/data/templates/npc/monster/20809-GhostOfTheTower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20809" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20810-SeerOfHallate.xml b/data/templates/npc/monster/20810-SeerOfHallate.xml
index ef47d604f..efe4b91e9 100644
--- a/data/templates/npc/monster/20810-SeerOfHallate.xml
+++ b/data/templates/npc/monster/20810-SeerOfHallate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20810" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20811-GhastlyWarrior.xml b/data/templates/npc/monster/20811-GhastlyWarrior.xml
index 742774ff9..9cfd6126a 100644
--- a/data/templates/npc/monster/20811-GhastlyWarrior.xml
+++ b/data/templates/npc/monster/20811-GhastlyWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20811" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20812-ArcherOfDespair.xml b/data/templates/npc/monster/20812-ArcherOfDespair.xml
index 69b929795..c236632a5 100644
--- a/data/templates/npc/monster/20812-ArcherOfDespair.xml
+++ b/data/templates/npc/monster/20812-ArcherOfDespair.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20812" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20813-Crendion.xml b/data/templates/npc/monster/20813-Crendion.xml
index 94ac85d14..0c7df1f57 100644
--- a/data/templates/npc/monster/20813-Crendion.xml
+++ b/data/templates/npc/monster/20813-Crendion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20813" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20814-BladerOfDespair.xml b/data/templates/npc/monster/20814-BladerOfDespair.xml
index 5bfeb5c71..ab5b80796 100644
--- a/data/templates/npc/monster/20814-BladerOfDespair.xml
+++ b/data/templates/npc/monster/20814-BladerOfDespair.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20814" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20815-HoundDogOfHallate.xml b/data/templates/npc/monster/20815-HoundDogOfHallate.xml
index 9e7a442fc..069186e9a 100644
--- a/data/templates/npc/monster/20815-HoundDogOfHallate.xml
+++ b/data/templates/npc/monster/20815-HoundDogOfHallate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20815" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20816-HallateSRoyalGuard.xml b/data/templates/npc/monster/20816-HallateSRoyalGuard.xml
index a60aae222..258dda285 100644
--- a/data/templates/npc/monster/20816-HallateSRoyalGuard.xml
+++ b/data/templates/npc/monster/20816-HallateSRoyalGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20816" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20817-CorruptSage.xml b/data/templates/npc/monster/20817-CorruptSage.xml
index 91f1d5e61..9b7565f4e 100644
--- a/data/templates/npc/monster/20817-CorruptSage.xml
+++ b/data/templates/npc/monster/20817-CorruptSage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20817" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20818-HallateSWarrior.xml b/data/templates/npc/monster/20818-HallateSWarrior.xml
index 180fe78b0..bea4830f4 100644
--- a/data/templates/npc/monster/20818-HallateSWarrior.xml
+++ b/data/templates/npc/monster/20818-HallateSWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20818" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20819-ArcherOfAbyss.xml b/data/templates/npc/monster/20819-ArcherOfAbyss.xml
index 67060679d..77c6b30bd 100644
--- a/data/templates/npc/monster/20819-ArcherOfAbyss.xml
+++ b/data/templates/npc/monster/20819-ArcherOfAbyss.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20819" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20820-HallateSKnight.xml b/data/templates/npc/monster/20820-HallateSKnight.xml
index 6ab2b72d2..f7f48ba7d 100644
--- a/data/templates/npc/monster/20820-HallateSKnight.xml
+++ b/data/templates/npc/monster/20820-HallateSKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20820" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20821-ErinEdiunce.xml b/data/templates/npc/monster/20821-ErinEdiunce.xml
index 439019fb6..7c4fc95c8 100644
--- a/data/templates/npc/monster/20821-ErinEdiunce.xml
+++ b/data/templates/npc/monster/20821-ErinEdiunce.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20821" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20822-HallateSMaid.xml b/data/templates/npc/monster/20822-HallateSMaid.xml
index d29e35ddc..a4779eee0 100644
--- a/data/templates/npc/monster/20822-HallateSMaid.xml
+++ b/data/templates/npc/monster/20822-HallateSMaid.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20822" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20823-PlatinumTribeSoldier.xml b/data/templates/npc/monster/20823-PlatinumTribeSoldier.xml
index 622f178b6..0bbe0ab73 100644
--- a/data/templates/npc/monster/20823-PlatinumTribeSoldier.xml
+++ b/data/templates/npc/monster/20823-PlatinumTribeSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20823" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20824-HallateSCommander.xml b/data/templates/npc/monster/20824-HallateSCommander.xml
index 8dfadc811..ae46c5f09 100644
--- a/data/templates/npc/monster/20824-HallateSCommander.xml
+++ b/data/templates/npc/monster/20824-HallateSCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20824" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20825-HallateSInspector.xml b/data/templates/npc/monster/20825-HallateSInspector.xml
index 283e9f4da..d15bfd7bb 100644
--- a/data/templates/npc/monster/20825-HallateSInspector.xml
+++ b/data/templates/npc/monster/20825-HallateSInspector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20825" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20826-PlatinumTribeArcher.xml b/data/templates/npc/monster/20826-PlatinumTribeArcher.xml
index 58cba19e4..710d53905 100644
--- a/data/templates/npc/monster/20826-PlatinumTribeArcher.xml
+++ b/data/templates/npc/monster/20826-PlatinumTribeArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20826" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20827-PlatinumTribeWarrior.xml b/data/templates/npc/monster/20827-PlatinumTribeWarrior.xml
index dad236ea1..f3cd95724 100644
--- a/data/templates/npc/monster/20827-PlatinumTribeWarrior.xml
+++ b/data/templates/npc/monster/20827-PlatinumTribeWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20827" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20828-PlatinumTribeShaman.xml b/data/templates/npc/monster/20828-PlatinumTribeShaman.xml
index f324e27c3..a6d5a2994 100644
--- a/data/templates/npc/monster/20828-PlatinumTribeShaman.xml
+++ b/data/templates/npc/monster/20828-PlatinumTribeShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20828" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20829-PlatinumTribeOverlord.xml b/data/templates/npc/monster/20829-PlatinumTribeOverlord.xml
index dc1ce4d41..5342d63e3 100644
--- a/data/templates/npc/monster/20829-PlatinumTribeOverlord.xml
+++ b/data/templates/npc/monster/20829-PlatinumTribeOverlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20829" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20830-GuardianAngel.xml b/data/templates/npc/monster/20830-GuardianAngel.xml
index eed1ef20d..e54cc447d 100644
--- a/data/templates/npc/monster/20830-GuardianAngel.xml
+++ b/data/templates/npc/monster/20830-GuardianAngel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20830" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20831-SealAngel.xml b/data/templates/npc/monster/20831-SealAngel.xml
index 45737e790..fe4f836a6 100644
--- a/data/templates/npc/monster/20831-SealAngel.xml
+++ b/data/templates/npc/monster/20831-SealAngel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20831" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20832-ZakenSPikeman.xml b/data/templates/npc/monster/20832-ZakenSPikeman.xml
index 0c938b751..f71205412 100644
--- a/data/templates/npc/monster/20832-ZakenSPikeman.xml
+++ b/data/templates/npc/monster/20832-ZakenSPikeman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20832" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20833-ZakenSArcher.xml b/data/templates/npc/monster/20833-ZakenSArcher.xml
index 09d6780b7..57e1596f4 100644
--- a/data/templates/npc/monster/20833-ZakenSArcher.xml
+++ b/data/templates/npc/monster/20833-ZakenSArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20833" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20834-Mardian.xml b/data/templates/npc/monster/20834-Mardian.xml
index ba94e3bde..a5bc727f8 100644
--- a/data/templates/npc/monster/20834-Mardian.xml
+++ b/data/templates/npc/monster/20834-Mardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20834" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20835-ZakenSSeer.xml b/data/templates/npc/monster/20835-ZakenSSeer.xml
index d2e5f0ba5..52ac9fc73 100644
--- a/data/templates/npc/monster/20835-ZakenSSeer.xml
+++ b/data/templates/npc/monster/20835-ZakenSSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20835" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20836-PirateZombie.xml b/data/templates/npc/monster/20836-PirateZombie.xml
index 392c29df9..d5546bdfc 100644
--- a/data/templates/npc/monster/20836-PirateZombie.xml
+++ b/data/templates/npc/monster/20836-PirateZombie.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20836" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20837-TaintedOgre.xml b/data/templates/npc/monster/20837-TaintedOgre.xml
index 3b08893c6..46689499f 100644
--- a/data/templates/npc/monster/20837-TaintedOgre.xml
+++ b/data/templates/npc/monster/20837-TaintedOgre.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20837" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20838-BloodyBat.xml b/data/templates/npc/monster/20838-BloodyBat.xml
index a0964a7f7..e1768d9c7 100644
--- a/data/templates/npc/monster/20838-BloodyBat.xml
+++ b/data/templates/npc/monster/20838-BloodyBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20838" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20839-UnpleasantHumming.xml b/data/templates/npc/monster/20839-UnpleasantHumming.xml
index ad0aa1547..94cbc8110 100644
--- a/data/templates/npc/monster/20839-UnpleasantHumming.xml
+++ b/data/templates/npc/monster/20839-UnpleasantHumming.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20839" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20840-DeathFlyer.xml b/data/templates/npc/monster/20840-DeathFlyer.xml
index 7a9d0217e..3c386431e 100644
--- a/data/templates/npc/monster/20840-DeathFlyer.xml
+++ b/data/templates/npc/monster/20840-DeathFlyer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20840" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20841-FiendArcher.xml b/data/templates/npc/monster/20841-FiendArcher.xml
index 1fcdf7749..2dc775c65 100644
--- a/data/templates/npc/monster/20841-FiendArcher.xml
+++ b/data/templates/npc/monster/20841-FiendArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20841" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20842-Musveren.xml b/data/templates/npc/monster/20842-Musveren.xml
index 7e2416d0d..ebd71d8b1 100644
--- a/data/templates/npc/monster/20842-Musveren.xml
+++ b/data/templates/npc/monster/20842-Musveren.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20842" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20843-ZakenSRoyalGuard.xml b/data/templates/npc/monster/20843-ZakenSRoyalGuard.xml
index 0ab8778db..4214bdec8 100644
--- a/data/templates/npc/monster/20843-ZakenSRoyalGuard.xml
+++ b/data/templates/npc/monster/20843-ZakenSRoyalGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20843" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20844-KaimVanul.xml b/data/templates/npc/monster/20844-KaimVanul.xml
index 5e83ca523..7e900e6dc 100644
--- a/data/templates/npc/monster/20844-KaimVanul.xml
+++ b/data/templates/npc/monster/20844-KaimVanul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20844" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20845-PirateSZombieCaptain.xml b/data/templates/npc/monster/20845-PirateSZombieCaptain.xml
index 543699ed5..b6b3360a9 100644
--- a/data/templates/npc/monster/20845-PirateSZombieCaptain.xml
+++ b/data/templates/npc/monster/20845-PirateSZombieCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20845" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20846-DollBlader.xml b/data/templates/npc/monster/20846-DollBlader.xml
index 0bfec2242..21efa8bba 100644
--- a/data/templates/npc/monster/20846-DollBlader.xml
+++ b/data/templates/npc/monster/20846-DollBlader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20846" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20847-ValeMaster.xml b/data/templates/npc/monster/20847-ValeMaster.xml
index e44cf5022..188b9b2bf 100644
--- a/data/templates/npc/monster/20847-ValeMaster.xml
+++ b/data/templates/npc/monster/20847-ValeMaster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20847" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20848-LightBringer.xml b/data/templates/npc/monster/20848-LightBringer.xml
index 9c38faa1e..092d7bf7a 100644
--- a/data/templates/npc/monster/20848-LightBringer.xml
+++ b/data/templates/npc/monster/20848-LightBringer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20848" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20849-LightWorm.xml b/data/templates/npc/monster/20849-LightWorm.xml
index fcc720d1e..143a15d02 100644
--- a/data/templates/npc/monster/20849-LightWorm.xml
+++ b/data/templates/npc/monster/20849-LightWorm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20849" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20850-GoldenStagLord.xml b/data/templates/npc/monster/20850-GoldenStagLord.xml
index 11a24b101..f202772b7 100644
--- a/data/templates/npc/monster/20850-GoldenStagLord.xml
+++ b/data/templates/npc/monster/20850-GoldenStagLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20850" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20851-Theeder.xml b/data/templates/npc/monster/20851-Theeder.xml
index 3ab04a506..c8b1ccb2c 100644
--- a/data/templates/npc/monster/20851-Theeder.xml
+++ b/data/templates/npc/monster/20851-Theeder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20851" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20852-Banshee.xml b/data/templates/npc/monster/20852-Banshee.xml
index 400f7da27..7fbe40547 100644
--- a/data/templates/npc/monster/20852-Banshee.xml
+++ b/data/templates/npc/monster/20852-Banshee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20852" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20853-KelMahum.xml b/data/templates/npc/monster/20853-KelMahum.xml
index 1d74ccfe0..5957d2071 100644
--- a/data/templates/npc/monster/20853-KelMahum.xml
+++ b/data/templates/npc/monster/20853-KelMahum.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20853" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20854-KelMahumWarrior.xml b/data/templates/npc/monster/20854-KelMahumWarrior.xml
index 963f9207e..9a9e7dbb1 100644
--- a/data/templates/npc/monster/20854-KelMahumWarrior.xml
+++ b/data/templates/npc/monster/20854-KelMahumWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20854" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20855-KelMahumArcher.xml b/data/templates/npc/monster/20855-KelMahumArcher.xml
index 8d1d1bd4c..6cc9fe892 100644
--- a/data/templates/npc/monster/20855-KelMahumArcher.xml
+++ b/data/templates/npc/monster/20855-KelMahumArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20855" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20856-KelMahumShaman.xml b/data/templates/npc/monster/20856-KelMahumShaman.xml
index 3877c5765..340612e41 100644
--- a/data/templates/npc/monster/20856-KelMahumShaman.xml
+++ b/data/templates/npc/monster/20856-KelMahumShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20856" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20857-KelMahumChampion.xml b/data/templates/npc/monster/20857-KelMahumChampion.xml
index c7b47a9a5..c1d8d73f6 100644
--- a/data/templates/npc/monster/20857-KelMahumChampion.xml
+++ b/data/templates/npc/monster/20857-KelMahumChampion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20857" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20858-Angel.xml b/data/templates/npc/monster/20858-Angel.xml
index 82883a36a..24a97cc1a 100644
--- a/data/templates/npc/monster/20858-Angel.xml
+++ b/data/templates/npc/monster/20858-Angel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20858" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20859-GuardianAngel.xml b/data/templates/npc/monster/20859-GuardianAngel.xml
index cd1f3874e..dcf19c07e 100644
--- a/data/templates/npc/monster/20859-GuardianAngel.xml
+++ b/data/templates/npc/monster/20859-GuardianAngel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20859" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20860-SealAngel.xml b/data/templates/npc/monster/20860-SealAngel.xml
index 5e8a57ea2..2d1fc428f 100644
--- a/data/templates/npc/monster/20860-SealAngel.xml
+++ b/data/templates/npc/monster/20860-SealAngel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20860" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20861-OelMahumChampion.xml b/data/templates/npc/monster/20861-OelMahumChampion.xml
index edc499b87..8ae77a3b9 100644
--- a/data/templates/npc/monster/20861-OelMahumChampion.xml
+++ b/data/templates/npc/monster/20861-OelMahumChampion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20861" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20862-DeathLord.xml b/data/templates/npc/monster/20862-DeathLord.xml
index e7446934c..5b32d2600 100644
--- a/data/templates/npc/monster/20862-DeathLord.xml
+++ b/data/templates/npc/monster/20862-DeathLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20862" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20919-MailleLizardman.xml b/data/templates/npc/monster/20919-MailleLizardman.xml
index 900598195..3839f2a0b 100644
--- a/data/templates/npc/monster/20919-MailleLizardman.xml
+++ b/data/templates/npc/monster/20919-MailleLizardman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20919" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20920-MailleLizardmanScout.xml b/data/templates/npc/monster/20920-MailleLizardmanScout.xml
index d591edbd8..0482648e8 100644
--- a/data/templates/npc/monster/20920-MailleLizardmanScout.xml
+++ b/data/templates/npc/monster/20920-MailleLizardmanScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20920" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20921-MailleLizardmanGuard.xml b/data/templates/npc/monster/20921-MailleLizardmanGuard.xml
index 83942f5c7..94b83a928 100644
--- a/data/templates/npc/monster/20921-MailleLizardmanGuard.xml
+++ b/data/templates/npc/monster/20921-MailleLizardmanGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20921" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20922-MailleLizardmanWarrior.xml b/data/templates/npc/monster/20922-MailleLizardmanWarrior.xml
index 5caecfb22..6b5012e22 100644
--- a/data/templates/npc/monster/20922-MailleLizardmanWarrior.xml
+++ b/data/templates/npc/monster/20922-MailleLizardmanWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20922" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20923-MailleLizardmanShaman.xml b/data/templates/npc/monster/20923-MailleLizardmanShaman.xml
index 9f1fc8be0..55a020ce3 100644
--- a/data/templates/npc/monster/20923-MailleLizardmanShaman.xml
+++ b/data/templates/npc/monster/20923-MailleLizardmanShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20923" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20924-MailleLizardmanMatriarch.xml b/data/templates/npc/monster/20924-MailleLizardmanMatriarch.xml
index 7071f9040..1c886c737 100644
--- a/data/templates/npc/monster/20924-MailleLizardmanMatriarch.xml
+++ b/data/templates/npc/monster/20924-MailleLizardmanMatriarch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20924" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20925-GiantAraneid.xml b/data/templates/npc/monster/20925-GiantAraneid.xml
index 28464b782..0328c1a4f 100644
--- a/data/templates/npc/monster/20925-GiantAraneid.xml
+++ b/data/templates/npc/monster/20925-GiantAraneid.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20925" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20926-PoisonAraneid.xml b/data/templates/npc/monster/20926-PoisonAraneid.xml
index 9482d335d..707ac18f2 100644
--- a/data/templates/npc/monster/20926-PoisonAraneid.xml
+++ b/data/templates/npc/monster/20926-PoisonAraneid.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20926" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20927-KingOfTheAraneid.xml b/data/templates/npc/monster/20927-KingOfTheAraneid.xml
index 402b7ccfb..fa180b47c 100644
--- a/data/templates/npc/monster/20927-KingOfTheAraneid.xml
+++ b/data/templates/npc/monster/20927-KingOfTheAraneid.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20927" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20928-HatuWeirdBee.xml b/data/templates/npc/monster/20928-HatuWeirdBee.xml
index 6fb531fac..4a47cc489 100644
--- a/data/templates/npc/monster/20928-HatuWeirdBee.xml
+++ b/data/templates/npc/monster/20928-HatuWeirdBee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20928" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20929-HatuDireWolf.xml b/data/templates/npc/monster/20929-HatuDireWolf.xml
index 83b7860e7..28ff44812 100644
--- a/data/templates/npc/monster/20929-HatuDireWolf.xml
+++ b/data/templates/npc/monster/20929-HatuDireWolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20929" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20930-HatuBrownBear.xml b/data/templates/npc/monster/20930-HatuBrownBear.xml
index 21d26f145..d106bbcb7 100644
--- a/data/templates/npc/monster/20930-HatuBrownBear.xml
+++ b/data/templates/npc/monster/20930-HatuBrownBear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20930" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20931-HatuOnyxBeast.xml b/data/templates/npc/monster/20931-HatuOnyxBeast.xml
index 0b3de4f77..c732f450e 100644
--- a/data/templates/npc/monster/20931-HatuOnyxBeast.xml
+++ b/data/templates/npc/monster/20931-HatuOnyxBeast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20931" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20932-HatuCrimsonBear.xml b/data/templates/npc/monster/20932-HatuCrimsonBear.xml
index 245eebb95..cea380a36 100644
--- a/data/templates/npc/monster/20932-HatuCrimsonBear.xml
+++ b/data/templates/npc/monster/20932-HatuCrimsonBear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20932" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20933-HatuWindsus.xml b/data/templates/npc/monster/20933-HatuWindsus.xml
index e0ecb7828..95da603ff 100644
--- a/data/templates/npc/monster/20933-HatuWindsus.xml
+++ b/data/templates/npc/monster/20933-HatuWindsus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20933" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20934-WaspWorker.xml b/data/templates/npc/monster/20934-WaspWorker.xml
index 66c8fa8ae..42938b07c 100644
--- a/data/templates/npc/monster/20934-WaspWorker.xml
+++ b/data/templates/npc/monster/20934-WaspWorker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20934" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20935-WaspLeader.xml b/data/templates/npc/monster/20935-WaspLeader.xml
index 0a23a66c8..1548c48aa 100644
--- a/data/templates/npc/monster/20935-WaspLeader.xml
+++ b/data/templates/npc/monster/20935-WaspLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20935" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20936-TanorSilenos.xml b/data/templates/npc/monster/20936-TanorSilenos.xml
index 583ce1216..4c48a27f4 100644
--- a/data/templates/npc/monster/20936-TanorSilenos.xml
+++ b/data/templates/npc/monster/20936-TanorSilenos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20936" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20937-TanorSilenosGrunt.xml b/data/templates/npc/monster/20937-TanorSilenosGrunt.xml
index 935a05cc1..d2528e6b4 100644
--- a/data/templates/npc/monster/20937-TanorSilenosGrunt.xml
+++ b/data/templates/npc/monster/20937-TanorSilenosGrunt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20937" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20938-TanorSilenosScout.xml b/data/templates/npc/monster/20938-TanorSilenosScout.xml
index 1c5424379..975356e9e 100644
--- a/data/templates/npc/monster/20938-TanorSilenosScout.xml
+++ b/data/templates/npc/monster/20938-TanorSilenosScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20938" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20939-TanorSilenosWarrior.xml b/data/templates/npc/monster/20939-TanorSilenosWarrior.xml
index 6ce9240c2..34241e514 100644
--- a/data/templates/npc/monster/20939-TanorSilenosWarrior.xml
+++ b/data/templates/npc/monster/20939-TanorSilenosWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20939" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20940-TanorSilenosShaman.xml b/data/templates/npc/monster/20940-TanorSilenosShaman.xml
index bd20cf628..678ac6bc7 100644
--- a/data/templates/npc/monster/20940-TanorSilenosShaman.xml
+++ b/data/templates/npc/monster/20940-TanorSilenosShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20940" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20941-TanorSilenosChieftain.xml b/data/templates/npc/monster/20941-TanorSilenosChieftain.xml
index ef61aba6a..01400136c 100644
--- a/data/templates/npc/monster/20941-TanorSilenosChieftain.xml
+++ b/data/templates/npc/monster/20941-TanorSilenosChieftain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20941" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20942-NightmareGuide.xml b/data/templates/npc/monster/20942-NightmareGuide.xml
index 27dd0083a..1487a003d 100644
--- a/data/templates/npc/monster/20942-NightmareGuide.xml
+++ b/data/templates/npc/monster/20942-NightmareGuide.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20942" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20943-NightmareKeeper.xml b/data/templates/npc/monster/20943-NightmareKeeper.xml
index 19f64e67d..fb0150727 100644
--- a/data/templates/npc/monster/20943-NightmareKeeper.xml
+++ b/data/templates/npc/monster/20943-NightmareKeeper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20943" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20944-NightmareLord.xml b/data/templates/npc/monster/20944-NightmareLord.xml
index 7366de679..0eaf8afb5 100644
--- a/data/templates/npc/monster/20944-NightmareLord.xml
+++ b/data/templates/npc/monster/20944-NightmareLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20944" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20945-Cadeine.xml b/data/templates/npc/monster/20945-Cadeine.xml
index 502bf58b4..47bc0d663 100644
--- a/data/templates/npc/monster/20945-Cadeine.xml
+++ b/data/templates/npc/monster/20945-Cadeine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20945" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20946-Sanhidro.xml b/data/templates/npc/monster/20946-Sanhidro.xml
index cb09f0e2f..03ac8f9a4 100644
--- a/data/templates/npc/monster/20946-Sanhidro.xml
+++ b/data/templates/npc/monster/20946-Sanhidro.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20946" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20947-Connabi.xml b/data/templates/npc/monster/20947-Connabi.xml
index d04cda469..e6682926f 100644
--- a/data/templates/npc/monster/20947-Connabi.xml
+++ b/data/templates/npc/monster/20947-Connabi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20947" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20948-Bartal.xml b/data/templates/npc/monster/20948-Bartal.xml
index fe60bf5fe..f525695c0 100644
--- a/data/templates/npc/monster/20948-Bartal.xml
+++ b/data/templates/npc/monster/20948-Bartal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20948" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20949-Luminun.xml b/data/templates/npc/monster/20949-Luminun.xml
index 7c815b15c..b893e5721 100644
--- a/data/templates/npc/monster/20949-Luminun.xml
+++ b/data/templates/npc/monster/20949-Luminun.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20949" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20950-Innersen.xml b/data/templates/npc/monster/20950-Innersen.xml
index 51a4a828d..51143b7f5 100644
--- a/data/templates/npc/monster/20950-Innersen.xml
+++ b/data/templates/npc/monster/20950-Innersen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20950" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20951-PobbySMaid.xml b/data/templates/npc/monster/20951-PobbySMaid.xml
index 6eb608c1f..880cb0e0b 100644
--- a/data/templates/npc/monster/20951-PobbySMaid.xml
+++ b/data/templates/npc/monster/20951-PobbySMaid.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20951" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20952-PobbyEscort.xml b/data/templates/npc/monster/20952-PobbyEscort.xml
index 0eacaa20c..59cac2d34 100644
--- a/data/templates/npc/monster/20952-PobbyEscort.xml
+++ b/data/templates/npc/monster/20952-PobbyEscort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20952" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20953-Pobby.xml b/data/templates/npc/monster/20953-Pobby.xml
index 5cf3d4216..620af6c7f 100644
--- a/data/templates/npc/monster/20953-Pobby.xml
+++ b/data/templates/npc/monster/20953-Pobby.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20953" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20954-HungeredCorpse.xml b/data/templates/npc/monster/20954-HungeredCorpse.xml
index 017d6d3ee..e02a1292c 100644
--- a/data/templates/npc/monster/20954-HungeredCorpse.xml
+++ b/data/templates/npc/monster/20954-HungeredCorpse.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20954" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20955-GhostlyWarrior.xml b/data/templates/npc/monster/20955-GhostlyWarrior.xml
index c52a556c3..fd979684f 100644
--- a/data/templates/npc/monster/20955-GhostlyWarrior.xml
+++ b/data/templates/npc/monster/20955-GhostlyWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20955" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20956-PastKnight.xml b/data/templates/npc/monster/20956-PastKnight.xml
index 5e77d66ef..ec353f9f8 100644
--- a/data/templates/npc/monster/20956-PastKnight.xml
+++ b/data/templates/npc/monster/20956-PastKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20956" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20957-NihilInvader.xml b/data/templates/npc/monster/20957-NihilInvader.xml
index 74ee583c0..f19ef041b 100644
--- a/data/templates/npc/monster/20957-NihilInvader.xml
+++ b/data/templates/npc/monster/20957-NihilInvader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20957" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20958-DeathAgent.xml b/data/templates/npc/monster/20958-DeathAgent.xml
index 3e9c462b4..773c6ec10 100644
--- a/data/templates/npc/monster/20958-DeathAgent.xml
+++ b/data/templates/npc/monster/20958-DeathAgent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20958" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20959-DarkGuard.xml b/data/templates/npc/monster/20959-DarkGuard.xml
index bf8051568..3e7d136ff 100644
--- a/data/templates/npc/monster/20959-DarkGuard.xml
+++ b/data/templates/npc/monster/20959-DarkGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20959" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20960-BloodyGhost.xml b/data/templates/npc/monster/20960-BloodyGhost.xml
index 2b0b0eecb..f3ffe1fc7 100644
--- a/data/templates/npc/monster/20960-BloodyGhost.xml
+++ b/data/templates/npc/monster/20960-BloodyGhost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20960" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20961-BloodyKnight.xml b/data/templates/npc/monster/20961-BloodyKnight.xml
index fa5521f8c..3bb48d856 100644
--- a/data/templates/npc/monster/20961-BloodyKnight.xml
+++ b/data/templates/npc/monster/20961-BloodyKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20961" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20962-BloodyPriest.xml b/data/templates/npc/monster/20962-BloodyPriest.xml
index 66102b52f..7320314b8 100644
--- a/data/templates/npc/monster/20962-BloodyPriest.xml
+++ b/data/templates/npc/monster/20962-BloodyPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20962" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20963-BloodyLord.xml b/data/templates/npc/monster/20963-BloodyLord.xml
index d943ffb12..ca146f8ba 100644
--- a/data/templates/npc/monster/20963-BloodyLord.xml
+++ b/data/templates/npc/monster/20963-BloodyLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20963" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20964-HugeFootmark.xml b/data/templates/npc/monster/20964-HugeFootmark.xml
index b85742e78..0e0561449 100644
--- a/data/templates/npc/monster/20964-HugeFootmark.xml
+++ b/data/templates/npc/monster/20964-HugeFootmark.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20964" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20965-ChimeraPiece.xml b/data/templates/npc/monster/20965-ChimeraPiece.xml
index b7858466b..624216d70 100644
--- a/data/templates/npc/monster/20965-ChimeraPiece.xml
+++ b/data/templates/npc/monster/20965-ChimeraPiece.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20965" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20966-ChangedCreation.xml b/data/templates/npc/monster/20966-ChangedCreation.xml
index 3ed829458..314f0f811 100644
--- a/data/templates/npc/monster/20966-ChangedCreation.xml
+++ b/data/templates/npc/monster/20966-ChangedCreation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20966" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20967-PastCreature.xml b/data/templates/npc/monster/20967-PastCreature.xml
index c66f3b1f4..2e344eb72 100644
--- a/data/templates/npc/monster/20967-PastCreature.xml
+++ b/data/templates/npc/monster/20967-PastCreature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20967" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20968-NonexistentMan.xml b/data/templates/npc/monster/20968-NonexistentMan.xml
index 011fd4855..b58a81456 100644
--- a/data/templates/npc/monster/20968-NonexistentMan.xml
+++ b/data/templates/npc/monster/20968-NonexistentMan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20968" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20969-GiantSShadow.xml b/data/templates/npc/monster/20969-GiantSShadow.xml
index 3533ebcf2..fd1824f2f 100644
--- a/data/templates/npc/monster/20969-GiantSShadow.xml
+++ b/data/templates/npc/monster/20969-GiantSShadow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20969" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20970-SoldierOfAncientTimes.xml b/data/templates/npc/monster/20970-SoldierOfAncientTimes.xml
index 4f89c46e8..76b6352dc 100644
--- a/data/templates/npc/monster/20970-SoldierOfAncientTimes.xml
+++ b/data/templates/npc/monster/20970-SoldierOfAncientTimes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20970" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20971-WarriorOfAncientTimes.xml b/data/templates/npc/monster/20971-WarriorOfAncientTimes.xml
index e9fd1293d..7394e5b7e 100644
--- a/data/templates/npc/monster/20971-WarriorOfAncientTimes.xml
+++ b/data/templates/npc/monster/20971-WarriorOfAncientTimes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20971" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20972-ShamanOfAncientTimes.xml b/data/templates/npc/monster/20972-ShamanOfAncientTimes.xml
index b7c3f2dee..c5c9fc9ad 100644
--- a/data/templates/npc/monster/20972-ShamanOfAncientTimes.xml
+++ b/data/templates/npc/monster/20972-ShamanOfAncientTimes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20972" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20973-ForgottenAncientPeople.xml b/data/templates/npc/monster/20973-ForgottenAncientPeople.xml
index 0718277a9..37238897e 100644
--- a/data/templates/npc/monster/20973-ForgottenAncientPeople.xml
+++ b/data/templates/npc/monster/20973-ForgottenAncientPeople.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20973" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20974-SpitefulSoulLeader.xml b/data/templates/npc/monster/20974-SpitefulSoulLeader.xml
index cedff810a..1a032252e 100644
--- a/data/templates/npc/monster/20974-SpitefulSoulLeader.xml
+++ b/data/templates/npc/monster/20974-SpitefulSoulLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20974" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20975-SpitefulSoulWizard.xml b/data/templates/npc/monster/20975-SpitefulSoulWizard.xml
index 8fd778a71..97fb96af3 100644
--- a/data/templates/npc/monster/20975-SpitefulSoulWizard.xml
+++ b/data/templates/npc/monster/20975-SpitefulSoulWizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20975" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20976-SpitefulSoulFighter.xml b/data/templates/npc/monster/20976-SpitefulSoulFighter.xml
index ce50ddc75..a3959a221 100644
--- a/data/templates/npc/monster/20976-SpitefulSoulFighter.xml
+++ b/data/templates/npc/monster/20976-SpitefulSoulFighter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20976" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20977-ElmoradanSLady.xml b/data/templates/npc/monster/20977-ElmoradanSLady.xml
index 622373456..a3817bbb6 100644
--- a/data/templates/npc/monster/20977-ElmoradanSLady.xml
+++ b/data/templates/npc/monster/20977-ElmoradanSLady.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20977" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20978-ElmoradanSArcherEscort.xml b/data/templates/npc/monster/20978-ElmoradanSArcherEscort.xml
index 83b16e04a..c29178881 100644
--- a/data/templates/npc/monster/20978-ElmoradanSArcherEscort.xml
+++ b/data/templates/npc/monster/20978-ElmoradanSArcherEscort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20978" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20979-ElmoradanSMaid.xml b/data/templates/npc/monster/20979-ElmoradanSMaid.xml
index ebee04d57..5f54bd011 100644
--- a/data/templates/npc/monster/20979-ElmoradanSMaid.xml
+++ b/data/templates/npc/monster/20979-ElmoradanSMaid.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20979" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20980-HallateSFollowerMul.xml b/data/templates/npc/monster/20980-HallateSFollowerMul.xml
index 8e36535d9..dea5968b8 100644
--- a/data/templates/npc/monster/20980-HallateSFollowerMul.xml
+++ b/data/templates/npc/monster/20980-HallateSFollowerMul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20980" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20981-MulSWizard.xml b/data/templates/npc/monster/20981-MulSWizard.xml
index 7c7fb5580..ab643f81c 100644
--- a/data/templates/npc/monster/20981-MulSWizard.xml
+++ b/data/templates/npc/monster/20981-MulSWizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20981" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20982-MulSKnight.xml b/data/templates/npc/monster/20982-MulSKnight.xml
index f1d26fded..c261d7276 100644
--- a/data/templates/npc/monster/20982-MulSKnight.xml
+++ b/data/templates/npc/monster/20982-MulSKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20982" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20983-Binder.xml b/data/templates/npc/monster/20983-Binder.xml
index 9f86301c9..37556b6c3 100644
--- a/data/templates/npc/monster/20983-Binder.xml
+++ b/data/templates/npc/monster/20983-Binder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20983" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20984-BoundWarrior.xml b/data/templates/npc/monster/20984-BoundWarrior.xml
index b5b86b5b6..1049525d5 100644
--- a/data/templates/npc/monster/20984-BoundWarrior.xml
+++ b/data/templates/npc/monster/20984-BoundWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20984" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20985-BoundArcher.xml b/data/templates/npc/monster/20985-BoundArcher.xml
index fa593e414..76550be6e 100644
--- a/data/templates/npc/monster/20985-BoundArcher.xml
+++ b/data/templates/npc/monster/20985-BoundArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20985" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20986-Sairon.xml b/data/templates/npc/monster/20986-Sairon.xml
index d083a701f..e9d3e1c19 100644
--- a/data/templates/npc/monster/20986-Sairon.xml
+++ b/data/templates/npc/monster/20986-Sairon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20986" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20987-SaironSDoll.xml b/data/templates/npc/monster/20987-SaironSDoll.xml
index d9151ca0c..dcfd5a5b1 100644
--- a/data/templates/npc/monster/20987-SaironSDoll.xml
+++ b/data/templates/npc/monster/20987-SaironSDoll.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20987" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20988-SaironSPuppet.xml b/data/templates/npc/monster/20988-SaironSPuppet.xml
index 71587175c..ac2310648 100644
--- a/data/templates/npc/monster/20988-SaironSPuppet.xml
+++ b/data/templates/npc/monster/20988-SaironSPuppet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20988" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20989-Lageos.xml b/data/templates/npc/monster/20989-Lageos.xml
index 1b2c725b2..4e1204261 100644
--- a/data/templates/npc/monster/20989-Lageos.xml
+++ b/data/templates/npc/monster/20989-Lageos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20989" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20990-Pageos.xml b/data/templates/npc/monster/20990-Pageos.xml
index be38589ba..ac01820d4 100644
--- a/data/templates/npc/monster/20990-Pageos.xml
+++ b/data/templates/npc/monster/20990-Pageos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20990" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20991-SwampTribe.xml b/data/templates/npc/monster/20991-SwampTribe.xml
index 9eeedeab4..add87bfba 100644
--- a/data/templates/npc/monster/20991-SwampTribe.xml
+++ b/data/templates/npc/monster/20991-SwampTribe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20991" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20992-SwampAlligator.xml b/data/templates/npc/monster/20992-SwampAlligator.xml
index 0fbca6970..e4a174065 100644
--- a/data/templates/npc/monster/20992-SwampAlligator.xml
+++ b/data/templates/npc/monster/20992-SwampAlligator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20992" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20993-SwampWarrior.xml b/data/templates/npc/monster/20993-SwampWarrior.xml
index 4e1056053..ec09450fe 100644
--- a/data/templates/npc/monster/20993-SwampWarrior.xml
+++ b/data/templates/npc/monster/20993-SwampWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20993" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20994-GardenGuardLeader.xml b/data/templates/npc/monster/20994-GardenGuardLeader.xml
index 65a3cf7da..60c1a3f66 100644
--- a/data/templates/npc/monster/20994-GardenGuardLeader.xml
+++ b/data/templates/npc/monster/20994-GardenGuardLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20994" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20995-GardenGuard.xml b/data/templates/npc/monster/20995-GardenGuard.xml
index de47f6faf..f42d8ee81 100644
--- a/data/templates/npc/monster/20995-GardenGuard.xml
+++ b/data/templates/npc/monster/20995-GardenGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20995" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20996-SpitefulGhostOfRuins.xml b/data/templates/npc/monster/20996-SpitefulGhostOfRuins.xml
index 9a1adfc7c..d33ece80e 100644
--- a/data/templates/npc/monster/20996-SpitefulGhostOfRuins.xml
+++ b/data/templates/npc/monster/20996-SpitefulGhostOfRuins.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20996" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20997-SoldierOfGrief.xml b/data/templates/npc/monster/20997-SoldierOfGrief.xml
index 56ba9d6ea..231eaa5f2 100644
--- a/data/templates/npc/monster/20997-SoldierOfGrief.xml
+++ b/data/templates/npc/monster/20997-SoldierOfGrief.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20997" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20998-CruelPunisher.xml b/data/templates/npc/monster/20998-CruelPunisher.xml
index acaf373b4..8179d26cb 100644
--- a/data/templates/npc/monster/20998-CruelPunisher.xml
+++ b/data/templates/npc/monster/20998-CruelPunisher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20998" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/20999-RovingSoul.xml b/data/templates/npc/monster/20999-RovingSoul.xml
index a1e70ca59..f8833a2cc 100644
--- a/data/templates/npc/monster/20999-RovingSoul.xml
+++ b/data/templates/npc/monster/20999-RovingSoul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="20999" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21000-SoulOfRuins.xml b/data/templates/npc/monster/21000-SoulOfRuins.xml
index 9eb3f3714..2373f84cd 100644
--- a/data/templates/npc/monster/21000-SoulOfRuins.xml
+++ b/data/templates/npc/monster/21000-SoulOfRuins.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21000" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21001-WretchedArcher.xml b/data/templates/npc/monster/21001-WretchedArcher.xml
index 570a5af49..cb8fb2b77 100644
--- a/data/templates/npc/monster/21001-WretchedArcher.xml
+++ b/data/templates/npc/monster/21001-WretchedArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21001" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21002-DoomScout.xml b/data/templates/npc/monster/21002-DoomScout.xml
index 6f75729df..2a7c08c26 100644
--- a/data/templates/npc/monster/21002-DoomScout.xml
+++ b/data/templates/npc/monster/21002-DoomScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21002" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21003-GraveLich.xml b/data/templates/npc/monster/21003-GraveLich.xml
index 6eabd6261..cf955418b 100644
--- a/data/templates/npc/monster/21003-GraveLich.xml
+++ b/data/templates/npc/monster/21003-GraveLich.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21003" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21004-DismalPole.xml b/data/templates/npc/monster/21004-DismalPole.xml
index 39151c6aa..1ac260e1a 100644
--- a/data/templates/npc/monster/21004-DismalPole.xml
+++ b/data/templates/npc/monster/21004-DismalPole.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21004" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21005-GravePredator.xml b/data/templates/npc/monster/21005-GravePredator.xml
index 2730df544..4770add73 100644
--- a/data/templates/npc/monster/21005-GravePredator.xml
+++ b/data/templates/npc/monster/21005-GravePredator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21005" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21006-DoomServant.xml b/data/templates/npc/monster/21006-DoomServant.xml
index 20d2a5194..1d081aa13 100644
--- a/data/templates/npc/monster/21006-DoomServant.xml
+++ b/data/templates/npc/monster/21006-DoomServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21006" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21007-DoomGuard.xml b/data/templates/npc/monster/21007-DoomGuard.xml
index b5f53509f..0d208ddd2 100644
--- a/data/templates/npc/monster/21007-DoomGuard.xml
+++ b/data/templates/npc/monster/21007-DoomGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21007" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21008-DoomArcher.xml b/data/templates/npc/monster/21008-DoomArcher.xml
index a9d16db37..c8dc0d479 100644
--- a/data/templates/npc/monster/21008-DoomArcher.xml
+++ b/data/templates/npc/monster/21008-DoomArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21008" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21009-DoomTrooper.xml b/data/templates/npc/monster/21009-DoomTrooper.xml
index 3fe336575..24f3b6e5e 100644
--- a/data/templates/npc/monster/21009-DoomTrooper.xml
+++ b/data/templates/npc/monster/21009-DoomTrooper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21009" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21010-DoomWarrior.xml b/data/templates/npc/monster/21010-DoomWarrior.xml
index fa756bd3a..04b3cd435 100644
--- a/data/templates/npc/monster/21010-DoomWarrior.xml
+++ b/data/templates/npc/monster/21010-DoomWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21010" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21011-OlMahumVanGrunt.xml b/data/templates/npc/monster/21011-OlMahumVanGrunt.xml
index ab4e57f16..7e378e093 100644
--- a/data/templates/npc/monster/21011-OlMahumVanGrunt.xml
+++ b/data/templates/npc/monster/21011-OlMahumVanGrunt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21011" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21012-MagicalEye.xml b/data/templates/npc/monster/21012-MagicalEye.xml
index 4068ba667..96e6f7001 100644
--- a/data/templates/npc/monster/21012-MagicalEye.xml
+++ b/data/templates/npc/monster/21012-MagicalEye.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21012" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21013-OlMahumVanArcher.xml b/data/templates/npc/monster/21013-OlMahumVanArcher.xml
index ba1190ab5..60f592555 100644
--- a/data/templates/npc/monster/21013-OlMahumVanArcher.xml
+++ b/data/templates/npc/monster/21013-OlMahumVanArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21013" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21014-LesserWarlikeTyrant.xml b/data/templates/npc/monster/21014-LesserWarlikeTyrant.xml
index d7b54c61b..2a24f29aa 100644
--- a/data/templates/npc/monster/21014-LesserWarlikeTyrant.xml
+++ b/data/templates/npc/monster/21014-LesserWarlikeTyrant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21014" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21015-OlMahumVanLeader.xml b/data/templates/npc/monster/21015-OlMahumVanLeader.xml
index 51fbc1a8b..d3ed31711 100644
--- a/data/templates/npc/monster/21015-OlMahumVanLeader.xml
+++ b/data/templates/npc/monster/21015-OlMahumVanLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21015" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21016-WarlikeTyrant.xml b/data/templates/npc/monster/21016-WarlikeTyrant.xml
index d105e0c14..62a670361 100644
--- a/data/templates/npc/monster/21016-WarlikeTyrant.xml
+++ b/data/templates/npc/monster/21016-WarlikeTyrant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21016" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21017-FallenOrc.xml b/data/templates/npc/monster/21017-FallenOrc.xml
index fb8ac56ce..bf03d9a3d 100644
--- a/data/templates/npc/monster/21017-FallenOrc.xml
+++ b/data/templates/npc/monster/21017-FallenOrc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21017" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21018-AncientGargoyle.xml b/data/templates/npc/monster/21018-AncientGargoyle.xml
index fcad4d24d..95767f55e 100644
--- a/data/templates/npc/monster/21018-AncientGargoyle.xml
+++ b/data/templates/npc/monster/21018-AncientGargoyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21018" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21019-FallenOrcArcher.xml b/data/templates/npc/monster/21019-FallenOrcArcher.xml
index a8c050e1f..f9e17a462 100644
--- a/data/templates/npc/monster/21019-FallenOrcArcher.xml
+++ b/data/templates/npc/monster/21019-FallenOrcArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21019" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21020-FallenOrcShaman.xml b/data/templates/npc/monster/21020-FallenOrcShaman.xml
index 62091a30e..9c0c838d1 100644
--- a/data/templates/npc/monster/21020-FallenOrcShaman.xml
+++ b/data/templates/npc/monster/21020-FallenOrcShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21020" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21021-SharpTalonTiger.xml b/data/templates/npc/monster/21021-SharpTalonTiger.xml
index 643481173..7fcc3f300 100644
--- a/data/templates/npc/monster/21021-SharpTalonTiger.xml
+++ b/data/templates/npc/monster/21021-SharpTalonTiger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21021" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21022-FallenOrcCaptain.xml b/data/templates/npc/monster/21022-FallenOrcCaptain.xml
index 417c52332..a7337277b 100644
--- a/data/templates/npc/monster/21022-FallenOrcCaptain.xml
+++ b/data/templates/npc/monster/21022-FallenOrcCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21022" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21023-SobbingWind.xml b/data/templates/npc/monster/21023-SobbingWind.xml
index 41449ef0e..fd0e378f4 100644
--- a/data/templates/npc/monster/21023-SobbingWind.xml
+++ b/data/templates/npc/monster/21023-SobbingWind.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21023" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21024-BabblingWind.xml b/data/templates/npc/monster/21024-BabblingWind.xml
index a25d58b9f..4bcfa3700 100644
--- a/data/templates/npc/monster/21024-BabblingWind.xml
+++ b/data/templates/npc/monster/21024-BabblingWind.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21024" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21025-GigglingWind.xml b/data/templates/npc/monster/21025-GigglingWind.xml
index 0021392d8..b8f69208a 100644
--- a/data/templates/npc/monster/21025-GigglingWind.xml
+++ b/data/templates/npc/monster/21025-GigglingWind.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21025" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21026-SingingWind.xml b/data/templates/npc/monster/21026-SingingWind.xml
index e3f547ad1..ae4e6a24b 100644
--- a/data/templates/npc/monster/21026-SingingWind.xml
+++ b/data/templates/npc/monster/21026-SingingWind.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21026" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21034-Ogre.xml b/data/templates/npc/monster/21034-Ogre.xml
index e78976ca1..40d96b096 100644
--- a/data/templates/npc/monster/21034-Ogre.xml
+++ b/data/templates/npc/monster/21034-Ogre.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21034" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21035-Catherok.xml b/data/templates/npc/monster/21035-Catherok.xml
index 0076ecd8a..f9c667d82 100644
--- a/data/templates/npc/monster/21035-Catherok.xml
+++ b/data/templates/npc/monster/21035-Catherok.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21035" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21036-Shindebarn.xml b/data/templates/npc/monster/21036-Shindebarn.xml
index 4088af46e..93abf8b1e 100644
--- a/data/templates/npc/monster/21036-Shindebarn.xml
+++ b/data/templates/npc/monster/21036-Shindebarn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21036" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21037-Ossiud.xml b/data/templates/npc/monster/21037-Ossiud.xml
index ee48932e1..8124484d1 100644
--- a/data/templates/npc/monster/21037-Ossiud.xml
+++ b/data/templates/npc/monster/21037-Ossiud.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21037" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21038-Liangma.xml b/data/templates/npc/monster/21038-Liangma.xml
index cfcb62607..9bce2c595 100644
--- a/data/templates/npc/monster/21038-Liangma.xml
+++ b/data/templates/npc/monster/21038-Liangma.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21038" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21039-SnipeCohort.xml b/data/templates/npc/monster/21039-SnipeCohort.xml
index 65c8949d4..d2378ca51 100644
--- a/data/templates/npc/monster/21039-SnipeCohort.xml
+++ b/data/templates/npc/monster/21039-SnipeCohort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21039" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21040-SoldierOfDarkness.xml b/data/templates/npc/monster/21040-SoldierOfDarkness.xml
index 2d76acf4b..2fa3c9cdb 100644
--- a/data/templates/npc/monster/21040-SoldierOfDarkness.xml
+++ b/data/templates/npc/monster/21040-SoldierOfDarkness.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21040" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21058-BeastLord.xml b/data/templates/npc/monster/21058-BeastLord.xml
index 0106fce37..a19ec60f3 100644
--- a/data/templates/npc/monster/21058-BeastLord.xml
+++ b/data/templates/npc/monster/21058-BeastLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21058" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21059-BeastGuardian.xml b/data/templates/npc/monster/21059-BeastGuardian.xml
index 98d3e96a5..65f1ab845 100644
--- a/data/templates/npc/monster/21059-BeastGuardian.xml
+++ b/data/templates/npc/monster/21059-BeastGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21059" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21060-BeastSeer.xml b/data/templates/npc/monster/21060-BeastSeer.xml
index 4a4b0d3dc..4a8d69896 100644
--- a/data/templates/npc/monster/21060-BeastSeer.xml
+++ b/data/templates/npc/monster/21060-BeastSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21060" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21061-HallateSGuardian.xml b/data/templates/npc/monster/21061-HallateSGuardian.xml
index ed20a0f47..19fa543ae 100644
--- a/data/templates/npc/monster/21061-HallateSGuardian.xml
+++ b/data/templates/npc/monster/21061-HallateSGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21061" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21062-MessengerAngel.xml b/data/templates/npc/monster/21062-MessengerAngel.xml
index b5ea2895f..6bfb7eb65 100644
--- a/data/templates/npc/monster/21062-MessengerAngel.xml
+++ b/data/templates/npc/monster/21062-MessengerAngel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21062" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21063-MessengerAngel.xml b/data/templates/npc/monster/21063-MessengerAngel.xml
index cc895d6db..cae53126f 100644
--- a/data/templates/npc/monster/21063-MessengerAngel.xml
+++ b/data/templates/npc/monster/21063-MessengerAngel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21063" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21064-PlatinumGuardianArcher.xml b/data/templates/npc/monster/21064-PlatinumGuardianArcher.xml
index 55ec4c48b..5e8bf1594 100644
--- a/data/templates/npc/monster/21064-PlatinumGuardianArcher.xml
+++ b/data/templates/npc/monster/21064-PlatinumGuardianArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21064" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21065-PlatinumGuardianWarrior.xml b/data/templates/npc/monster/21065-PlatinumGuardianWarrior.xml
index 88405f376..a03471876 100644
--- a/data/templates/npc/monster/21065-PlatinumGuardianWarrior.xml
+++ b/data/templates/npc/monster/21065-PlatinumGuardianWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21065" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21066-PlatinumGuardianShaman.xml b/data/templates/npc/monster/21066-PlatinumGuardianShaman.xml
index cba996fa8..4830fd47f 100644
--- a/data/templates/npc/monster/21066-PlatinumGuardianShaman.xml
+++ b/data/templates/npc/monster/21066-PlatinumGuardianShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21066" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21067-GuardianArchangel.xml b/data/templates/npc/monster/21067-GuardianArchangel.xml
index bd7404ced..0bf5b03ab 100644
--- a/data/templates/npc/monster/21067-GuardianArchangel.xml
+++ b/data/templates/npc/monster/21067-GuardianArchangel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21067" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21068-GuardianArchangel.xml b/data/templates/npc/monster/21068-GuardianArchangel.xml
index 8c577b224..c5cfaa7d0 100644
--- a/data/templates/npc/monster/21068-GuardianArchangel.xml
+++ b/data/templates/npc/monster/21068-GuardianArchangel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21068" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21069-PlatinumGuardianPrefect.xml b/data/templates/npc/monster/21069-PlatinumGuardianPrefect.xml
index 6c1114f08..7bdd84094 100644
--- a/data/templates/npc/monster/21069-PlatinumGuardianPrefect.xml
+++ b/data/templates/npc/monster/21069-PlatinumGuardianPrefect.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21069" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21070-SealArchangel.xml b/data/templates/npc/monster/21070-SealArchangel.xml
index 1155265a9..21f076a50 100644
--- a/data/templates/npc/monster/21070-SealArchangel.xml
+++ b/data/templates/npc/monster/21070-SealArchangel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21070" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21071-SealArchangel.xml b/data/templates/npc/monster/21071-SealArchangel.xml
index 54dcf78c5..72ec4d9d9 100644
--- a/data/templates/npc/monster/21071-SealArchangel.xml
+++ b/data/templates/npc/monster/21071-SealArchangel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21071" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21072-PlatinumGuardianChief.xml b/data/templates/npc/monster/21072-PlatinumGuardianChief.xml
index 0ddc25d9e..7caeb8dfa 100644
--- a/data/templates/npc/monster/21072-PlatinumGuardianChief.xml
+++ b/data/templates/npc/monster/21072-PlatinumGuardianChief.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21072" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21073-GuardianWarriorOfElmoreden.xml b/data/templates/npc/monster/21073-GuardianWarriorOfElmoreden.xml
index 373293676..3fba61fa4 100644
--- a/data/templates/npc/monster/21073-GuardianWarriorOfElmoreden.xml
+++ b/data/templates/npc/monster/21073-GuardianWarriorOfElmoreden.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21073" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21074-BoundShaman.xml b/data/templates/npc/monster/21074-BoundShaman.xml
index 23198af62..d4374fe64 100644
--- a/data/templates/npc/monster/21074-BoundShaman.xml
+++ b/data/templates/npc/monster/21074-BoundShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21074" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21075-SlaughterBathin.xml b/data/templates/npc/monster/21075-SlaughterBathin.xml
index 61c6d118c..9d7ab96b5 100644
--- a/data/templates/npc/monster/21075-SlaughterBathin.xml
+++ b/data/templates/npc/monster/21075-SlaughterBathin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21075" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21076-BathinSKnight.xml b/data/templates/npc/monster/21076-BathinSKnight.xml
index 5f80423ae..ea1381e31 100644
--- a/data/templates/npc/monster/21076-BathinSKnight.xml
+++ b/data/templates/npc/monster/21076-BathinSKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21076" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21077-BathinSWizard.xml b/data/templates/npc/monster/21077-BathinSWizard.xml
index d2f3f376a..9124a1264 100644
--- a/data/templates/npc/monster/21077-BathinSWizard.xml
+++ b/data/templates/npc/monster/21077-BathinSWizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21077" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21078-MagusValac.xml b/data/templates/npc/monster/21078-MagusValac.xml
index 0cbad420b..c7e5b8cc4 100644
--- a/data/templates/npc/monster/21078-MagusValac.xml
+++ b/data/templates/npc/monster/21078-MagusValac.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21078" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21079-ValacSCreature.xml b/data/templates/npc/monster/21079-ValacSCreature.xml
index 7016e5084..09df60ada 100644
--- a/data/templates/npc/monster/21079-ValacSCreature.xml
+++ b/data/templates/npc/monster/21079-ValacSCreature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21079" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21080-ValacSGuardianSpirit.xml b/data/templates/npc/monster/21080-ValacSGuardianSpirit.xml
index 9ae7c81f6..99e091e18 100644
--- a/data/templates/npc/monster/21080-ValacSGuardianSpirit.xml
+++ b/data/templates/npc/monster/21080-ValacSGuardianSpirit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21080" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21081-PowerAngelAmon.xml b/data/templates/npc/monster/21081-PowerAngelAmon.xml
index 41742bd0d..833b26521 100644
--- a/data/templates/npc/monster/21081-PowerAngelAmon.xml
+++ b/data/templates/npc/monster/21081-PowerAngelAmon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21081" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21082-AmonSCaptainOfTheGuards.xml b/data/templates/npc/monster/21082-AmonSCaptainOfTheGuards.xml
index 823f5a922..72ceedf9d 100644
--- a/data/templates/npc/monster/21082-AmonSCaptainOfTheGuards.xml
+++ b/data/templates/npc/monster/21082-AmonSCaptainOfTheGuards.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21082" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21083-AmonSSpirits.xml b/data/templates/npc/monster/21083-AmonSSpirits.xml
index c577d4e50..a879034d7 100644
--- a/data/templates/npc/monster/21083-AmonSSpirits.xml
+++ b/data/templates/npc/monster/21083-AmonSSpirits.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21083" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21084-BloodyLady.xml b/data/templates/npc/monster/21084-BloodyLady.xml
index 3452af81f..595e88f75 100644
--- a/data/templates/npc/monster/21084-BloodyLady.xml
+++ b/data/templates/npc/monster/21084-BloodyLady.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21084" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21085-BloodySniper.xml b/data/templates/npc/monster/21085-BloodySniper.xml
index b1f5aeca0..d5c1c30b0 100644
--- a/data/templates/npc/monster/21085-BloodySniper.xml
+++ b/data/templates/npc/monster/21085-BloodySniper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21085" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21086-BloodyLiviona.xml b/data/templates/npc/monster/21086-BloodyLiviona.xml
index 38bf0174f..b2508fd0a 100644
--- a/data/templates/npc/monster/21086-BloodyLiviona.xml
+++ b/data/templates/npc/monster/21086-BloodyLiviona.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21086" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21087-BloodyKnight.xml b/data/templates/npc/monster/21087-BloodyKnight.xml
index c3f46c7ec..8f3b6c957 100644
--- a/data/templates/npc/monster/21087-BloodyKnight.xml
+++ b/data/templates/npc/monster/21087-BloodyKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21087" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21088-BloodyBanshee.xml b/data/templates/npc/monster/21088-BloodyBanshee.xml
index c0178e662..c477c8d5f 100644
--- a/data/templates/npc/monster/21088-BloodyBanshee.xml
+++ b/data/templates/npc/monster/21088-BloodyBanshee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21088" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21089-BloodyLord.xml b/data/templates/npc/monster/21089-BloodyLord.xml
index b320c0c50..cc23a0546 100644
--- a/data/templates/npc/monster/21089-BloodyLord.xml
+++ b/data/templates/npc/monster/21089-BloodyLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21089" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21090-BloodyGuardian.xml b/data/templates/npc/monster/21090-BloodyGuardian.xml
index 0c3724490..a1f42599b 100644
--- a/data/templates/npc/monster/21090-BloodyGuardian.xml
+++ b/data/templates/npc/monster/21090-BloodyGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21090" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21091-BloodyKeeper.xml b/data/templates/npc/monster/21091-BloodyKeeper.xml
index acfa696a3..25c75ab77 100644
--- a/data/templates/npc/monster/21091-BloodyKeeper.xml
+++ b/data/templates/npc/monster/21091-BloodyKeeper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21091" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21092-BloodyMystic.xml b/data/templates/npc/monster/21092-BloodyMystic.xml
index ef512b400..64a3982c6 100644
--- a/data/templates/npc/monster/21092-BloodyMystic.xml
+++ b/data/templates/npc/monster/21092-BloodyMystic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21092" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21093-RatmanSubChieftain.xml b/data/templates/npc/monster/21093-RatmanSubChieftain.xml
index b38759585..9acdb60d1 100644
--- a/data/templates/npc/monster/21093-RatmanSubChieftain.xml
+++ b/data/templates/npc/monster/21093-RatmanSubChieftain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21093" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21094-RatmanChieftain.xml b/data/templates/npc/monster/21094-RatmanChieftain.xml
index d0390a69f..f7109a59e 100644
--- a/data/templates/npc/monster/21094-RatmanChieftain.xml
+++ b/data/templates/npc/monster/21094-RatmanChieftain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21094" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21095-GiantPoisonBee.xml b/data/templates/npc/monster/21095-GiantPoisonBee.xml
index 600af464f..4f2b4de28 100644
--- a/data/templates/npc/monster/21095-GiantPoisonBee.xml
+++ b/data/templates/npc/monster/21095-GiantPoisonBee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21095" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21096-CloudyBeast.xml b/data/templates/npc/monster/21096-CloudyBeast.xml
index cf43e3c72..c4ce4585b 100644
--- a/data/templates/npc/monster/21096-CloudyBeast.xml
+++ b/data/templates/npc/monster/21096-CloudyBeast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21096" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21097-YoungAraneid.xml b/data/templates/npc/monster/21097-YoungAraneid.xml
index 0f6492948..e264dc6f2 100644
--- a/data/templates/npc/monster/21097-YoungAraneid.xml
+++ b/data/templates/npc/monster/21097-YoungAraneid.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21097" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21098-PlainGrizzly.xml b/data/templates/npc/monster/21098-PlainGrizzly.xml
index 0ff8799a8..5bbd65b7e 100644
--- a/data/templates/npc/monster/21098-PlainGrizzly.xml
+++ b/data/templates/npc/monster/21098-PlainGrizzly.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21098" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21099-CloudyBeastTuren.xml b/data/templates/npc/monster/21099-CloudyBeastTuren.xml
index 3590dc506..cac024499 100644
--- a/data/templates/npc/monster/21099-CloudyBeastTuren.xml
+++ b/data/templates/npc/monster/21099-CloudyBeastTuren.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21099" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21100-LangkLizardmanSentinel.xml b/data/templates/npc/monster/21100-LangkLizardmanSentinel.xml
index dc3a2fa91..2d137c18e 100644
--- a/data/templates/npc/monster/21100-LangkLizardmanSentinel.xml
+++ b/data/templates/npc/monster/21100-LangkLizardmanSentinel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21100" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21101-LangkLizardmanShaman.xml b/data/templates/npc/monster/21101-LangkLizardmanShaman.xml
index 8f9aad671..85b0d8b64 100644
--- a/data/templates/npc/monster/21101-LangkLizardmanShaman.xml
+++ b/data/templates/npc/monster/21101-LangkLizardmanShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21101" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21102-WatchmanOfThePlains.xml b/data/templates/npc/monster/21102-WatchmanOfThePlains.xml
index 4c47ca1e1..a1b550ba0 100644
--- a/data/templates/npc/monster/21102-WatchmanOfThePlains.xml
+++ b/data/templates/npc/monster/21102-WatchmanOfThePlains.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21102" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21103-RoughlyHewnRockGolem.xml b/data/templates/npc/monster/21103-RoughlyHewnRockGolem.xml
index e3b653eda..4e4fde32e 100644
--- a/data/templates/npc/monster/21103-RoughlyHewnRockGolem.xml
+++ b/data/templates/npc/monster/21103-RoughlyHewnRockGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21103" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21104-DeluLizardmanSupplier.xml b/data/templates/npc/monster/21104-DeluLizardmanSupplier.xml
index cf2b81c02..602117bef 100644
--- a/data/templates/npc/monster/21104-DeluLizardmanSupplier.xml
+++ b/data/templates/npc/monster/21104-DeluLizardmanSupplier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21104" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21105-DeluLizardmanSpecialAgent.xml b/data/templates/npc/monster/21105-DeluLizardmanSpecialAgent.xml
index 556338408..865002069 100644
--- a/data/templates/npc/monster/21105-DeluLizardmanSpecialAgent.xml
+++ b/data/templates/npc/monster/21105-DeluLizardmanSpecialAgent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21105" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21106-CursedSeer.xml b/data/templates/npc/monster/21106-CursedSeer.xml
index f0d9e6c8a..0279ee3eb 100644
--- a/data/templates/npc/monster/21106-CursedSeer.xml
+++ b/data/templates/npc/monster/21106-CursedSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21106" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21107-DeluLizardmanCommander.xml b/data/templates/npc/monster/21107-DeluLizardmanCommander.xml
index b0f819f71..99b7a51e7 100644
--- a/data/templates/npc/monster/21107-DeluLizardmanCommander.xml
+++ b/data/templates/npc/monster/21107-DeluLizardmanCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21107" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21108-GlowWisp.xml b/data/templates/npc/monster/21108-GlowWisp.xml
index ed8136fcf..86e043441 100644
--- a/data/templates/npc/monster/21108-GlowWisp.xml
+++ b/data/templates/npc/monster/21108-GlowWisp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21108" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21109-HamesOrcScout.xml b/data/templates/npc/monster/21109-HamesOrcScout.xml
index 22f592744..4b1b8c08f 100644
--- a/data/templates/npc/monster/21109-HamesOrcScout.xml
+++ b/data/templates/npc/monster/21109-HamesOrcScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21109" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21110-MarshPredator.xml b/data/templates/npc/monster/21110-MarshPredator.xml
index 59af1d026..4ffa447dd 100644
--- a/data/templates/npc/monster/21110-MarshPredator.xml
+++ b/data/templates/npc/monster/21110-MarshPredator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21110" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21111-LavaWyrm.xml b/data/templates/npc/monster/21111-LavaWyrm.xml
index 071932f27..4f97d0f69 100644
--- a/data/templates/npc/monster/21111-LavaWyrm.xml
+++ b/data/templates/npc/monster/21111-LavaWyrm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21111" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21112-HamesOrcFootman.xml b/data/templates/npc/monster/21112-HamesOrcFootman.xml
index 43978b449..006b90f93 100644
--- a/data/templates/npc/monster/21112-HamesOrcFootman.xml
+++ b/data/templates/npc/monster/21112-HamesOrcFootman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21112" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21113-HamesOrcSniper.xml b/data/templates/npc/monster/21113-HamesOrcSniper.xml
index edb38f82f..eb300ecb6 100644
--- a/data/templates/npc/monster/21113-HamesOrcSniper.xml
+++ b/data/templates/npc/monster/21113-HamesOrcSniper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21113" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21114-CursedGuardian.xml b/data/templates/npc/monster/21114-CursedGuardian.xml
index e17a5e8bb..1b2cb6cde 100644
--- a/data/templates/npc/monster/21114-CursedGuardian.xml
+++ b/data/templates/npc/monster/21114-CursedGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21114" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21115-HamesOrcShaman.xml b/data/templates/npc/monster/21115-HamesOrcShaman.xml
index c3b72c075..1fd8fc70f 100644
--- a/data/templates/npc/monster/21115-HamesOrcShaman.xml
+++ b/data/templates/npc/monster/21115-HamesOrcShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21115" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21116-HamesOrcOverlord.xml b/data/templates/npc/monster/21116-HamesOrcOverlord.xml
index 4d80d3d3e..892a538fd 100644
--- a/data/templates/npc/monster/21116-HamesOrcOverlord.xml
+++ b/data/templates/npc/monster/21116-HamesOrcOverlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21116" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21117-KashaImp.xml b/data/templates/npc/monster/21117-KashaImp.xml
index 2aaa0be41..27badb690 100644
--- a/data/templates/npc/monster/21117-KashaImp.xml
+++ b/data/templates/npc/monster/21117-KashaImp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21117" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21118-BaarDreVanul.xml b/data/templates/npc/monster/21118-BaarDreVanul.xml
index 676e2cfd0..578c97770 100644
--- a/data/templates/npc/monster/21118-BaarDreVanul.xml
+++ b/data/templates/npc/monster/21118-BaarDreVanul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21118" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21119-Hobgoblin.xml b/data/templates/npc/monster/21119-Hobgoblin.xml
index 10da463a3..afb10afb9 100644
--- a/data/templates/npc/monster/21119-Hobgoblin.xml
+++ b/data/templates/npc/monster/21119-Hobgoblin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21119" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21120-KashaImpTuren.xml b/data/templates/npc/monster/21120-KashaImpTuren.xml
index bf7dfbc83..6ea5aad05 100644
--- a/data/templates/npc/monster/21120-KashaImpTuren.xml
+++ b/data/templates/npc/monster/21120-KashaImpTuren.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21120" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21121-KashaDireWolf.xml b/data/templates/npc/monster/21121-KashaDireWolf.xml
index d4146cf6b..94cfd4138 100644
--- a/data/templates/npc/monster/21121-KashaDireWolf.xml
+++ b/data/templates/npc/monster/21121-KashaDireWolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21121" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21122-KashaBugbear.xml b/data/templates/npc/monster/21122-KashaBugbear.xml
index 8f40d3bdc..50fe090de 100644
--- a/data/templates/npc/monster/21122-KashaBugbear.xml
+++ b/data/templates/npc/monster/21122-KashaBugbear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21122" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21123-BaarDreVanulDestroyer.xml b/data/templates/npc/monster/21123-BaarDreVanulDestroyer.xml
index 1be1eb317..74ad4d2a5 100644
--- a/data/templates/npc/monster/21123-BaarDreVanulDestroyer.xml
+++ b/data/templates/npc/monster/21123-BaarDreVanulDestroyer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21123" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21124-RedEyeBarbedBat.xml b/data/templates/npc/monster/21124-RedEyeBarbedBat.xml
index e76b02ae7..057c0a0eb 100644
--- a/data/templates/npc/monster/21124-RedEyeBarbedBat.xml
+++ b/data/templates/npc/monster/21124-RedEyeBarbedBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21124" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21125-NorthernTrimden.xml b/data/templates/npc/monster/21125-NorthernTrimden.xml
index f5c447fa0..ff61a56ab 100644
--- a/data/templates/npc/monster/21125-NorthernTrimden.xml
+++ b/data/templates/npc/monster/21125-NorthernTrimden.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21125" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21126-KeropeWerewolf.xml b/data/templates/npc/monster/21126-KeropeWerewolf.xml
index be292b16d..a962a9bcd 100644
--- a/data/templates/npc/monster/21126-KeropeWerewolf.xml
+++ b/data/templates/npc/monster/21126-KeropeWerewolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21126" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21127-NorthernGoblin.xml b/data/templates/npc/monster/21127-NorthernGoblin.xml
index ac86cbbae..c6058165b 100644
--- a/data/templates/npc/monster/21127-NorthernGoblin.xml
+++ b/data/templates/npc/monster/21127-NorthernGoblin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21127" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21128-SpineGolem.xml b/data/templates/npc/monster/21128-SpineGolem.xml
index 372e1e3f0..580a9d8c0 100644
--- a/data/templates/npc/monster/21128-SpineGolem.xml
+++ b/data/templates/npc/monster/21128-SpineGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21128" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21129-KeropeWerewolfChief.xml b/data/templates/npc/monster/21129-KeropeWerewolfChief.xml
index 3174a31b9..f368ca37b 100644
--- a/data/templates/npc/monster/21129-KeropeWerewolfChief.xml
+++ b/data/templates/npc/monster/21129-KeropeWerewolfChief.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21129" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21130-NorthernGoblinLeader.xml b/data/templates/npc/monster/21130-NorthernGoblinLeader.xml
index 11bc17589..299059a00 100644
--- a/data/templates/npc/monster/21130-NorthernGoblinLeader.xml
+++ b/data/templates/npc/monster/21130-NorthernGoblinLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21130" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21131-EnchantedSpineGolem.xml b/data/templates/npc/monster/21131-EnchantedSpineGolem.xml
index 4a15a4194..a77f6f51f 100644
--- a/data/templates/npc/monster/21131-EnchantedSpineGolem.xml
+++ b/data/templates/npc/monster/21131-EnchantedSpineGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21131" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21132-UndergroundKobold.xml b/data/templates/npc/monster/21132-UndergroundKobold.xml
index fbebb30e9..255310701 100644
--- a/data/templates/npc/monster/21132-UndergroundKobold.xml
+++ b/data/templates/npc/monster/21132-UndergroundKobold.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21132" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21133-DeadPitSkeletonArcher.xml b/data/templates/npc/monster/21133-DeadPitSkeletonArcher.xml
index 7cad9ff36..7cfabf931 100644
--- a/data/templates/npc/monster/21133-DeadPitSkeletonArcher.xml
+++ b/data/templates/npc/monster/21133-DeadPitSkeletonArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21133" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21134-DeadPitSpartoi.xml b/data/templates/npc/monster/21134-DeadPitSpartoi.xml
index 520509534..a76b2ebbf 100644
--- a/data/templates/npc/monster/21134-DeadPitSpartoi.xml
+++ b/data/templates/npc/monster/21134-DeadPitSpartoi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21134" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21135-UndergroundKoboldWarrior.xml b/data/templates/npc/monster/21135-UndergroundKoboldWarrior.xml
index 911cb4092..ae22545a2 100644
--- a/data/templates/npc/monster/21135-UndergroundKoboldWarrior.xml
+++ b/data/templates/npc/monster/21135-UndergroundKoboldWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21135" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21136-DeadPitHorror.xml b/data/templates/npc/monster/21136-DeadPitHorror.xml
index 7d7fb097b..2e6a63235 100644
--- a/data/templates/npc/monster/21136-DeadPitHorror.xml
+++ b/data/templates/npc/monster/21136-DeadPitHorror.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21136" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21137-IronOreGolem.xml b/data/templates/npc/monster/21137-IronOreGolem.xml
index 2eeb5fda0..9094184fb 100644
--- a/data/templates/npc/monster/21137-IronOreGolem.xml
+++ b/data/templates/npc/monster/21137-IronOreGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21137" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21138-GreedyGeist.xml b/data/templates/npc/monster/21138-GreedyGeist.xml
index 24d21376e..a8deaab07 100644
--- a/data/templates/npc/monster/21138-GreedyGeist.xml
+++ b/data/templates/npc/monster/21138-GreedyGeist.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21138" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21139-CatacombBarbedBat.xml b/data/templates/npc/monster/21139-CatacombBarbedBat.xml
index 2c18142c2..d1261488a 100644
--- a/data/templates/npc/monster/21139-CatacombBarbedBat.xml
+++ b/data/templates/npc/monster/21139-CatacombBarbedBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21139" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21140-CatacombWisp.xml b/data/templates/npc/monster/21140-CatacombWisp.xml
index 4407f378e..bdd9afb42 100644
--- a/data/templates/npc/monster/21140-CatacombWisp.xml
+++ b/data/templates/npc/monster/21140-CatacombWisp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21140" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21141-CatacombSerpent.xml b/data/templates/npc/monster/21141-CatacombSerpent.xml
index efe861447..a36ced928 100644
--- a/data/templates/npc/monster/21141-CatacombSerpent.xml
+++ b/data/templates/npc/monster/21141-CatacombSerpent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21141" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21142-GraveKeeperSpartoi.xml b/data/templates/npc/monster/21142-GraveKeeperSpartoi.xml
index b8e366471..6b9c4b228 100644
--- a/data/templates/npc/monster/21142-GraveKeeperSpartoi.xml
+++ b/data/templates/npc/monster/21142-GraveKeeperSpartoi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21142" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21143-CatacombScavengerBat.xml b/data/templates/npc/monster/21143-CatacombScavengerBat.xml
index cd155240f..d7e6cd068 100644
--- a/data/templates/npc/monster/21143-CatacombScavengerBat.xml
+++ b/data/templates/npc/monster/21143-CatacombScavengerBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21143" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21144-CatacombShadow.xml b/data/templates/npc/monster/21144-CatacombShadow.xml
index 642fcb5c3..36b698488 100644
--- a/data/templates/npc/monster/21144-CatacombShadow.xml
+++ b/data/templates/npc/monster/21144-CatacombShadow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21144" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21145-CatacombStakatoSoldier.xml b/data/templates/npc/monster/21145-CatacombStakatoSoldier.xml
index 7018d3a82..eeda3b2e1 100644
--- a/data/templates/npc/monster/21145-CatacombStakatoSoldier.xml
+++ b/data/templates/npc/monster/21145-CatacombStakatoSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21145" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21146-GraveKeeperDarkHorror.xml b/data/templates/npc/monster/21146-GraveKeeperDarkHorror.xml
index f7866d54b..09d088e0a 100644
--- a/data/templates/npc/monster/21146-GraveKeeperDarkHorror.xml
+++ b/data/templates/npc/monster/21146-GraveKeeperDarkHorror.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21146" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21147-CatacombGargoyle.xml b/data/templates/npc/monster/21147-CatacombGargoyle.xml
index a312d3bac..77265edd5 100644
--- a/data/templates/npc/monster/21147-CatacombGargoyle.xml
+++ b/data/templates/npc/monster/21147-CatacombGargoyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21147" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21148-CatacombLiviona.xml b/data/templates/npc/monster/21148-CatacombLiviona.xml
index 76a377149..ee26b3538 100644
--- a/data/templates/npc/monster/21148-CatacombLiviona.xml
+++ b/data/templates/npc/monster/21148-CatacombLiviona.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21148" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21149-DecayedAncientPikeman.xml b/data/templates/npc/monster/21149-DecayedAncientPikeman.xml
index 455539f5c..f181ebcab 100644
--- a/data/templates/npc/monster/21149-DecayedAncientPikeman.xml
+++ b/data/templates/npc/monster/21149-DecayedAncientPikeman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21149" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21150-DecayedAncientSoldier.xml b/data/templates/npc/monster/21150-DecayedAncientSoldier.xml
index d12a363ae..a93053b7e 100644
--- a/data/templates/npc/monster/21150-DecayedAncientSoldier.xml
+++ b/data/templates/npc/monster/21150-DecayedAncientSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21150" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21151-DecayedAncientKnight.xml b/data/templates/npc/monster/21151-DecayedAncientKnight.xml
index 2c30621b1..77585a59f 100644
--- a/data/templates/npc/monster/21151-DecayedAncientKnight.xml
+++ b/data/templates/npc/monster/21151-DecayedAncientKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21151" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21152-PurgatoryWisp.xml b/data/templates/npc/monster/21152-PurgatoryWisp.xml
index 86512e563..162c2692f 100644
--- a/data/templates/npc/monster/21152-PurgatoryWisp.xml
+++ b/data/templates/npc/monster/21152-PurgatoryWisp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21152" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21153-PurgatorySerpent.xml b/data/templates/npc/monster/21153-PurgatorySerpent.xml
index 80322599d..a08ce6a0e 100644
--- a/data/templates/npc/monster/21153-PurgatorySerpent.xml
+++ b/data/templates/npc/monster/21153-PurgatorySerpent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21153" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21154-HellKeeperMedusa.xml b/data/templates/npc/monster/21154-HellKeeperMedusa.xml
index 8d1874d9d..95335a997 100644
--- a/data/templates/npc/monster/21154-HellKeeperMedusa.xml
+++ b/data/templates/npc/monster/21154-HellKeeperMedusa.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21154" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21155-PurgatoryConjurer.xml b/data/templates/npc/monster/21155-PurgatoryConjurer.xml
index d8da30eea..277ec0d46 100644
--- a/data/templates/npc/monster/21155-PurgatoryConjurer.xml
+++ b/data/templates/npc/monster/21155-PurgatoryConjurer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21155" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21156-PurgatoryShadow.xml b/data/templates/npc/monster/21156-PurgatoryShadow.xml
index a6d425dda..f19c1e183 100644
--- a/data/templates/npc/monster/21156-PurgatoryShadow.xml
+++ b/data/templates/npc/monster/21156-PurgatoryShadow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21156" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21157-PurgatoryTarantula.xml b/data/templates/npc/monster/21157-PurgatoryTarantula.xml
index 9f0b66928..19c3a144e 100644
--- a/data/templates/npc/monster/21157-PurgatoryTarantula.xml
+++ b/data/templates/npc/monster/21157-PurgatoryTarantula.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21157" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21158-HellKeeperCrimsonDoll.xml b/data/templates/npc/monster/21158-HellKeeperCrimsonDoll.xml
index b0d3d4015..0a6472226 100644
--- a/data/templates/npc/monster/21158-HellKeeperCrimsonDoll.xml
+++ b/data/templates/npc/monster/21158-HellKeeperCrimsonDoll.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21158" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21159-PurgatoryGargoyle.xml b/data/templates/npc/monster/21159-PurgatoryGargoyle.xml
index 1a890048c..780269b05 100644
--- a/data/templates/npc/monster/21159-PurgatoryGargoyle.xml
+++ b/data/templates/npc/monster/21159-PurgatoryGargoyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21159" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21160-PurgatoryLiviona.xml b/data/templates/npc/monster/21160-PurgatoryLiviona.xml
index ff56d4950..9ec04c9fd 100644
--- a/data/templates/npc/monster/21160-PurgatoryLiviona.xml
+++ b/data/templates/npc/monster/21160-PurgatoryLiviona.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21160" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21161-LesserAncientSoldier.xml b/data/templates/npc/monster/21161-LesserAncientSoldier.xml
index a8498d7c3..668c35d12 100644
--- a/data/templates/npc/monster/21161-LesserAncientSoldier.xml
+++ b/data/templates/npc/monster/21161-LesserAncientSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21161" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21162-LesserAncientScout.xml b/data/templates/npc/monster/21162-LesserAncientScout.xml
index 9b104f37e..556ce359d 100644
--- a/data/templates/npc/monster/21162-LesserAncientScout.xml
+++ b/data/templates/npc/monster/21162-LesserAncientScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21162" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21163-LesserAncientShaman.xml b/data/templates/npc/monster/21163-LesserAncientShaman.xml
index 6463f841c..d85e8a155 100644
--- a/data/templates/npc/monster/21163-LesserAncientShaman.xml
+++ b/data/templates/npc/monster/21163-LesserAncientShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21163" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21164-GuardianSpiritOfAncientHolyGround.xml b/data/templates/npc/monster/21164-GuardianSpiritOfAncientHolyGround.xml
index 15c699b88..3ecc48109 100644
--- a/data/templates/npc/monster/21164-GuardianSpiritOfAncientHolyGround.xml
+++ b/data/templates/npc/monster/21164-GuardianSpiritOfAncientHolyGround.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21164" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21165-LesserAncientWarrior.xml b/data/templates/npc/monster/21165-LesserAncientWarrior.xml
index fa567f13a..48e970bdd 100644
--- a/data/templates/npc/monster/21165-LesserAncientWarrior.xml
+++ b/data/templates/npc/monster/21165-LesserAncientWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21165" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21166-LithScout.xml b/data/templates/npc/monster/21166-LithScout.xml
index 149a2cf17..e5e0bdf87 100644
--- a/data/templates/npc/monster/21166-LithScout.xml
+++ b/data/templates/npc/monster/21166-LithScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21166" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21167-LithWitch.xml b/data/templates/npc/monster/21167-LithWitch.xml
index 51105c29e..fe636f498 100644
--- a/data/templates/npc/monster/21167-LithWitch.xml
+++ b/data/templates/npc/monster/21167-LithWitch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21167" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21168-LithWarrior.xml b/data/templates/npc/monster/21168-LithWarrior.xml
index 30e0dec0f..a789890b4 100644
--- a/data/templates/npc/monster/21168-LithWarrior.xml
+++ b/data/templates/npc/monster/21168-LithWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21168" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21169-LithGuard.xml b/data/templates/npc/monster/21169-LithGuard.xml
index 017cadae5..8a96c69c9 100644
--- a/data/templates/npc/monster/21169-LithGuard.xml
+++ b/data/templates/npc/monster/21169-LithGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21169" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21170-LithMedium.xml b/data/templates/npc/monster/21170-LithMedium.xml
index 357bef5cf..a2d1404d9 100644
--- a/data/templates/npc/monster/21170-LithMedium.xml
+++ b/data/templates/npc/monster/21170-LithMedium.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21170" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21171-LithOverlord.xml b/data/templates/npc/monster/21171-LithOverlord.xml
index fa29ceac6..e42734179 100644
--- a/data/templates/npc/monster/21171-LithOverlord.xml
+++ b/data/templates/npc/monster/21171-LithOverlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21171" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21172-LithPatrolman.xml b/data/templates/npc/monster/21172-LithPatrolman.xml
index 678c94516..037aca77c 100644
--- a/data/templates/npc/monster/21172-LithPatrolman.xml
+++ b/data/templates/npc/monster/21172-LithPatrolman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21172" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21173-LithShaman.xml b/data/templates/npc/monster/21173-LithShaman.xml
index 56908fa62..a81ce3435 100644
--- a/data/templates/npc/monster/21173-LithShaman.xml
+++ b/data/templates/npc/monster/21173-LithShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21173" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21174-LithCommander.xml b/data/templates/npc/monster/21174-LithCommander.xml
index 643162b60..ea39c38a4 100644
--- a/data/templates/npc/monster/21174-LithCommander.xml
+++ b/data/templates/npc/monster/21174-LithCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21174" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21175-LilimButcher.xml b/data/templates/npc/monster/21175-LilimButcher.xml
index a523807ff..5a3d45349 100644
--- a/data/templates/npc/monster/21175-LilimButcher.xml
+++ b/data/templates/npc/monster/21175-LilimButcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21175" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21176-LilimMagus.xml b/data/templates/npc/monster/21176-LilimMagus.xml
index a4e30daf8..56b9865a4 100644
--- a/data/templates/npc/monster/21176-LilimMagus.xml
+++ b/data/templates/npc/monster/21176-LilimMagus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21176" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21177-LilimKnightErrant.xml b/data/templates/npc/monster/21177-LilimKnightErrant.xml
index 6e6c97a35..3fb54d4ad 100644
--- a/data/templates/npc/monster/21177-LilimKnightErrant.xml
+++ b/data/templates/npc/monster/21177-LilimKnightErrant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21177" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21178-LilimMarauder.xml b/data/templates/npc/monster/21178-LilimMarauder.xml
index a188bd946..3ed239b8b 100644
--- a/data/templates/npc/monster/21178-LilimMarauder.xml
+++ b/data/templates/npc/monster/21178-LilimMarauder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21178" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21179-LilimPriest.xml b/data/templates/npc/monster/21179-LilimPriest.xml
index b2cdd6750..c20a23dba 100644
--- a/data/templates/npc/monster/21179-LilimPriest.xml
+++ b/data/templates/npc/monster/21179-LilimPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21179" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21180-LilimKnight.xml b/data/templates/npc/monster/21180-LilimKnight.xml
index 3157d418f..c3cef0ef2 100644
--- a/data/templates/npc/monster/21180-LilimKnight.xml
+++ b/data/templates/npc/monster/21180-LilimKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21180" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21181-LilimAssassin.xml b/data/templates/npc/monster/21181-LilimAssassin.xml
index e43b5a9ee..5a4dda016 100644
--- a/data/templates/npc/monster/21181-LilimAssassin.xml
+++ b/data/templates/npc/monster/21181-LilimAssassin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21181" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21182-LilimSoldier.xml b/data/templates/npc/monster/21182-LilimSoldier.xml
index 32c639072..6f5997a75 100644
--- a/data/templates/npc/monster/21182-LilimSoldier.xml
+++ b/data/templates/npc/monster/21182-LilimSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21182" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21183-LilimKnightCommander.xml b/data/templates/npc/monster/21183-LilimKnightCommander.xml
index ea0c8e6ad..6eddc9a35 100644
--- a/data/templates/npc/monster/21183-LilimKnightCommander.xml
+++ b/data/templates/npc/monster/21183-LilimKnightCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21183" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21184-LilimSlayer.xml b/data/templates/npc/monster/21184-LilimSlayer.xml
index a2522ca09..488b9be58 100644
--- a/data/templates/npc/monster/21184-LilimSlayer.xml
+++ b/data/templates/npc/monster/21184-LilimSlayer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21184" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21185-LilimGreatMystic.xml b/data/templates/npc/monster/21185-LilimGreatMystic.xml
index 6be020d88..785c3e1c4 100644
--- a/data/templates/npc/monster/21185-LilimGreatMystic.xml
+++ b/data/templates/npc/monster/21185-LilimGreatMystic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21185" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21186-LilimCourtKnight.xml b/data/templates/npc/monster/21186-LilimCourtKnight.xml
index 607a26800..c0b620c4d 100644
--- a/data/templates/npc/monster/21186-LilimCourtKnight.xml
+++ b/data/templates/npc/monster/21186-LilimCourtKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21186" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21187-GigantSlave.xml b/data/templates/npc/monster/21187-GigantSlave.xml
index fccb6d81c..c66c415c9 100644
--- a/data/templates/npc/monster/21187-GigantSlave.xml
+++ b/data/templates/npc/monster/21187-GigantSlave.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21187" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21188-GigantAcolyte.xml b/data/templates/npc/monster/21188-GigantAcolyte.xml
index 08bbe712b..4f6424939 100644
--- a/data/templates/npc/monster/21188-GigantAcolyte.xml
+++ b/data/templates/npc/monster/21188-GigantAcolyte.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21188" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21189-GigantOverseer.xml b/data/templates/npc/monster/21189-GigantOverseer.xml
index 8bb531dd0..73df7a9e7 100644
--- a/data/templates/npc/monster/21189-GigantOverseer.xml
+++ b/data/templates/npc/monster/21189-GigantOverseer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21189" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21190-GigantFootman.xml b/data/templates/npc/monster/21190-GigantFootman.xml
index 1b96fe027..9ea9b95a0 100644
--- a/data/templates/npc/monster/21190-GigantFootman.xml
+++ b/data/templates/npc/monster/21190-GigantFootman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21190" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21191-GigantCleric.xml b/data/templates/npc/monster/21191-GigantCleric.xml
index 2dbe73171..692c80061 100644
--- a/data/templates/npc/monster/21191-GigantCleric.xml
+++ b/data/templates/npc/monster/21191-GigantCleric.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21191" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21192-GigantOfficer.xml b/data/templates/npc/monster/21192-GigantOfficer.xml
index b85f7fb7c..442aa872e 100644
--- a/data/templates/npc/monster/21192-GigantOfficer.xml
+++ b/data/templates/npc/monster/21192-GigantOfficer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21192" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21193-GigantRaider.xml b/data/templates/npc/monster/21193-GigantRaider.xml
index ac37a1928..545c160ab 100644
--- a/data/templates/npc/monster/21193-GigantRaider.xml
+++ b/data/templates/npc/monster/21193-GigantRaider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21193" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21194-GigantConfessor.xml b/data/templates/npc/monster/21194-GigantConfessor.xml
index db47e8710..46822fade 100644
--- a/data/templates/npc/monster/21194-GigantConfessor.xml
+++ b/data/templates/npc/monster/21194-GigantConfessor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21194" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21195-GigantCommander.xml b/data/templates/npc/monster/21195-GigantCommander.xml
index df33f64fd..b8054ddef 100644
--- a/data/templates/npc/monster/21195-GigantCommander.xml
+++ b/data/templates/npc/monster/21195-GigantCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21195" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21196-NephilimSentinel.xml b/data/templates/npc/monster/21196-NephilimSentinel.xml
index 873ef5c3e..521c6ecd3 100644
--- a/data/templates/npc/monster/21196-NephilimSentinel.xml
+++ b/data/templates/npc/monster/21196-NephilimSentinel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21196" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21197-NephilimPriest.xml b/data/templates/npc/monster/21197-NephilimPriest.xml
index c25c143a6..eb147fd50 100644
--- a/data/templates/npc/monster/21197-NephilimPriest.xml
+++ b/data/templates/npc/monster/21197-NephilimPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21197" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21198-NephilimSwordsman.xml b/data/templates/npc/monster/21198-NephilimSwordsman.xml
index 899e63f74..312b6159e 100644
--- a/data/templates/npc/monster/21198-NephilimSwordsman.xml
+++ b/data/templates/npc/monster/21198-NephilimSwordsman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21198" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21199-NephilimGuard.xml b/data/templates/npc/monster/21199-NephilimGuard.xml
index 2f82407cc..65ce6404c 100644
--- a/data/templates/npc/monster/21199-NephilimGuard.xml
+++ b/data/templates/npc/monster/21199-NephilimGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21199" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21200-NephilimBishop.xml b/data/templates/npc/monster/21200-NephilimBishop.xml
index 45822492f..e5d208bcf 100644
--- a/data/templates/npc/monster/21200-NephilimBishop.xml
+++ b/data/templates/npc/monster/21200-NephilimBishop.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21200" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21201-NephilimCenturion.xml b/data/templates/npc/monster/21201-NephilimCenturion.xml
index 9f5df8f2c..9572e4111 100644
--- a/data/templates/npc/monster/21201-NephilimCenturion.xml
+++ b/data/templates/npc/monster/21201-NephilimCenturion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21201" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21202-NephilimScout.xml b/data/templates/npc/monster/21202-NephilimScout.xml
index 8d1f81b61..3e32b58ea 100644
--- a/data/templates/npc/monster/21202-NephilimScout.xml
+++ b/data/templates/npc/monster/21202-NephilimScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21202" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21203-NephilimArchbishop.xml b/data/templates/npc/monster/21203-NephilimArchbishop.xml
index 0e512a098..ca32f7dd9 100644
--- a/data/templates/npc/monster/21203-NephilimArchbishop.xml
+++ b/data/templates/npc/monster/21203-NephilimArchbishop.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21203" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21204-NephilimPraetorian.xml b/data/templates/npc/monster/21204-NephilimPraetorian.xml
index 32b0376fb..70f020946 100644
--- a/data/templates/npc/monster/21204-NephilimPraetorian.xml
+++ b/data/templates/npc/monster/21204-NephilimPraetorian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21204" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21205-NephilimRoyalGuard.xml b/data/templates/npc/monster/21205-NephilimRoyalGuard.xml
index e22ebfd9c..b82caaa86 100644
--- a/data/templates/npc/monster/21205-NephilimRoyalGuard.xml
+++ b/data/templates/npc/monster/21205-NephilimRoyalGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21205" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21206-NephilimCardinal.xml b/data/templates/npc/monster/21206-NephilimCardinal.xml
index ab8dfa673..d472f1433 100644
--- a/data/templates/npc/monster/21206-NephilimCardinal.xml
+++ b/data/templates/npc/monster/21206-NephilimCardinal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21206" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21207-NephilimCommander.xml b/data/templates/npc/monster/21207-NephilimCommander.xml
index ff9a58a7d..f6bd90a79 100644
--- a/data/templates/npc/monster/21207-NephilimCommander.xml
+++ b/data/templates/npc/monster/21207-NephilimCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21207" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21208-HallowedWatchman.xml b/data/templates/npc/monster/21208-HallowedWatchman.xml
index d49602eb2..d76f6e78e 100644
--- a/data/templates/npc/monster/21208-HallowedWatchman.xml
+++ b/data/templates/npc/monster/21208-HallowedWatchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21208" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21209-HallowedSeer.xml b/data/templates/npc/monster/21209-HallowedSeer.xml
index 964ac85f2..9cf460be9 100644
--- a/data/templates/npc/monster/21209-HallowedSeer.xml
+++ b/data/templates/npc/monster/21209-HallowedSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21209" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21210-VaultGuardian.xml b/data/templates/npc/monster/21210-VaultGuardian.xml
index 2885a0e2e..5a8a32281 100644
--- a/data/templates/npc/monster/21210-VaultGuardian.xml
+++ b/data/templates/npc/monster/21210-VaultGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21210" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21211-VaultSeer.xml b/data/templates/npc/monster/21211-VaultSeer.xml
index 85325f24d..87a33f0a1 100644
--- a/data/templates/npc/monster/21211-VaultSeer.xml
+++ b/data/templates/npc/monster/21211-VaultSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21211" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21212-HallowedSentinel.xml b/data/templates/npc/monster/21212-HallowedSentinel.xml
index e416c8b9c..7945c200e 100644
--- a/data/templates/npc/monster/21212-HallowedSentinel.xml
+++ b/data/templates/npc/monster/21212-HallowedSentinel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21212" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21213-HallowedMonk.xml b/data/templates/npc/monster/21213-HallowedMonk.xml
index cd03c1f12..89ad0088e 100644
--- a/data/templates/npc/monster/21213-HallowedMonk.xml
+++ b/data/templates/npc/monster/21213-HallowedMonk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21213" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21214-VaultSentinel.xml b/data/templates/npc/monster/21214-VaultSentinel.xml
index 05614d62f..72c2c4bfd 100644
--- a/data/templates/npc/monster/21214-VaultSentinel.xml
+++ b/data/templates/npc/monster/21214-VaultSentinel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21214" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21215-VaultMonk.xml b/data/templates/npc/monster/21215-VaultMonk.xml
index f154c1364..473729ab5 100644
--- a/data/templates/npc/monster/21215-VaultMonk.xml
+++ b/data/templates/npc/monster/21215-VaultMonk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21215" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21216-OverlordOfTheHolyLands.xml b/data/templates/npc/monster/21216-OverlordOfTheHolyLands.xml
index 2aa713456..663f00fa6 100644
--- a/data/templates/npc/monster/21216-OverlordOfTheHolyLands.xml
+++ b/data/templates/npc/monster/21216-OverlordOfTheHolyLands.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21216" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21217-HallowedPriest.xml b/data/templates/npc/monster/21217-HallowedPriest.xml
index b1386ea47..76e5647c8 100644
--- a/data/templates/npc/monster/21217-HallowedPriest.xml
+++ b/data/templates/npc/monster/21217-HallowedPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21217" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21218-VaultOverlord.xml b/data/templates/npc/monster/21218-VaultOverlord.xml
index 5b15870f7..101fef077 100644
--- a/data/templates/npc/monster/21218-VaultOverlord.xml
+++ b/data/templates/npc/monster/21218-VaultOverlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21218" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21219-VaultPriest.xml b/data/templates/npc/monster/21219-VaultPriest.xml
index 2baee93eb..2c97a0ab5 100644
--- a/data/templates/npc/monster/21219-VaultPriest.xml
+++ b/data/templates/npc/monster/21219-VaultPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21219" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21220-SepulcherArchon.xml b/data/templates/npc/monster/21220-SepulcherArchon.xml
index e169a8b0c..87320ffc6 100644
--- a/data/templates/npc/monster/21220-SepulcherArchon.xml
+++ b/data/templates/npc/monster/21220-SepulcherArchon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21220" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21221-SepulcherInquisitor.xml b/data/templates/npc/monster/21221-SepulcherInquisitor.xml
index f2bf6bfcf..66f5df770 100644
--- a/data/templates/npc/monster/21221-SepulcherInquisitor.xml
+++ b/data/templates/npc/monster/21221-SepulcherInquisitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21221" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21222-SepulcherArchon.xml b/data/templates/npc/monster/21222-SepulcherArchon.xml
index dc34ce962..70f06a5da 100644
--- a/data/templates/npc/monster/21222-SepulcherArchon.xml
+++ b/data/templates/npc/monster/21222-SepulcherArchon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21222" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21223-SepulcherInquisitor.xml b/data/templates/npc/monster/21223-SepulcherInquisitor.xml
index bfaa74fb8..2e6528561 100644
--- a/data/templates/npc/monster/21223-SepulcherInquisitor.xml
+++ b/data/templates/npc/monster/21223-SepulcherInquisitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21223" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21224-SepulcherGuardian.xml b/data/templates/npc/monster/21224-SepulcherGuardian.xml
index 98fb1a724..a7a42125d 100644
--- a/data/templates/npc/monster/21224-SepulcherGuardian.xml
+++ b/data/templates/npc/monster/21224-SepulcherGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21224" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21225-SepulcherSage.xml b/data/templates/npc/monster/21225-SepulcherSage.xml
index 317059a18..c0aca6a67 100644
--- a/data/templates/npc/monster/21225-SepulcherSage.xml
+++ b/data/templates/npc/monster/21225-SepulcherSage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21225" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21226-SepulcherGuardian.xml b/data/templates/npc/monster/21226-SepulcherGuardian.xml
index 9f96d3772..d52f56579 100644
--- a/data/templates/npc/monster/21226-SepulcherGuardian.xml
+++ b/data/templates/npc/monster/21226-SepulcherGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21226" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21227-SepulcherSage.xml b/data/templates/npc/monster/21227-SepulcherSage.xml
index a61281f66..baa139981 100644
--- a/data/templates/npc/monster/21227-SepulcherSage.xml
+++ b/data/templates/npc/monster/21227-SepulcherSage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21227" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21228-SepulcherGuard.xml b/data/templates/npc/monster/21228-SepulcherGuard.xml
index 70be6091d..b104efc17 100644
--- a/data/templates/npc/monster/21228-SepulcherGuard.xml
+++ b/data/templates/npc/monster/21228-SepulcherGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21228" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21229-SepulcherPreacher.xml b/data/templates/npc/monster/21229-SepulcherPreacher.xml
index 3234d061d..cdff9b869 100644
--- a/data/templates/npc/monster/21229-SepulcherPreacher.xml
+++ b/data/templates/npc/monster/21229-SepulcherPreacher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21229" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21230-SepulcherGuard.xml b/data/templates/npc/monster/21230-SepulcherGuard.xml
index 9b0359b31..ce8b8f5b4 100644
--- a/data/templates/npc/monster/21230-SepulcherGuard.xml
+++ b/data/templates/npc/monster/21230-SepulcherGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21230" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21231-SepulcherPreacher.xml b/data/templates/npc/monster/21231-SepulcherPreacher.xml
index e520212c3..31a1d5668 100644
--- a/data/templates/npc/monster/21231-SepulcherPreacher.xml
+++ b/data/templates/npc/monster/21231-SepulcherPreacher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21231" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21232-BarrowGuardian.xml b/data/templates/npc/monster/21232-BarrowGuardian.xml
index 04e12f738..6d69beaf2 100644
--- a/data/templates/npc/monster/21232-BarrowGuardian.xml
+++ b/data/templates/npc/monster/21232-BarrowGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21232" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21233-BarrowSeer.xml b/data/templates/npc/monster/21233-BarrowSeer.xml
index 27e57c764..a8cc6ad5c 100644
--- a/data/templates/npc/monster/21233-BarrowSeer.xml
+++ b/data/templates/npc/monster/21233-BarrowSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21233" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21234-GraveGuardian.xml b/data/templates/npc/monster/21234-GraveGuardian.xml
index 7ff78b8c2..2efe1fc45 100644
--- a/data/templates/npc/monster/21234-GraveGuardian.xml
+++ b/data/templates/npc/monster/21234-GraveGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21234" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21235-GraveSeer.xml b/data/templates/npc/monster/21235-GraveSeer.xml
index 0a9ce445d..f0820baef 100644
--- a/data/templates/npc/monster/21235-GraveSeer.xml
+++ b/data/templates/npc/monster/21235-GraveSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21235" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21236-BarrowSentinel.xml b/data/templates/npc/monster/21236-BarrowSentinel.xml
index 0907e125e..f53b1581d 100644
--- a/data/templates/npc/monster/21236-BarrowSentinel.xml
+++ b/data/templates/npc/monster/21236-BarrowSentinel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21236" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21237-BarrowMonk.xml b/data/templates/npc/monster/21237-BarrowMonk.xml
index 7dfb2864e..01afe0769 100644
--- a/data/templates/npc/monster/21237-BarrowMonk.xml
+++ b/data/templates/npc/monster/21237-BarrowMonk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21237" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21238-GraveSentinel.xml b/data/templates/npc/monster/21238-GraveSentinel.xml
index 4315ba31d..1f5c89aae 100644
--- a/data/templates/npc/monster/21238-GraveSentinel.xml
+++ b/data/templates/npc/monster/21238-GraveSentinel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21238" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21239-GraveMonk.xml b/data/templates/npc/monster/21239-GraveMonk.xml
index f72a5a000..652b0238e 100644
--- a/data/templates/npc/monster/21239-GraveMonk.xml
+++ b/data/templates/npc/monster/21239-GraveMonk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21239" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21240-BarrowOverlord.xml b/data/templates/npc/monster/21240-BarrowOverlord.xml
index 028f470a2..d73b9b355 100644
--- a/data/templates/npc/monster/21240-BarrowOverlord.xml
+++ b/data/templates/npc/monster/21240-BarrowOverlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21240" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21241-BarrowPriest.xml b/data/templates/npc/monster/21241-BarrowPriest.xml
index 1a1824ead..eea78f2ea 100644
--- a/data/templates/npc/monster/21241-BarrowPriest.xml
+++ b/data/templates/npc/monster/21241-BarrowPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21241" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21242-GraveOverlord.xml b/data/templates/npc/monster/21242-GraveOverlord.xml
index d3e81ce43..6de81e344 100644
--- a/data/templates/npc/monster/21242-GraveOverlord.xml
+++ b/data/templates/npc/monster/21242-GraveOverlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21242" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21243-GravePriest.xml b/data/templates/npc/monster/21243-GravePriest.xml
index 80257701c..4e3280567 100644
--- a/data/templates/npc/monster/21243-GravePriest.xml
+++ b/data/templates/npc/monster/21243-GravePriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21243" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21244-CryptArchon.xml b/data/templates/npc/monster/21244-CryptArchon.xml
index 27c9179d3..fd8752992 100644
--- a/data/templates/npc/monster/21244-CryptArchon.xml
+++ b/data/templates/npc/monster/21244-CryptArchon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21244" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21245-CryptInquisitor.xml b/data/templates/npc/monster/21245-CryptInquisitor.xml
index 7466f4f29..cbc8572ca 100644
--- a/data/templates/npc/monster/21245-CryptInquisitor.xml
+++ b/data/templates/npc/monster/21245-CryptInquisitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21245" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21246-TombArchon.xml b/data/templates/npc/monster/21246-TombArchon.xml
index 7e1ed7a6a..6bc502e8f 100644
--- a/data/templates/npc/monster/21246-TombArchon.xml
+++ b/data/templates/npc/monster/21246-TombArchon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21246" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21247-TombInquisitor.xml b/data/templates/npc/monster/21247-TombInquisitor.xml
index 42a774a6b..5b62a8ef2 100644
--- a/data/templates/npc/monster/21247-TombInquisitor.xml
+++ b/data/templates/npc/monster/21247-TombInquisitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21247" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21248-CryptGuardian.xml b/data/templates/npc/monster/21248-CryptGuardian.xml
index aa3d2d879..683d79390 100644
--- a/data/templates/npc/monster/21248-CryptGuardian.xml
+++ b/data/templates/npc/monster/21248-CryptGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21248" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21249-CryptSage.xml b/data/templates/npc/monster/21249-CryptSage.xml
index 31b2535a6..2bc41a010 100644
--- a/data/templates/npc/monster/21249-CryptSage.xml
+++ b/data/templates/npc/monster/21249-CryptSage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21249" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21250-TombGuardian.xml b/data/templates/npc/monster/21250-TombGuardian.xml
index b3790cda4..21cee1b16 100644
--- a/data/templates/npc/monster/21250-TombGuardian.xml
+++ b/data/templates/npc/monster/21250-TombGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21250" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21251-TombSage.xml b/data/templates/npc/monster/21251-TombSage.xml
index 80cd78f93..b8d817279 100644
--- a/data/templates/npc/monster/21251-TombSage.xml
+++ b/data/templates/npc/monster/21251-TombSage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21251" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21252-CryptGuard.xml b/data/templates/npc/monster/21252-CryptGuard.xml
index 0545dd937..550132e39 100644
--- a/data/templates/npc/monster/21252-CryptGuard.xml
+++ b/data/templates/npc/monster/21252-CryptGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21252" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21253-CryptPreacher.xml b/data/templates/npc/monster/21253-CryptPreacher.xml
index 2d7fd5c1f..b22a8ab5d 100644
--- a/data/templates/npc/monster/21253-CryptPreacher.xml
+++ b/data/templates/npc/monster/21253-CryptPreacher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21253" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21254-TombGuard.xml b/data/templates/npc/monster/21254-TombGuard.xml
index accb53a04..8e34b6906 100644
--- a/data/templates/npc/monster/21254-TombGuard.xml
+++ b/data/templates/npc/monster/21254-TombGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21254" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21255-TombPreacher.xml b/data/templates/npc/monster/21255-TombPreacher.xml
index 9433bfe66..c84b64199 100644
--- a/data/templates/npc/monster/21255-TombPreacher.xml
+++ b/data/templates/npc/monster/21255-TombPreacher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21255" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21256-UndergroundWerewolf.xml b/data/templates/npc/monster/21256-UndergroundWerewolf.xml
index e53b19a80..b34422407 100644
--- a/data/templates/npc/monster/21256-UndergroundWerewolf.xml
+++ b/data/templates/npc/monster/21256-UndergroundWerewolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21256" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21257-EvilEyeSeer.xml b/data/templates/npc/monster/21257-EvilEyeSeer.xml
index 2042f49f8..a56dd6c74 100644
--- a/data/templates/npc/monster/21257-EvilEyeSeer.xml
+++ b/data/templates/npc/monster/21257-EvilEyeSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21257" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21258-FallenOrcShaman.xml b/data/templates/npc/monster/21258-FallenOrcShaman.xml
index 00dfe2b1f..9b0f3808d 100644
--- a/data/templates/npc/monster/21258-FallenOrcShaman.xml
+++ b/data/templates/npc/monster/21258-FallenOrcShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21258" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21259-FallenOrcShaman.xml b/data/templates/npc/monster/21259-FallenOrcShaman.xml
index f584a0c24..074cdd9bc 100644
--- a/data/templates/npc/monster/21259-FallenOrcShaman.xml
+++ b/data/templates/npc/monster/21259-FallenOrcShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21259" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21260-BetrayerOrcHero.xml b/data/templates/npc/monster/21260-BetrayerOrcHero.xml
index fccc4a388..75b4fe9a4 100644
--- a/data/templates/npc/monster/21260-BetrayerOrcHero.xml
+++ b/data/templates/npc/monster/21260-BetrayerOrcHero.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21260" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21261-OlMahumTranscender.xml b/data/templates/npc/monster/21261-OlMahumTranscender.xml
index 77ddd6c70..7e47f6dcf 100644
--- a/data/templates/npc/monster/21261-OlMahumTranscender.xml
+++ b/data/templates/npc/monster/21261-OlMahumTranscender.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21261" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21262-OlMahumTranscender.xml b/data/templates/npc/monster/21262-OlMahumTranscender.xml
index c8502e788..003297f6c 100644
--- a/data/templates/npc/monster/21262-OlMahumTranscender.xml
+++ b/data/templates/npc/monster/21262-OlMahumTranscender.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21262" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21263-OlMahumTranscender.xml b/data/templates/npc/monster/21263-OlMahumTranscender.xml
index 289de97f8..f312fe074 100644
--- a/data/templates/npc/monster/21263-OlMahumTranscender.xml
+++ b/data/templates/npc/monster/21263-OlMahumTranscender.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21263" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21264-OlMahumTranscender.xml b/data/templates/npc/monster/21264-OlMahumTranscender.xml
index 29d6907af..4e309f5d7 100644
--- a/data/templates/npc/monster/21264-OlMahumTranscender.xml
+++ b/data/templates/npc/monster/21264-OlMahumTranscender.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21264" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21265-CaveAntLarva.xml b/data/templates/npc/monster/21265-CaveAntLarva.xml
index bf2dc029a..208cc9b9f 100644
--- a/data/templates/npc/monster/21265-CaveAntLarva.xml
+++ b/data/templates/npc/monster/21265-CaveAntLarva.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21265" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21266-CaveAntLarva.xml b/data/templates/npc/monster/21266-CaveAntLarva.xml
index 3bb663c02..d979b8d25 100644
--- a/data/templates/npc/monster/21266-CaveAntLarva.xml
+++ b/data/templates/npc/monster/21266-CaveAntLarva.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21266" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21267-CaveAntLarva.xml b/data/templates/npc/monster/21267-CaveAntLarva.xml
index f949427ed..a015b9c64 100644
--- a/data/templates/npc/monster/21267-CaveAntLarva.xml
+++ b/data/templates/npc/monster/21267-CaveAntLarva.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21267" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21268-CaveAntLarva.xml b/data/templates/npc/monster/21268-CaveAntLarva.xml
index 8d4c99d23..a6a750705 100644
--- a/data/templates/npc/monster/21268-CaveAntLarva.xml
+++ b/data/templates/npc/monster/21268-CaveAntLarva.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21268" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21269-CaveAnt.xml b/data/templates/npc/monster/21269-CaveAnt.xml
index 0b813026c..100f17aeb 100644
--- a/data/templates/npc/monster/21269-CaveAnt.xml
+++ b/data/templates/npc/monster/21269-CaveAnt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21269" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21270-CaveAntSoldier.xml b/data/templates/npc/monster/21270-CaveAntSoldier.xml
index 0f4731fd4..cb5a9d5ca 100644
--- a/data/templates/npc/monster/21270-CaveAntSoldier.xml
+++ b/data/templates/npc/monster/21270-CaveAntSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21270" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21271-CaveAnt.xml b/data/templates/npc/monster/21271-CaveAnt.xml
index b4aeb16f7..c6bf227e1 100644
--- a/data/templates/npc/monster/21271-CaveAnt.xml
+++ b/data/templates/npc/monster/21271-CaveAnt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21271" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21272-CaveAntSoldier.xml b/data/templates/npc/monster/21272-CaveAntSoldier.xml
index 66d6f0c77..70dcb5819 100644
--- a/data/templates/npc/monster/21272-CaveAntSoldier.xml
+++ b/data/templates/npc/monster/21272-CaveAntSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21272" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21273-CaveNobleAnt.xml b/data/templates/npc/monster/21273-CaveNobleAnt.xml
index 340f6a3af..20c121462 100644
--- a/data/templates/npc/monster/21273-CaveNobleAnt.xml
+++ b/data/templates/npc/monster/21273-CaveNobleAnt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21273" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21274-Kookaburra.xml b/data/templates/npc/monster/21274-Kookaburra.xml
index 79b414f9e..ba6ec1a1e 100644
--- a/data/templates/npc/monster/21274-Kookaburra.xml
+++ b/data/templates/npc/monster/21274-Kookaburra.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21274" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21275-Kookaburra.xml b/data/templates/npc/monster/21275-Kookaburra.xml
index 9e217650b..9fcd2f454 100644
--- a/data/templates/npc/monster/21275-Kookaburra.xml
+++ b/data/templates/npc/monster/21275-Kookaburra.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21275" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21276-Kookaburra.xml b/data/templates/npc/monster/21276-Kookaburra.xml
index c7aafb4cc..0b2c89082 100644
--- a/data/templates/npc/monster/21276-Kookaburra.xml
+++ b/data/templates/npc/monster/21276-Kookaburra.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21276" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21278-Antelope.xml b/data/templates/npc/monster/21278-Antelope.xml
index 7f35e1c9f..dfa619539 100644
--- a/data/templates/npc/monster/21278-Antelope.xml
+++ b/data/templates/npc/monster/21278-Antelope.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21278" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21279-Antelope.xml b/data/templates/npc/monster/21279-Antelope.xml
index 08297c30f..7350377e3 100644
--- a/data/templates/npc/monster/21279-Antelope.xml
+++ b/data/templates/npc/monster/21279-Antelope.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21279" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21280-Antelope.xml b/data/templates/npc/monster/21280-Antelope.xml
index 23d4938e4..6b933c790 100644
--- a/data/templates/npc/monster/21280-Antelope.xml
+++ b/data/templates/npc/monster/21280-Antelope.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21280" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21282-Bandersnatch.xml b/data/templates/npc/monster/21282-Bandersnatch.xml
index f98f74d98..5370af91b 100644
--- a/data/templates/npc/monster/21282-Bandersnatch.xml
+++ b/data/templates/npc/monster/21282-Bandersnatch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21282" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21283-Bandersnatch.xml b/data/templates/npc/monster/21283-Bandersnatch.xml
index ffd075d13..e276dae7b 100644
--- a/data/templates/npc/monster/21283-Bandersnatch.xml
+++ b/data/templates/npc/monster/21283-Bandersnatch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21283" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21284-Bandersnatch.xml b/data/templates/npc/monster/21284-Bandersnatch.xml
index 394d0d694..a6116f721 100644
--- a/data/templates/npc/monster/21284-Bandersnatch.xml
+++ b/data/templates/npc/monster/21284-Bandersnatch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21284" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21286-Buffalo.xml b/data/templates/npc/monster/21286-Buffalo.xml
index 92b196627..8008d0137 100644
--- a/data/templates/npc/monster/21286-Buffalo.xml
+++ b/data/templates/npc/monster/21286-Buffalo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21286" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21287-Buffalo.xml b/data/templates/npc/monster/21287-Buffalo.xml
index 403bf6517..67b9fd917 100644
--- a/data/templates/npc/monster/21287-Buffalo.xml
+++ b/data/templates/npc/monster/21287-Buffalo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21287" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21288-Buffalo.xml b/data/templates/npc/monster/21288-Buffalo.xml
index 89c3b2cd2..8bf17bda8 100644
--- a/data/templates/npc/monster/21288-Buffalo.xml
+++ b/data/templates/npc/monster/21288-Buffalo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21288" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21290-Grendel.xml b/data/templates/npc/monster/21290-Grendel.xml
index b2391ab29..25b164129 100644
--- a/data/templates/npc/monster/21290-Grendel.xml
+++ b/data/templates/npc/monster/21290-Grendel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21290" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21291-Grendel.xml b/data/templates/npc/monster/21291-Grendel.xml
index 7c4d45086..300d72339 100644
--- a/data/templates/npc/monster/21291-Grendel.xml
+++ b/data/templates/npc/monster/21291-Grendel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21291" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21292-Grendel.xml b/data/templates/npc/monster/21292-Grendel.xml
index 6d23f014b..bd509573a 100644
--- a/data/templates/npc/monster/21292-Grendel.xml
+++ b/data/templates/npc/monster/21292-Grendel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21292" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21294-CanyonAntelope.xml b/data/templates/npc/monster/21294-CanyonAntelope.xml
index 0859806bc..c9932c97b 100644
--- a/data/templates/npc/monster/21294-CanyonAntelope.xml
+++ b/data/templates/npc/monster/21294-CanyonAntelope.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21294" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21295-CanyonAntelopeSlave.xml b/data/templates/npc/monster/21295-CanyonAntelopeSlave.xml
index b6ba575d8..09f190dd7 100644
--- a/data/templates/npc/monster/21295-CanyonAntelopeSlave.xml
+++ b/data/templates/npc/monster/21295-CanyonAntelopeSlave.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21295" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21296-CanyonBandersnatch.xml b/data/templates/npc/monster/21296-CanyonBandersnatch.xml
index 864835679..64980f09c 100644
--- a/data/templates/npc/monster/21296-CanyonBandersnatch.xml
+++ b/data/templates/npc/monster/21296-CanyonBandersnatch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21296" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21297-CanyonBandersnatchSlave.xml b/data/templates/npc/monster/21297-CanyonBandersnatchSlave.xml
index 6d1d9c0d2..2fcf49890 100644
--- a/data/templates/npc/monster/21297-CanyonBandersnatchSlave.xml
+++ b/data/templates/npc/monster/21297-CanyonBandersnatchSlave.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21297" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21298-EyeOfRestrainer.xml b/data/templates/npc/monster/21298-EyeOfRestrainer.xml
index 0ebb7566b..272f968e0 100644
--- a/data/templates/npc/monster/21298-EyeOfRestrainer.xml
+++ b/data/templates/npc/monster/21298-EyeOfRestrainer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21298" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21299-BuffaloSlave.xml b/data/templates/npc/monster/21299-BuffaloSlave.xml
index 5d0ad5843..e582f8909 100644
--- a/data/templates/npc/monster/21299-BuffaloSlave.xml
+++ b/data/templates/npc/monster/21299-BuffaloSlave.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21299" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21300-EyeOfGuide.xml b/data/templates/npc/monster/21300-EyeOfGuide.xml
index 473dc0bf4..995d72176 100644
--- a/data/templates/npc/monster/21300-EyeOfGuide.xml
+++ b/data/templates/npc/monster/21300-EyeOfGuide.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21300" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21301-GazeOfNightmare.xml b/data/templates/npc/monster/21301-GazeOfNightmare.xml
index f85e6ebc2..e4b96187b 100644
--- a/data/templates/npc/monster/21301-GazeOfNightmare.xml
+++ b/data/templates/npc/monster/21301-GazeOfNightmare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21301" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21302-EyeOfWatchman.xml b/data/templates/npc/monster/21302-EyeOfWatchman.xml
index 1fd8f59c9..1576af622 100644
--- a/data/templates/npc/monster/21302-EyeOfWatchman.xml
+++ b/data/templates/npc/monster/21302-EyeOfWatchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21302" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21303-Homunculus.xml b/data/templates/npc/monster/21303-Homunculus.xml
index 7cdac579d..5040e281d 100644
--- a/data/templates/npc/monster/21303-Homunculus.xml
+++ b/data/templates/npc/monster/21303-Homunculus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21303" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21304-GrendelSlave.xml b/data/templates/npc/monster/21304-GrendelSlave.xml
index be5435ba2..19cd6745f 100644
--- a/data/templates/npc/monster/21304-GrendelSlave.xml
+++ b/data/templates/npc/monster/21304-GrendelSlave.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21304" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21305-EyeOfPilgrim.xml b/data/templates/npc/monster/21305-EyeOfPilgrim.xml
index a5c3ef3f4..68186021c 100644
--- a/data/templates/npc/monster/21305-EyeOfPilgrim.xml
+++ b/data/templates/npc/monster/21305-EyeOfPilgrim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21305" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21306-DisciplesOfProtection.xml b/data/templates/npc/monster/21306-DisciplesOfProtection.xml
index c010eea11..006f288d4 100644
--- a/data/templates/npc/monster/21306-DisciplesOfProtection.xml
+++ b/data/templates/npc/monster/21306-DisciplesOfProtection.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21306" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21307-ElderHomunculus.xml b/data/templates/npc/monster/21307-ElderHomunculus.xml
index 1aa722860..7874a3321 100644
--- a/data/templates/npc/monster/21307-ElderHomunculus.xml
+++ b/data/templates/npc/monster/21307-ElderHomunculus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21307" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21308-DisciplesOfPunishment.xml b/data/templates/npc/monster/21308-DisciplesOfPunishment.xml
index 258016b9e..c9cbd7166 100644
--- a/data/templates/npc/monster/21308-DisciplesOfPunishment.xml
+++ b/data/templates/npc/monster/21308-DisciplesOfPunishment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21308" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21309-DisciplesOfPunishment.xml b/data/templates/npc/monster/21309-DisciplesOfPunishment.xml
index d432e97d9..b3fb58f15 100644
--- a/data/templates/npc/monster/21309-DisciplesOfPunishment.xml
+++ b/data/templates/npc/monster/21309-DisciplesOfPunishment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21309" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21310-DisciplesOfAuthority.xml b/data/templates/npc/monster/21310-DisciplesOfAuthority.xml
index 0028d9e72..f39c8dae4 100644
--- a/data/templates/npc/monster/21310-DisciplesOfAuthority.xml
+++ b/data/templates/npc/monster/21310-DisciplesOfAuthority.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21310" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21311-DisciplesOfAuthority.xml b/data/templates/npc/monster/21311-DisciplesOfAuthority.xml
index dc5b969d4..a319e68b6 100644
--- a/data/templates/npc/monster/21311-DisciplesOfAuthority.xml
+++ b/data/templates/npc/monster/21311-DisciplesOfAuthority.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21311" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21312-EyeOfRuler.xml b/data/templates/npc/monster/21312-EyeOfRuler.xml
index b31544693..ee7396e0d 100644
--- a/data/templates/npc/monster/21312-EyeOfRuler.xml
+++ b/data/templates/npc/monster/21312-EyeOfRuler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21312" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21313-SlyHoundDog.xml b/data/templates/npc/monster/21313-SlyHoundDog.xml
index 0d989b0a4..ebefdecf1 100644
--- a/data/templates/npc/monster/21313-SlyHoundDog.xml
+++ b/data/templates/npc/monster/21313-SlyHoundDog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21313" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21314-HotSpringsBandersnatchling.xml b/data/templates/npc/monster/21314-HotSpringsBandersnatchling.xml
index d7ae742af..6971c26bf 100644
--- a/data/templates/npc/monster/21314-HotSpringsBandersnatchling.xml
+++ b/data/templates/npc/monster/21314-HotSpringsBandersnatchling.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21314" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21315-HotSpringsBuffalo.xml b/data/templates/npc/monster/21315-HotSpringsBuffalo.xml
index 4fde597eb..6101a0598 100644
--- a/data/templates/npc/monster/21315-HotSpringsBuffalo.xml
+++ b/data/templates/npc/monster/21315-HotSpringsBuffalo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21315" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21316-HotSpringsFlava.xml b/data/templates/npc/monster/21316-HotSpringsFlava.xml
index 279505209..0b6f6e8fb 100644
--- a/data/templates/npc/monster/21316-HotSpringsFlava.xml
+++ b/data/templates/npc/monster/21316-HotSpringsFlava.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21316" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21317-HotSpringsAtroxspawn.xml b/data/templates/npc/monster/21317-HotSpringsAtroxspawn.xml
index 3972e7be9..5212ce168 100644
--- a/data/templates/npc/monster/21317-HotSpringsAtroxspawn.xml
+++ b/data/templates/npc/monster/21317-HotSpringsAtroxspawn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21317" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21318-HotSpringsAntelope.xml b/data/templates/npc/monster/21318-HotSpringsAntelope.xml
index 614aa3f5a..56a05dece 100644
--- a/data/templates/npc/monster/21318-HotSpringsAntelope.xml
+++ b/data/templates/npc/monster/21318-HotSpringsAntelope.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21318" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21319-HotSpringsNepenthes.xml b/data/templates/npc/monster/21319-HotSpringsNepenthes.xml
index 278c4e106..fc48ddc9b 100644
--- a/data/templates/npc/monster/21319-HotSpringsNepenthes.xml
+++ b/data/templates/npc/monster/21319-HotSpringsNepenthes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21319" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21320-HotSpringsYeti.xml b/data/templates/npc/monster/21320-HotSpringsYeti.xml
index e3f16700e..e19421dc2 100644
--- a/data/templates/npc/monster/21320-HotSpringsYeti.xml
+++ b/data/templates/npc/monster/21320-HotSpringsYeti.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21320" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21321-HotSpringsAtrox.xml b/data/templates/npc/monster/21321-HotSpringsAtrox.xml
index d31f2827d..c144851a4 100644
--- a/data/templates/npc/monster/21321-HotSpringsAtrox.xml
+++ b/data/templates/npc/monster/21321-HotSpringsAtrox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21321" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21322-HotSpringsBandersnatch.xml b/data/templates/npc/monster/21322-HotSpringsBandersnatch.xml
index 0e052716b..13366711c 100644
--- a/data/templates/npc/monster/21322-HotSpringsBandersnatch.xml
+++ b/data/templates/npc/monster/21322-HotSpringsBandersnatch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21322" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21323-HotSpringsGrendel.xml b/data/templates/npc/monster/21323-HotSpringsGrendel.xml
index 4e8f97ec5..f060c3ca2 100644
--- a/data/templates/npc/monster/21323-HotSpringsGrendel.xml
+++ b/data/templates/npc/monster/21323-HotSpringsGrendel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21323" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21324-KetraOrcFootman.xml b/data/templates/npc/monster/21324-KetraOrcFootman.xml
index 231c0357a..0e834d489 100644
--- a/data/templates/npc/monster/21324-KetraOrcFootman.xml
+++ b/data/templates/npc/monster/21324-KetraOrcFootman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21324" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21325-KetraSWarHound.xml b/data/templates/npc/monster/21325-KetraSWarHound.xml
index f12ecc96f..7145a78f0 100644
--- a/data/templates/npc/monster/21325-KetraSWarHound.xml
+++ b/data/templates/npc/monster/21325-KetraSWarHound.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21325" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21326-GrazingKookaburra.xml b/data/templates/npc/monster/21326-GrazingKookaburra.xml
index 5d0f3b6ae..a26863c41 100644
--- a/data/templates/npc/monster/21326-GrazingKookaburra.xml
+++ b/data/templates/npc/monster/21326-GrazingKookaburra.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21326" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21327-KetraOrcRaider.xml b/data/templates/npc/monster/21327-KetraOrcRaider.xml
index febcdcb51..1ce5594a5 100644
--- a/data/templates/npc/monster/21327-KetraOrcRaider.xml
+++ b/data/templates/npc/monster/21327-KetraOrcRaider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21327" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21328-KetraOrcScout.xml b/data/templates/npc/monster/21328-KetraOrcScout.xml
index 9feafe630..5aec13aed 100644
--- a/data/templates/npc/monster/21328-KetraOrcScout.xml
+++ b/data/templates/npc/monster/21328-KetraOrcScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21328" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21329-KetraOrcShaman.xml b/data/templates/npc/monster/21329-KetraOrcShaman.xml
index 6076f0a51..16c6f3ab2 100644
--- a/data/templates/npc/monster/21329-KetraOrcShaman.xml
+++ b/data/templates/npc/monster/21329-KetraOrcShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21329" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21330-GrazingBuffalo.xml b/data/templates/npc/monster/21330-GrazingBuffalo.xml
index 565e871b7..817a5e749 100644
--- a/data/templates/npc/monster/21330-GrazingBuffalo.xml
+++ b/data/templates/npc/monster/21330-GrazingBuffalo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21330" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21331-KetraOrcWarrior.xml b/data/templates/npc/monster/21331-KetraOrcWarrior.xml
index 4dd236a55..81eb41543 100644
--- a/data/templates/npc/monster/21331-KetraOrcWarrior.xml
+++ b/data/templates/npc/monster/21331-KetraOrcWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21331" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21332-KetraOrcLieutenant.xml b/data/templates/npc/monster/21332-KetraOrcLieutenant.xml
index 4a42fb14f..9359b19db 100644
--- a/data/templates/npc/monster/21332-KetraOrcLieutenant.xml
+++ b/data/templates/npc/monster/21332-KetraOrcLieutenant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21332" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21333-GrazingWindsus.xml b/data/templates/npc/monster/21333-GrazingWindsus.xml
index 4a14f0e0c..9470efd07 100644
--- a/data/templates/npc/monster/21333-GrazingWindsus.xml
+++ b/data/templates/npc/monster/21333-GrazingWindsus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21333" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21334-KetraOrcMedium.xml b/data/templates/npc/monster/21334-KetraOrcMedium.xml
index 83e6aa511..bdcc66467 100644
--- a/data/templates/npc/monster/21334-KetraOrcMedium.xml
+++ b/data/templates/npc/monster/21334-KetraOrcMedium.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21334" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21335-KetraOrcEliteSoldier.xml b/data/templates/npc/monster/21335-KetraOrcEliteSoldier.xml
index 60a38f736..020d96f51 100644
--- a/data/templates/npc/monster/21335-KetraOrcEliteSoldier.xml
+++ b/data/templates/npc/monster/21335-KetraOrcEliteSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21335" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21336-KetraOrcWhiteCaptain.xml b/data/templates/npc/monster/21336-KetraOrcWhiteCaptain.xml
index b385fd4ee..4fe23d046 100644
--- a/data/templates/npc/monster/21336-KetraOrcWhiteCaptain.xml
+++ b/data/templates/npc/monster/21336-KetraOrcWhiteCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21336" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21337-GrazingElderBuffalo.xml b/data/templates/npc/monster/21337-GrazingElderBuffalo.xml
index afc4ebfff..11a3d6851 100644
--- a/data/templates/npc/monster/21337-GrazingElderBuffalo.xml
+++ b/data/templates/npc/monster/21337-GrazingElderBuffalo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21337" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21338-KetraOrcSeer.xml b/data/templates/npc/monster/21338-KetraOrcSeer.xml
index d4f5e6073..b8b410d6d 100644
--- a/data/templates/npc/monster/21338-KetraOrcSeer.xml
+++ b/data/templates/npc/monster/21338-KetraOrcSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21338" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21339-KetraOrcGeneral.xml b/data/templates/npc/monster/21339-KetraOrcGeneral.xml
index 924c7ef50..e925105c1 100644
--- a/data/templates/npc/monster/21339-KetraOrcGeneral.xml
+++ b/data/templates/npc/monster/21339-KetraOrcGeneral.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21339" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21340-KetraOrcBattalionCommander.xml b/data/templates/npc/monster/21340-KetraOrcBattalionCommander.xml
index 4a2ecb3c1..8ef30f55a 100644
--- a/data/templates/npc/monster/21340-KetraOrcBattalionCommander.xml
+++ b/data/templates/npc/monster/21340-KetraOrcBattalionCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21340" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21341-GrazingElderKookaburra.xml b/data/templates/npc/monster/21341-GrazingElderKookaburra.xml
index 337fdccbb..5376eed0a 100644
--- a/data/templates/npc/monster/21341-GrazingElderKookaburra.xml
+++ b/data/templates/npc/monster/21341-GrazingElderKookaburra.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21341" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21342-KetraOrcGrandSeer.xml b/data/templates/npc/monster/21342-KetraOrcGrandSeer.xml
index 3f2d5378a..ee116d399 100644
--- a/data/templates/npc/monster/21342-KetraOrcGrandSeer.xml
+++ b/data/templates/npc/monster/21342-KetraOrcGrandSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21342" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21343-KetraCommander.xml b/data/templates/npc/monster/21343-KetraCommander.xml
index 4adf35117..d6a969219 100644
--- a/data/templates/npc/monster/21343-KetraCommander.xml
+++ b/data/templates/npc/monster/21343-KetraCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21343" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21344-KetraEliteGuard.xml b/data/templates/npc/monster/21344-KetraEliteGuard.xml
index ca7dca385..728fbfe49 100644
--- a/data/templates/npc/monster/21344-KetraEliteGuard.xml
+++ b/data/templates/npc/monster/21344-KetraEliteGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21344" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21345-KetraSHeadShaman.xml b/data/templates/npc/monster/21345-KetraSHeadShaman.xml
index fea995d19..31b97987a 100644
--- a/data/templates/npc/monster/21345-KetraSHeadShaman.xml
+++ b/data/templates/npc/monster/21345-KetraSHeadShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21345" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21346-KetraSHeadGuard.xml b/data/templates/npc/monster/21346-KetraSHeadGuard.xml
index f10383d14..14f34dce4 100644
--- a/data/templates/npc/monster/21346-KetraSHeadGuard.xml
+++ b/data/templates/npc/monster/21346-KetraSHeadGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21346" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21347-KetraProphet.xml b/data/templates/npc/monster/21347-KetraProphet.xml
index 72e17dda7..73fcec258 100644
--- a/data/templates/npc/monster/21347-KetraProphet.xml
+++ b/data/templates/npc/monster/21347-KetraProphet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21347" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21348-ProphetSGuard.xml b/data/templates/npc/monster/21348-ProphetSGuard.xml
index 0e5f3786c..252493fcf 100644
--- a/data/templates/npc/monster/21348-ProphetSGuard.xml
+++ b/data/templates/npc/monster/21348-ProphetSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21348" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21349-ProphetSAide.xml b/data/templates/npc/monster/21349-ProphetSAide.xml
index 28e3cc9ed..f5e408c90 100644
--- a/data/templates/npc/monster/21349-ProphetSAide.xml
+++ b/data/templates/npc/monster/21349-ProphetSAide.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21349" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21350-VarkaSilenosRecruit.xml b/data/templates/npc/monster/21350-VarkaSilenosRecruit.xml
index e286ff0f1..9a3b47f15 100644
--- a/data/templates/npc/monster/21350-VarkaSilenosRecruit.xml
+++ b/data/templates/npc/monster/21350-VarkaSilenosRecruit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21350" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21351-VarkaSilenosFootman.xml b/data/templates/npc/monster/21351-VarkaSilenosFootman.xml
index 1e760002a..707dfc527 100644
--- a/data/templates/npc/monster/21351-VarkaSilenosFootman.xml
+++ b/data/templates/npc/monster/21351-VarkaSilenosFootman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21351" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21352-GrazingAntelope.xml b/data/templates/npc/monster/21352-GrazingAntelope.xml
index 66507df88..09644c864 100644
--- a/data/templates/npc/monster/21352-GrazingAntelope.xml
+++ b/data/templates/npc/monster/21352-GrazingAntelope.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21352" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21353-VarkaSilenosScout.xml b/data/templates/npc/monster/21353-VarkaSilenosScout.xml
index 178e228fd..217039496 100644
--- a/data/templates/npc/monster/21353-VarkaSilenosScout.xml
+++ b/data/templates/npc/monster/21353-VarkaSilenosScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21353" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21354-VarkaSilenosHunter.xml b/data/templates/npc/monster/21354-VarkaSilenosHunter.xml
index 670c12d9c..77b96bc34 100644
--- a/data/templates/npc/monster/21354-VarkaSilenosHunter.xml
+++ b/data/templates/npc/monster/21354-VarkaSilenosHunter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21354" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21355-VarkaSilenosShaman.xml b/data/templates/npc/monster/21355-VarkaSilenosShaman.xml
index ee21d2036..1b760c8fd 100644
--- a/data/templates/npc/monster/21355-VarkaSilenosShaman.xml
+++ b/data/templates/npc/monster/21355-VarkaSilenosShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21355" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21356-GrazingNepenthes.xml b/data/templates/npc/monster/21356-GrazingNepenthes.xml
index 5418c4e84..19d78dab3 100644
--- a/data/templates/npc/monster/21356-GrazingNepenthes.xml
+++ b/data/templates/npc/monster/21356-GrazingNepenthes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21356" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21357-VarkaSilenosPriest.xml b/data/templates/npc/monster/21357-VarkaSilenosPriest.xml
index 4e3cf5ad6..98e9ba296 100644
--- a/data/templates/npc/monster/21357-VarkaSilenosPriest.xml
+++ b/data/templates/npc/monster/21357-VarkaSilenosPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21357" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21358-VarkaSilenosWarrior.xml b/data/templates/npc/monster/21358-VarkaSilenosWarrior.xml
index 6970af5d1..5763da419 100644
--- a/data/templates/npc/monster/21358-VarkaSilenosWarrior.xml
+++ b/data/templates/npc/monster/21358-VarkaSilenosWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21358" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21359-GrazingBandersnatch.xml b/data/templates/npc/monster/21359-GrazingBandersnatch.xml
index 139293100..d63d70749 100644
--- a/data/templates/npc/monster/21359-GrazingBandersnatch.xml
+++ b/data/templates/npc/monster/21359-GrazingBandersnatch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21359" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21360-VarkaSilenosMedium.xml b/data/templates/npc/monster/21360-VarkaSilenosMedium.xml
index b94229d20..ac1fa8bed 100644
--- a/data/templates/npc/monster/21360-VarkaSilenosMedium.xml
+++ b/data/templates/npc/monster/21360-VarkaSilenosMedium.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21360" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21361-VarkaSilenosMagus.xml b/data/templates/npc/monster/21361-VarkaSilenosMagus.xml
index 84ad6e523..b7b40aacf 100644
--- a/data/templates/npc/monster/21361-VarkaSilenosMagus.xml
+++ b/data/templates/npc/monster/21361-VarkaSilenosMagus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21361" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21362-VarkaSilenosOfficer.xml b/data/templates/npc/monster/21362-VarkaSilenosOfficer.xml
index e4b7fd60d..8ca9896c3 100644
--- a/data/templates/npc/monster/21362-VarkaSilenosOfficer.xml
+++ b/data/templates/npc/monster/21362-VarkaSilenosOfficer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21362" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21363-GrazingFlava.xml b/data/templates/npc/monster/21363-GrazingFlava.xml
index a1c06fb08..11e54ecc1 100644
--- a/data/templates/npc/monster/21363-GrazingFlava.xml
+++ b/data/templates/npc/monster/21363-GrazingFlava.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21363" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21364-VarkaSilenosSeer.xml b/data/templates/npc/monster/21364-VarkaSilenosSeer.xml
index 392d5f18f..023628725 100644
--- a/data/templates/npc/monster/21364-VarkaSilenosSeer.xml
+++ b/data/templates/npc/monster/21364-VarkaSilenosSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21364" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21365-VarkaSilenosGreatMagus.xml b/data/templates/npc/monster/21365-VarkaSilenosGreatMagus.xml
index 5d5fd858f..4a831a793 100644
--- a/data/templates/npc/monster/21365-VarkaSilenosGreatMagus.xml
+++ b/data/templates/npc/monster/21365-VarkaSilenosGreatMagus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21365" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21366-VarkaSilenosGeneral.xml b/data/templates/npc/monster/21366-VarkaSilenosGeneral.xml
index ad146fa5d..62a13ea6c 100644
--- a/data/templates/npc/monster/21366-VarkaSilenosGeneral.xml
+++ b/data/templates/npc/monster/21366-VarkaSilenosGeneral.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21366" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21367-GrazingElderAntelope.xml b/data/templates/npc/monster/21367-GrazingElderAntelope.xml
index 022a32ea8..686700686 100644
--- a/data/templates/npc/monster/21367-GrazingElderAntelope.xml
+++ b/data/templates/npc/monster/21367-GrazingElderAntelope.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21367" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21368-VarkaSilenosGreatSeer.xml b/data/templates/npc/monster/21368-VarkaSilenosGreatSeer.xml
index 25093f0ba..13a8454f3 100644
--- a/data/templates/npc/monster/21368-VarkaSilenosGreatSeer.xml
+++ b/data/templates/npc/monster/21368-VarkaSilenosGreatSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21368" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21369-VarkaSCommander.xml b/data/templates/npc/monster/21369-VarkaSCommander.xml
index 2ee00cc4b..63f442c6c 100644
--- a/data/templates/npc/monster/21369-VarkaSCommander.xml
+++ b/data/templates/npc/monster/21369-VarkaSCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21369" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21370-VarkaSEliteGuard.xml b/data/templates/npc/monster/21370-VarkaSEliteGuard.xml
index e40cc83d5..568c6412e 100644
--- a/data/templates/npc/monster/21370-VarkaSEliteGuard.xml
+++ b/data/templates/npc/monster/21370-VarkaSEliteGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21370" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21371-VarkaSHeadMagus.xml b/data/templates/npc/monster/21371-VarkaSHeadMagus.xml
index 16372b443..09ecb8538 100644
--- a/data/templates/npc/monster/21371-VarkaSHeadMagus.xml
+++ b/data/templates/npc/monster/21371-VarkaSHeadMagus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21371" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21372-VarkaSHeadGuard.xml b/data/templates/npc/monster/21372-VarkaSHeadGuard.xml
index a359a8795..d65cddd1b 100644
--- a/data/templates/npc/monster/21372-VarkaSHeadGuard.xml
+++ b/data/templates/npc/monster/21372-VarkaSHeadGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21372" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21373-VarkaSProphet.xml b/data/templates/npc/monster/21373-VarkaSProphet.xml
index b0a3fdb03..42a5f7be4 100644
--- a/data/templates/npc/monster/21373-VarkaSProphet.xml
+++ b/data/templates/npc/monster/21373-VarkaSProphet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21373" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21374-ProphetGuard.xml b/data/templates/npc/monster/21374-ProphetGuard.xml
index 218551cf2..84d410717 100644
--- a/data/templates/npc/monster/21374-ProphetGuard.xml
+++ b/data/templates/npc/monster/21374-ProphetGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21374" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21375-DiscipleOfProphet.xml b/data/templates/npc/monster/21375-DiscipleOfProphet.xml
index 7c0baa327..818bc8c59 100644
--- a/data/templates/npc/monster/21375-DiscipleOfProphet.xml
+++ b/data/templates/npc/monster/21375-DiscipleOfProphet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21375" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21376-ScarletStakatoWorker.xml b/data/templates/npc/monster/21376-ScarletStakatoWorker.xml
index d818d0cca..ebb74da6c 100644
--- a/data/templates/npc/monster/21376-ScarletStakatoWorker.xml
+++ b/data/templates/npc/monster/21376-ScarletStakatoWorker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21376" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21377-ScarletStakatoSoldier.xml b/data/templates/npc/monster/21377-ScarletStakatoSoldier.xml
index de99f7a2e..540270914 100644
--- a/data/templates/npc/monster/21377-ScarletStakatoSoldier.xml
+++ b/data/templates/npc/monster/21377-ScarletStakatoSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21377" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21378-ScarletStakatoNoble.xml b/data/templates/npc/monster/21378-ScarletStakatoNoble.xml
index e755c902b..dd6a1b0ef 100644
--- a/data/templates/npc/monster/21378-ScarletStakatoNoble.xml
+++ b/data/templates/npc/monster/21378-ScarletStakatoNoble.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21378" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21379-TepraScorpion.xml b/data/templates/npc/monster/21379-TepraScorpion.xml
index 3d6f64f7e..dcefa348c 100644
--- a/data/templates/npc/monster/21379-TepraScorpion.xml
+++ b/data/templates/npc/monster/21379-TepraScorpion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21379" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21380-TepraScarab.xml b/data/templates/npc/monster/21380-TepraScarab.xml
index 6e808e8f0..709356651 100644
--- a/data/templates/npc/monster/21380-TepraScarab.xml
+++ b/data/templates/npc/monster/21380-TepraScarab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21380" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21381-AssassinBeetle.xml b/data/templates/npc/monster/21381-AssassinBeetle.xml
index 09e25e70d..82f7614cc 100644
--- a/data/templates/npc/monster/21381-AssassinBeetle.xml
+++ b/data/templates/npc/monster/21381-AssassinBeetle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21381" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21382-MercenaryOfDestruction.xml b/data/templates/npc/monster/21382-MercenaryOfDestruction.xml
index b0ce28109..01a08bc42 100644
--- a/data/templates/npc/monster/21382-MercenaryOfDestruction.xml
+++ b/data/templates/npc/monster/21382-MercenaryOfDestruction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21382" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21383-KnightOfDestruction.xml b/data/templates/npc/monster/21383-KnightOfDestruction.xml
index efbbe4e2e..cc21ffd1c 100644
--- a/data/templates/npc/monster/21383-KnightOfDestruction.xml
+++ b/data/templates/npc/monster/21383-KnightOfDestruction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21383" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21384-NecromancerOfDestruction.xml b/data/templates/npc/monster/21384-NecromancerOfDestruction.xml
index e83a90423..6549df18a 100644
--- a/data/templates/npc/monster/21384-NecromancerOfDestruction.xml
+++ b/data/templates/npc/monster/21384-NecromancerOfDestruction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21384" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21385-LavastoneGolem.xml b/data/templates/npc/monster/21385-LavastoneGolem.xml
index 25f0dc8f6..86dc93ac0 100644
--- a/data/templates/npc/monster/21385-LavastoneGolem.xml
+++ b/data/templates/npc/monster/21385-LavastoneGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21385" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21386-MagmaGolem.xml b/data/templates/npc/monster/21386-MagmaGolem.xml
index 6d9eedfa5..523bc8b5e 100644
--- a/data/templates/npc/monster/21386-MagmaGolem.xml
+++ b/data/templates/npc/monster/21386-MagmaGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21386" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21387-ArimanesOfDestruction.xml b/data/templates/npc/monster/21387-ArimanesOfDestruction.xml
index 843e66527..d6872d214 100644
--- a/data/templates/npc/monster/21387-ArimanesOfDestruction.xml
+++ b/data/templates/npc/monster/21387-ArimanesOfDestruction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21387" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21388-IblisOfDestruction.xml b/data/templates/npc/monster/21388-IblisOfDestruction.xml
index b195dd95b..ef8a08e37 100644
--- a/data/templates/npc/monster/21388-IblisOfDestruction.xml
+++ b/data/templates/npc/monster/21388-IblisOfDestruction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21388" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21389-BalrogOfDestruction.xml b/data/templates/npc/monster/21389-BalrogOfDestruction.xml
index 1b8662eef..54266ba95 100644
--- a/data/templates/npc/monster/21389-BalrogOfDestruction.xml
+++ b/data/templates/npc/monster/21389-BalrogOfDestruction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21389" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21390-AshurasOfDestruction.xml b/data/templates/npc/monster/21390-AshurasOfDestruction.xml
index aa37cb9df..7ff4ebdd3 100644
--- a/data/templates/npc/monster/21390-AshurasOfDestruction.xml
+++ b/data/templates/npc/monster/21390-AshurasOfDestruction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21390" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21391-Lavasillisk.xml b/data/templates/npc/monster/21391-Lavasillisk.xml
index d63b51166..6a254f603 100644
--- a/data/templates/npc/monster/21391-Lavasillisk.xml
+++ b/data/templates/npc/monster/21391-Lavasillisk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21391" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21392-BlazingIfrit.xml b/data/templates/npc/monster/21392-BlazingIfrit.xml
index 6b1410470..8d3867a78 100644
--- a/data/templates/npc/monster/21392-BlazingIfrit.xml
+++ b/data/templates/npc/monster/21392-BlazingIfrit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21392" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21393-MagmaDrake.xml b/data/templates/npc/monster/21393-MagmaDrake.xml
index 2eaa4f2e2..4ac1e651d 100644
--- a/data/templates/npc/monster/21393-MagmaDrake.xml
+++ b/data/templates/npc/monster/21393-MagmaDrake.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21393" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21394-Lavasaurus.xml b/data/templates/npc/monster/21394-Lavasaurus.xml
index 8c0a158ad..8c9b5d158 100644
--- a/data/templates/npc/monster/21394-Lavasaurus.xml
+++ b/data/templates/npc/monster/21394-Lavasaurus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21394" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21395-ElderLavasaurus.xml b/data/templates/npc/monster/21395-ElderLavasaurus.xml
index e04ff23ef..d83c79bb8 100644
--- a/data/templates/npc/monster/21395-ElderLavasaurus.xml
+++ b/data/templates/npc/monster/21395-ElderLavasaurus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21395" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21396-CarrionScarab.xml b/data/templates/npc/monster/21396-CarrionScarab.xml
index c90e2e4e7..609e137fb 100644
--- a/data/templates/npc/monster/21396-CarrionScarab.xml
+++ b/data/templates/npc/monster/21396-CarrionScarab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21396" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21397-CarrionScarab.xml b/data/templates/npc/monster/21397-CarrionScarab.xml
index b103834f0..1d4d4b264 100644
--- a/data/templates/npc/monster/21397-CarrionScarab.xml
+++ b/data/templates/npc/monster/21397-CarrionScarab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21397" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21398-SoldierScarab.xml b/data/templates/npc/monster/21398-SoldierScarab.xml
index 1b04ded54..d472d3a8f 100644
--- a/data/templates/npc/monster/21398-SoldierScarab.xml
+++ b/data/templates/npc/monster/21398-SoldierScarab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21398" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21399-SoldierScarab.xml b/data/templates/npc/monster/21399-SoldierScarab.xml
index 59b15778c..a9824439f 100644
--- a/data/templates/npc/monster/21399-SoldierScarab.xml
+++ b/data/templates/npc/monster/21399-SoldierScarab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21399" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21400-HexaBeetle.xml b/data/templates/npc/monster/21400-HexaBeetle.xml
index 63a94bdfe..f9045be12 100644
--- a/data/templates/npc/monster/21400-HexaBeetle.xml
+++ b/data/templates/npc/monster/21400-HexaBeetle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21400" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21401-HexaBeetle.xml b/data/templates/npc/monster/21401-HexaBeetle.xml
index 3f201fc3e..722d07536 100644
--- a/data/templates/npc/monster/21401-HexaBeetle.xml
+++ b/data/templates/npc/monster/21401-HexaBeetle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21401" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21402-Katraxis.xml b/data/templates/npc/monster/21402-Katraxis.xml
index 07ad790d9..25b881248 100644
--- a/data/templates/npc/monster/21402-Katraxis.xml
+++ b/data/templates/npc/monster/21402-Katraxis.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21402" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21403-Katraxis.xml b/data/templates/npc/monster/21403-Katraxis.xml
index 99d2e9830..8de062e52 100644
--- a/data/templates/npc/monster/21403-Katraxis.xml
+++ b/data/templates/npc/monster/21403-Katraxis.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21403" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21404-TeraBeetle.xml b/data/templates/npc/monster/21404-TeraBeetle.xml
index abe326c8f..477feaa21 100644
--- a/data/templates/npc/monster/21404-TeraBeetle.xml
+++ b/data/templates/npc/monster/21404-TeraBeetle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21404" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21405-TeraBeetle.xml b/data/templates/npc/monster/21405-TeraBeetle.xml
index a468924e5..455258d37 100644
--- a/data/templates/npc/monster/21405-TeraBeetle.xml
+++ b/data/templates/npc/monster/21405-TeraBeetle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21405" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21406-KnightOfEmpire.xml b/data/templates/npc/monster/21406-KnightOfEmpire.xml
index e3326d430..2e2b88656 100644
--- a/data/templates/npc/monster/21406-KnightOfEmpire.xml
+++ b/data/templates/npc/monster/21406-KnightOfEmpire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21406" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21407-KnightOfEmpire.xml b/data/templates/npc/monster/21407-KnightOfEmpire.xml
index 2d39c06b5..48b66565c 100644
--- a/data/templates/npc/monster/21407-KnightOfEmpire.xml
+++ b/data/templates/npc/monster/21407-KnightOfEmpire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21407" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21408-RoyalGuardOfEmpire.xml b/data/templates/npc/monster/21408-RoyalGuardOfEmpire.xml
index a38cb54d2..12ed0d682 100644
--- a/data/templates/npc/monster/21408-RoyalGuardOfEmpire.xml
+++ b/data/templates/npc/monster/21408-RoyalGuardOfEmpire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21408" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21409-RoyalGuardOfEmpire.xml b/data/templates/npc/monster/21409-RoyalGuardOfEmpire.xml
index b79ef9b68..b010b73be 100644
--- a/data/templates/npc/monster/21409-RoyalGuardOfEmpire.xml
+++ b/data/templates/npc/monster/21409-RoyalGuardOfEmpire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21409" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21410-GuardianScarab.xml b/data/templates/npc/monster/21410-GuardianScarab.xml
index 9038e4578..879c22022 100644
--- a/data/templates/npc/monster/21410-GuardianScarab.xml
+++ b/data/templates/npc/monster/21410-GuardianScarab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21410" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21411-GuardianScarab.xml b/data/templates/npc/monster/21411-GuardianScarab.xml
index 17b044051..23a57f815 100644
--- a/data/templates/npc/monster/21411-GuardianScarab.xml
+++ b/data/templates/npc/monster/21411-GuardianScarab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21411" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21412-Ustralith.xml b/data/templates/npc/monster/21412-Ustralith.xml
index bb4381962..20768f4b8 100644
--- a/data/templates/npc/monster/21412-Ustralith.xml
+++ b/data/templates/npc/monster/21412-Ustralith.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21412" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21413-Ustralith.xml b/data/templates/npc/monster/21413-Ustralith.xml
index e8a6a3f71..29c7a202f 100644
--- a/data/templates/npc/monster/21413-Ustralith.xml
+++ b/data/templates/npc/monster/21413-Ustralith.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21413" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21414-AssassinOfEmpire.xml b/data/templates/npc/monster/21414-AssassinOfEmpire.xml
index 90968ef0b..52ec608a1 100644
--- a/data/templates/npc/monster/21414-AssassinOfEmpire.xml
+++ b/data/templates/npc/monster/21414-AssassinOfEmpire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21414" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21415-AssassinOfEmpire.xml b/data/templates/npc/monster/21415-AssassinOfEmpire.xml
index 5d9e6f4af..0dcd3319b 100644
--- a/data/templates/npc/monster/21415-AssassinOfEmpire.xml
+++ b/data/templates/npc/monster/21415-AssassinOfEmpire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21415" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21416-ImperialCommander.xml b/data/templates/npc/monster/21416-ImperialCommander.xml
index 4e5e910ab..1de09741f 100644
--- a/data/templates/npc/monster/21416-ImperialCommander.xml
+++ b/data/templates/npc/monster/21416-ImperialCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21416" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21417-ImperialCommander.xml b/data/templates/npc/monster/21417-ImperialCommander.xml
index 783d4ec02..f2eb962b6 100644
--- a/data/templates/npc/monster/21417-ImperialCommander.xml
+++ b/data/templates/npc/monster/21417-ImperialCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21417" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21418-ImperialRoyalGuard.xml b/data/templates/npc/monster/21418-ImperialRoyalGuard.xml
index 93573fcf1..4e6ad1e61 100644
--- a/data/templates/npc/monster/21418-ImperialRoyalGuard.xml
+++ b/data/templates/npc/monster/21418-ImperialRoyalGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21418" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21419-ImperialRoyalGuard.xml b/data/templates/npc/monster/21419-ImperialRoyalGuard.xml
index 75d8cc814..cc3af6f20 100644
--- a/data/templates/npc/monster/21419-ImperialRoyalGuard.xml
+++ b/data/templates/npc/monster/21419-ImperialRoyalGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21419" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21420-Ashuras.xml b/data/templates/npc/monster/21420-Ashuras.xml
index 3caf3c549..da0a896b0 100644
--- a/data/templates/npc/monster/21420-Ashuras.xml
+++ b/data/templates/npc/monster/21420-Ashuras.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21420" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21421-Ashuras.xml b/data/templates/npc/monster/21421-Ashuras.xml
index 9767134c9..95db65fbb 100644
--- a/data/templates/npc/monster/21421-Ashuras.xml
+++ b/data/templates/npc/monster/21421-Ashuras.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21421" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21422-DancerOfEmpire.xml b/data/templates/npc/monster/21422-DancerOfEmpire.xml
index 2d2fad369..5ffc5764f 100644
--- a/data/templates/npc/monster/21422-DancerOfEmpire.xml
+++ b/data/templates/npc/monster/21422-DancerOfEmpire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21422" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21423-DancerOfEmpire.xml b/data/templates/npc/monster/21423-DancerOfEmpire.xml
index 283fd5f9f..0e06a9908 100644
--- a/data/templates/npc/monster/21423-DancerOfEmpire.xml
+++ b/data/templates/npc/monster/21423-DancerOfEmpire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21423" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21424-Ashkenas.xml b/data/templates/npc/monster/21424-Ashkenas.xml
index 48ccc27cc..f2c3e4ea1 100644
--- a/data/templates/npc/monster/21424-Ashkenas.xml
+++ b/data/templates/npc/monster/21424-Ashkenas.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21424" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21425-Ashkenas.xml b/data/templates/npc/monster/21425-Ashkenas.xml
index 5fcf06d02..dff1df673 100644
--- a/data/templates/npc/monster/21425-Ashkenas.xml
+++ b/data/templates/npc/monster/21425-Ashkenas.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21425" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21426-Abraxion.xml b/data/templates/npc/monster/21426-Abraxion.xml
index afb8ff1f4..942bd2170 100644
--- a/data/templates/npc/monster/21426-Abraxion.xml
+++ b/data/templates/npc/monster/21426-Abraxion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21426" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21427-Abraxion.xml b/data/templates/npc/monster/21427-Abraxion.xml
index e5e523d32..088519ce7 100644
--- a/data/templates/npc/monster/21427-Abraxion.xml
+++ b/data/templates/npc/monster/21427-Abraxion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21427" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21428-Hasturan.xml b/data/templates/npc/monster/21428-Hasturan.xml
index 53b21f570..4e838d87c 100644
--- a/data/templates/npc/monster/21428-Hasturan.xml
+++ b/data/templates/npc/monster/21428-Hasturan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21428" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21429-Hasturan.xml b/data/templates/npc/monster/21429-Hasturan.xml
index 4c4a8cea7..1cf86fffe 100644
--- a/data/templates/npc/monster/21429-Hasturan.xml
+++ b/data/templates/npc/monster/21429-Hasturan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21429" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21430-Arimanes.xml b/data/templates/npc/monster/21430-Arimanes.xml
index 612b02875..6cd3c6aaa 100644
--- a/data/templates/npc/monster/21430-Arimanes.xml
+++ b/data/templates/npc/monster/21430-Arimanes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21430" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21431-Arimanes.xml b/data/templates/npc/monster/21431-Arimanes.xml
index c71681a53..22bf430c5 100644
--- a/data/templates/npc/monster/21431-Arimanes.xml
+++ b/data/templates/npc/monster/21431-Arimanes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21431" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21432-ChakramBeetle.xml b/data/templates/npc/monster/21432-ChakramBeetle.xml
index c0526cb8b..736ffb2df 100644
--- a/data/templates/npc/monster/21432-ChakramBeetle.xml
+++ b/data/templates/npc/monster/21432-ChakramBeetle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21432" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21433-JamadarBeetle.xml b/data/templates/npc/monster/21433-JamadarBeetle.xml
index 28509badf..cbb9aee5b 100644
--- a/data/templates/npc/monster/21433-JamadarBeetle.xml
+++ b/data/templates/npc/monster/21433-JamadarBeetle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21433" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21434-SeerOfBlood.xml b/data/templates/npc/monster/21434-SeerOfBlood.xml
index f92c2eede..03768dd3f 100644
--- a/data/templates/npc/monster/21434-SeerOfBlood.xml
+++ b/data/templates/npc/monster/21434-SeerOfBlood.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21434" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21435-GuideOfOffering.xml b/data/templates/npc/monster/21435-GuideOfOffering.xml
index 9a19a909c..1223d394b 100644
--- a/data/templates/npc/monster/21435-GuideOfOffering.xml
+++ b/data/templates/npc/monster/21435-GuideOfOffering.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21435" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21436-LeaderOfOffering.xml b/data/templates/npc/monster/21436-LeaderOfOffering.xml
index 02a2e3c3f..42b9f937e 100644
--- a/data/templates/npc/monster/21436-LeaderOfOffering.xml
+++ b/data/templates/npc/monster/21436-LeaderOfOffering.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21436" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21437-OfferingBug.xml b/data/templates/npc/monster/21437-OfferingBug.xml
index b1efbdc96..626ca7afa 100644
--- a/data/templates/npc/monster/21437-OfferingBug.xml
+++ b/data/templates/npc/monster/21437-OfferingBug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21437" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21438-HeathenWarrior.xml b/data/templates/npc/monster/21438-HeathenWarrior.xml
index d60c5b49b..4d7bc8994 100644
--- a/data/templates/npc/monster/21438-HeathenWarrior.xml
+++ b/data/templates/npc/monster/21438-HeathenWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21438" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21439-HeathenExecuted.xml b/data/templates/npc/monster/21439-HeathenExecuted.xml
index 5451e3e54..95ec87a81 100644
--- a/data/templates/npc/monster/21439-HeathenExecuted.xml
+++ b/data/templates/npc/monster/21439-HeathenExecuted.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21439" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21440-HeathenArcher.xml b/data/templates/npc/monster/21440-HeathenArcher.xml
index ab067001e..4f1c6b18d 100644
--- a/data/templates/npc/monster/21440-HeathenArcher.xml
+++ b/data/templates/npc/monster/21440-HeathenArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21440" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21441-HeathenGrunt.xml b/data/templates/npc/monster/21441-HeathenGrunt.xml
index 3da952bc4..7478cf8d4 100644
--- a/data/templates/npc/monster/21441-HeathenGrunt.xml
+++ b/data/templates/npc/monster/21441-HeathenGrunt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21441" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21442-HeathenKnight.xml b/data/templates/npc/monster/21442-HeathenKnight.xml
index 8c987833f..1b8e5ad4c 100644
--- a/data/templates/npc/monster/21442-HeathenKnight.xml
+++ b/data/templates/npc/monster/21442-HeathenKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21442" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21443-RaiderOfPastureland.xml b/data/templates/npc/monster/21443-RaiderOfPastureland.xml
index 55af43015..62fc16c30 100644
--- a/data/templates/npc/monster/21443-RaiderOfPastureland.xml
+++ b/data/templates/npc/monster/21443-RaiderOfPastureland.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21443" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21444-RaiderOfPastureland.xml b/data/templates/npc/monster/21444-RaiderOfPastureland.xml
index 4fb49c56f..fef86aea4 100644
--- a/data/templates/npc/monster/21444-RaiderOfPastureland.xml
+++ b/data/templates/npc/monster/21444-RaiderOfPastureland.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21444" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21445-AlpineBandersnatch.xml b/data/templates/npc/monster/21445-AlpineBandersnatch.xml
index db44920e8..d189442b9 100644
--- a/data/templates/npc/monster/21445-AlpineBandersnatch.xml
+++ b/data/templates/npc/monster/21445-AlpineBandersnatch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21445" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21446-RaiderOfPastureland.xml b/data/templates/npc/monster/21446-RaiderOfPastureland.xml
index 8e842ae4b..5d52ca561 100644
--- a/data/templates/npc/monster/21446-RaiderOfPastureland.xml
+++ b/data/templates/npc/monster/21446-RaiderOfPastureland.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21446" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21447-RaiderOfPastureland.xml b/data/templates/npc/monster/21447-RaiderOfPastureland.xml
index 79e4cc4d6..d2517cb07 100644
--- a/data/templates/npc/monster/21447-RaiderOfPastureland.xml
+++ b/data/templates/npc/monster/21447-RaiderOfPastureland.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21447" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21448-RaiderOfPastureland.xml b/data/templates/npc/monster/21448-RaiderOfPastureland.xml
index 235b553e3..88285d9a0 100644
--- a/data/templates/npc/monster/21448-RaiderOfPastureland.xml
+++ b/data/templates/npc/monster/21448-RaiderOfPastureland.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21448" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21449-RaiderOfPastureland.xml b/data/templates/npc/monster/21449-RaiderOfPastureland.xml
index cf9956fde..d97276fde 100644
--- a/data/templates/npc/monster/21449-RaiderOfPastureland.xml
+++ b/data/templates/npc/monster/21449-RaiderOfPastureland.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21449" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21450-AlpineGrendel.xml b/data/templates/npc/monster/21450-AlpineGrendel.xml
index ee466b2ad..1fc76068c 100644
--- a/data/templates/npc/monster/21450-AlpineGrendel.xml
+++ b/data/templates/npc/monster/21450-AlpineGrendel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21450" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21508-SplinterStakato.xml b/data/templates/npc/monster/21508-SplinterStakato.xml
index d42a7f774..5162f03e9 100644
--- a/data/templates/npc/monster/21508-SplinterStakato.xml
+++ b/data/templates/npc/monster/21508-SplinterStakato.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21508" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21509-SplinterStakatoWorker.xml b/data/templates/npc/monster/21509-SplinterStakatoWorker.xml
index 3547a29b6..f81fd7810 100644
--- a/data/templates/npc/monster/21509-SplinterStakatoWorker.xml
+++ b/data/templates/npc/monster/21509-SplinterStakatoWorker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21509" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21510-SplinterStakatoSoldier.xml b/data/templates/npc/monster/21510-SplinterStakatoSoldier.xml
index 54f42f16b..35155fecc 100644
--- a/data/templates/npc/monster/21510-SplinterStakatoSoldier.xml
+++ b/data/templates/npc/monster/21510-SplinterStakatoSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21510" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21511-SplinterStakatoDrone.xml b/data/templates/npc/monster/21511-SplinterStakatoDrone.xml
index 63b897085..4be5dcf8c 100644
--- a/data/templates/npc/monster/21511-SplinterStakatoDrone.xml
+++ b/data/templates/npc/monster/21511-SplinterStakatoDrone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21511" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21512-SplinterStakatoDrone.xml b/data/templates/npc/monster/21512-SplinterStakatoDrone.xml
index 4710eff6c..fc7e4c5f7 100644
--- a/data/templates/npc/monster/21512-SplinterStakatoDrone.xml
+++ b/data/templates/npc/monster/21512-SplinterStakatoDrone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21512" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21513-NeedleStakato.xml b/data/templates/npc/monster/21513-NeedleStakato.xml
index 571fc33f4..565fc5a2c 100644
--- a/data/templates/npc/monster/21513-NeedleStakato.xml
+++ b/data/templates/npc/monster/21513-NeedleStakato.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21513" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21514-NeedleStakatoWorker.xml b/data/templates/npc/monster/21514-NeedleStakatoWorker.xml
index 5ea8033c2..9cc030ff4 100644
--- a/data/templates/npc/monster/21514-NeedleStakatoWorker.xml
+++ b/data/templates/npc/monster/21514-NeedleStakatoWorker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21514" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21515-NeedleStakatoSoldier.xml b/data/templates/npc/monster/21515-NeedleStakatoSoldier.xml
index 170ca0bcc..f9370758b 100644
--- a/data/templates/npc/monster/21515-NeedleStakatoSoldier.xml
+++ b/data/templates/npc/monster/21515-NeedleStakatoSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21515" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21516-NeedleStakatoDrone.xml b/data/templates/npc/monster/21516-NeedleStakatoDrone.xml
index b9a91ac53..9cb82453a 100644
--- a/data/templates/npc/monster/21516-NeedleStakatoDrone.xml
+++ b/data/templates/npc/monster/21516-NeedleStakatoDrone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21516" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21517-NeedleStakatoDrone.xml b/data/templates/npc/monster/21517-NeedleStakatoDrone.xml
index c98cd2cdf..0bd0fbc02 100644
--- a/data/templates/npc/monster/21517-NeedleStakatoDrone.xml
+++ b/data/templates/npc/monster/21517-NeedleStakatoDrone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21517" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21518-FrenzyStakatoSoldier.xml b/data/templates/npc/monster/21518-FrenzyStakatoSoldier.xml
index 6c7f03850..69e6a193f 100644
--- a/data/templates/npc/monster/21518-FrenzyStakatoSoldier.xml
+++ b/data/templates/npc/monster/21518-FrenzyStakatoSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21518" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21519-FrenzyStakatoDrone.xml b/data/templates/npc/monster/21519-FrenzyStakatoDrone.xml
index 15d262aec..b07b10bd1 100644
--- a/data/templates/npc/monster/21519-FrenzyStakatoDrone.xml
+++ b/data/templates/npc/monster/21519-FrenzyStakatoDrone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21519" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21520-EyeOfSplendor.xml b/data/templates/npc/monster/21520-EyeOfSplendor.xml
index 2e66bf74b..dc7360a38 100644
--- a/data/templates/npc/monster/21520-EyeOfSplendor.xml
+++ b/data/templates/npc/monster/21520-EyeOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21520" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21521-ClawsOfSplendor.xml b/data/templates/npc/monster/21521-ClawsOfSplendor.xml
index c25bf7dcf..26057bce9 100644
--- a/data/templates/npc/monster/21521-ClawsOfSplendor.xml
+++ b/data/templates/npc/monster/21521-ClawsOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21521" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21522-ClawsOfSplendor.xml b/data/templates/npc/monster/21522-ClawsOfSplendor.xml
index 253002b58..34fdf427d 100644
--- a/data/templates/npc/monster/21522-ClawsOfSplendor.xml
+++ b/data/templates/npc/monster/21522-ClawsOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21522" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21523-FlashOfSplendor.xml b/data/templates/npc/monster/21523-FlashOfSplendor.xml
index 6857aa2f5..ca5946641 100644
--- a/data/templates/npc/monster/21523-FlashOfSplendor.xml
+++ b/data/templates/npc/monster/21523-FlashOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21523" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21524-BladeOfSplendor.xml b/data/templates/npc/monster/21524-BladeOfSplendor.xml
index fb229a3ea..44ee75b53 100644
--- a/data/templates/npc/monster/21524-BladeOfSplendor.xml
+++ b/data/templates/npc/monster/21524-BladeOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21524" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21525-BladeOfSplendor.xml b/data/templates/npc/monster/21525-BladeOfSplendor.xml
index 7352b0782..641742ef0 100644
--- a/data/templates/npc/monster/21525-BladeOfSplendor.xml
+++ b/data/templates/npc/monster/21525-BladeOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21525" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21526-WisdomOfSplendor.xml b/data/templates/npc/monster/21526-WisdomOfSplendor.xml
index 0b979a565..edf64b71c 100644
--- a/data/templates/npc/monster/21526-WisdomOfSplendor.xml
+++ b/data/templates/npc/monster/21526-WisdomOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21526" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21527-AngerOfSplendor.xml b/data/templates/npc/monster/21527-AngerOfSplendor.xml
index 2dbf39452..992013856 100644
--- a/data/templates/npc/monster/21527-AngerOfSplendor.xml
+++ b/data/templates/npc/monster/21527-AngerOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21527" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21528-AngerOfSplendor.xml b/data/templates/npc/monster/21528-AngerOfSplendor.xml
index c3b6bc940..5265c7783 100644
--- a/data/templates/npc/monster/21528-AngerOfSplendor.xml
+++ b/data/templates/npc/monster/21528-AngerOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21528" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21529-SoulOfSplendor.xml b/data/templates/npc/monster/21529-SoulOfSplendor.xml
index a51a6d9f6..b0d334b61 100644
--- a/data/templates/npc/monster/21529-SoulOfSplendor.xml
+++ b/data/templates/npc/monster/21529-SoulOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21529" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21530-VictoryOfSplendor.xml b/data/templates/npc/monster/21530-VictoryOfSplendor.xml
index f28857049..bd6e447b6 100644
--- a/data/templates/npc/monster/21530-VictoryOfSplendor.xml
+++ b/data/templates/npc/monster/21530-VictoryOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21530" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21531-PunishmentOfSplendor.xml b/data/templates/npc/monster/21531-PunishmentOfSplendor.xml
index 9d2cbd35d..054e51d95 100644
--- a/data/templates/npc/monster/21531-PunishmentOfSplendor.xml
+++ b/data/templates/npc/monster/21531-PunishmentOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21531" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21532-ShoutOfSplendor.xml b/data/templates/npc/monster/21532-ShoutOfSplendor.xml
index a7b543f6c..33bd98686 100644
--- a/data/templates/npc/monster/21532-ShoutOfSplendor.xml
+++ b/data/templates/npc/monster/21532-ShoutOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21532" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21533-AllianceOfSplendor.xml b/data/templates/npc/monster/21533-AllianceOfSplendor.xml
index cc71b0c48..ec94f89a1 100644
--- a/data/templates/npc/monster/21533-AllianceOfSplendor.xml
+++ b/data/templates/npc/monster/21533-AllianceOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21533" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21534-AllianceOfSplendor.xml b/data/templates/npc/monster/21534-AllianceOfSplendor.xml
index e262d6096..45b94a43c 100644
--- a/data/templates/npc/monster/21534-AllianceOfSplendor.xml
+++ b/data/templates/npc/monster/21534-AllianceOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21534" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21535-SignetOfSplendor.xml b/data/templates/npc/monster/21535-SignetOfSplendor.xml
index 9c6201f20..5836683a3 100644
--- a/data/templates/npc/monster/21535-SignetOfSplendor.xml
+++ b/data/templates/npc/monster/21535-SignetOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21535" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21536-CrownOfSplendor.xml b/data/templates/npc/monster/21536-CrownOfSplendor.xml
index d866d049a..f72020991 100644
--- a/data/templates/npc/monster/21536-CrownOfSplendor.xml
+++ b/data/templates/npc/monster/21536-CrownOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21536" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21537-FangOfSplendor.xml b/data/templates/npc/monster/21537-FangOfSplendor.xml
index ef43c972f..37d6ee2d7 100644
--- a/data/templates/npc/monster/21537-FangOfSplendor.xml
+++ b/data/templates/npc/monster/21537-FangOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21537" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21538-FangOfSplendor.xml b/data/templates/npc/monster/21538-FangOfSplendor.xml
index bd0b1e950..c758a7441 100644
--- a/data/templates/npc/monster/21538-FangOfSplendor.xml
+++ b/data/templates/npc/monster/21538-FangOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21538" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21539-WailingOfSplendor.xml b/data/templates/npc/monster/21539-WailingOfSplendor.xml
index b8c071b5d..e319c04f5 100644
--- a/data/templates/npc/monster/21539-WailingOfSplendor.xml
+++ b/data/templates/npc/monster/21539-WailingOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21539" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21540-WailingOfSplendor.xml b/data/templates/npc/monster/21540-WailingOfSplendor.xml
index 8910b9088..7f6659509 100644
--- a/data/templates/npc/monster/21540-WailingOfSplendor.xml
+++ b/data/templates/npc/monster/21540-WailingOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21540" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21541-PilgrimOfSplendor.xml b/data/templates/npc/monster/21541-PilgrimOfSplendor.xml
index 597cf5c40..f1e1f8bd7 100644
--- a/data/templates/npc/monster/21541-PilgrimOfSplendor.xml
+++ b/data/templates/npc/monster/21541-PilgrimOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21541" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21542-DiscipleOfPilgrim.xml b/data/templates/npc/monster/21542-DiscipleOfPilgrim.xml
index 2e115a0f2..698e68769 100644
--- a/data/templates/npc/monster/21542-DiscipleOfPilgrim.xml
+++ b/data/templates/npc/monster/21542-DiscipleOfPilgrim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21542" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21543-PageOfPilgrim.xml b/data/templates/npc/monster/21543-PageOfPilgrim.xml
index b90dc6d76..b9f2b3b7c 100644
--- a/data/templates/npc/monster/21543-PageOfPilgrim.xml
+++ b/data/templates/npc/monster/21543-PageOfPilgrim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21543" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21544-JudgeOfSplendor.xml b/data/templates/npc/monster/21544-JudgeOfSplendor.xml
index 741e5a609..1980413fe 100644
--- a/data/templates/npc/monster/21544-JudgeOfSplendor.xml
+++ b/data/templates/npc/monster/21544-JudgeOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21544" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21545-JudgeOfFire.xml b/data/templates/npc/monster/21545-JudgeOfFire.xml
index 4e7125d95..f87944494 100644
--- a/data/templates/npc/monster/21545-JudgeOfFire.xml
+++ b/data/templates/npc/monster/21545-JudgeOfFire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21545" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21546-JudgeOfLight.xml b/data/templates/npc/monster/21546-JudgeOfLight.xml
index 6577f589a..87122e8b6 100644
--- a/data/templates/npc/monster/21546-JudgeOfLight.xml
+++ b/data/templates/npc/monster/21546-JudgeOfLight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21546" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21547-CorruptedKnight.xml b/data/templates/npc/monster/21547-CorruptedKnight.xml
index 5d13f1f1d..ad0585445 100644
--- a/data/templates/npc/monster/21547-CorruptedKnight.xml
+++ b/data/templates/npc/monster/21547-CorruptedKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21547" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21548-ResurrectedKnight.xml b/data/templates/npc/monster/21548-ResurrectedKnight.xml
index b391523d6..ac2799db8 100644
--- a/data/templates/npc/monster/21548-ResurrectedKnight.xml
+++ b/data/templates/npc/monster/21548-ResurrectedKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21548" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21549-CorruptedGuard.xml b/data/templates/npc/monster/21549-CorruptedGuard.xml
index 099a16915..c812bdce7 100644
--- a/data/templates/npc/monster/21549-CorruptedGuard.xml
+++ b/data/templates/npc/monster/21549-CorruptedGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21549" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21550-CorruptedGuard.xml b/data/templates/npc/monster/21550-CorruptedGuard.xml
index 78f53d0f2..a81c2b592 100644
--- a/data/templates/npc/monster/21550-CorruptedGuard.xml
+++ b/data/templates/npc/monster/21550-CorruptedGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21550" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21551-ResurrectedGuard.xml b/data/templates/npc/monster/21551-ResurrectedGuard.xml
index 70ac8ecaa..ff905781b 100644
--- a/data/templates/npc/monster/21551-ResurrectedGuard.xml
+++ b/data/templates/npc/monster/21551-ResurrectedGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21551" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21552-ResurrectedGuard.xml b/data/templates/npc/monster/21552-ResurrectedGuard.xml
index 7c1ddac27..cc96a1b85 100644
--- a/data/templates/npc/monster/21552-ResurrectedGuard.xml
+++ b/data/templates/npc/monster/21552-ResurrectedGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21552" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21553-TrampledMan.xml b/data/templates/npc/monster/21553-TrampledMan.xml
index 285ea64d8..aa2cbdaf1 100644
--- a/data/templates/npc/monster/21553-TrampledMan.xml
+++ b/data/templates/npc/monster/21553-TrampledMan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21553" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21554-TrampledMan.xml b/data/templates/npc/monster/21554-TrampledMan.xml
index bef9e0714..61ef94e28 100644
--- a/data/templates/npc/monster/21554-TrampledMan.xml
+++ b/data/templates/npc/monster/21554-TrampledMan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21554" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21555-SlaughterExecutioner.xml b/data/templates/npc/monster/21555-SlaughterExecutioner.xml
index 1e2cc863d..53fc7f990 100644
--- a/data/templates/npc/monster/21555-SlaughterExecutioner.xml
+++ b/data/templates/npc/monster/21555-SlaughterExecutioner.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21555" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21556-SlaughterExecutioner.xml b/data/templates/npc/monster/21556-SlaughterExecutioner.xml
index b40b5c9bb..a3ac0a5b2 100644
--- a/data/templates/npc/monster/21556-SlaughterExecutioner.xml
+++ b/data/templates/npc/monster/21556-SlaughterExecutioner.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21556" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21557-BoneSnatcher.xml b/data/templates/npc/monster/21557-BoneSnatcher.xml
index e2772061c..1c139c149 100644
--- a/data/templates/npc/monster/21557-BoneSnatcher.xml
+++ b/data/templates/npc/monster/21557-BoneSnatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21557" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21558-BoneSnatcher.xml b/data/templates/npc/monster/21558-BoneSnatcher.xml
index d53b9e6df..405350a81 100644
--- a/data/templates/npc/monster/21558-BoneSnatcher.xml
+++ b/data/templates/npc/monster/21558-BoneSnatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21558" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21559-BoneMaker.xml b/data/templates/npc/monster/21559-BoneMaker.xml
index 3084b748d..580d95fe9 100644
--- a/data/templates/npc/monster/21559-BoneMaker.xml
+++ b/data/templates/npc/monster/21559-BoneMaker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21559" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21560-BoneShaper.xml b/data/templates/npc/monster/21560-BoneShaper.xml
index fd4ab147a..0f9ff3141 100644
--- a/data/templates/npc/monster/21560-BoneShaper.xml
+++ b/data/templates/npc/monster/21560-BoneShaper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21560" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21561-SacrificedMan.xml b/data/templates/npc/monster/21561-SacrificedMan.xml
index 45f477245..c6655a46c 100644
--- a/data/templates/npc/monster/21561-SacrificedMan.xml
+++ b/data/templates/npc/monster/21561-SacrificedMan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21561" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21562-GuillotineSGhost.xml b/data/templates/npc/monster/21562-GuillotineSGhost.xml
index 2d1c457ac..723488cc4 100644
--- a/data/templates/npc/monster/21562-GuillotineSGhost.xml
+++ b/data/templates/npc/monster/21562-GuillotineSGhost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21562" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21563-BoneCollector.xml b/data/templates/npc/monster/21563-BoneCollector.xml
index 61d29fbe5..8c8dec2f7 100644
--- a/data/templates/npc/monster/21563-BoneCollector.xml
+++ b/data/templates/npc/monster/21563-BoneCollector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21563" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21564-SkullCollector.xml b/data/templates/npc/monster/21564-SkullCollector.xml
index 43100e73b..bdcec7e7d 100644
--- a/data/templates/npc/monster/21564-SkullCollector.xml
+++ b/data/templates/npc/monster/21564-SkullCollector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21564" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21565-BoneAnimator.xml b/data/templates/npc/monster/21565-BoneAnimator.xml
index d978ad8c2..a267edd75 100644
--- a/data/templates/npc/monster/21565-BoneAnimator.xml
+++ b/data/templates/npc/monster/21565-BoneAnimator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21565" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21566-SkullAnimator.xml b/data/templates/npc/monster/21566-SkullAnimator.xml
index 0d04cfcc1..6f76bd5f3 100644
--- a/data/templates/npc/monster/21566-SkullAnimator.xml
+++ b/data/templates/npc/monster/21566-SkullAnimator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21566" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21567-BoneSlayer.xml b/data/templates/npc/monster/21567-BoneSlayer.xml
index 3c450ee31..880a6385f 100644
--- a/data/templates/npc/monster/21567-BoneSlayer.xml
+++ b/data/templates/npc/monster/21567-BoneSlayer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21567" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21568-DevilBat.xml b/data/templates/npc/monster/21568-DevilBat.xml
index 22e71f1f2..1fc5ea2ef 100644
--- a/data/templates/npc/monster/21568-DevilBat.xml
+++ b/data/templates/npc/monster/21568-DevilBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21568" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21569-DevilBat.xml b/data/templates/npc/monster/21569-DevilBat.xml
index e2117a134..1d005e011 100644
--- a/data/templates/npc/monster/21569-DevilBat.xml
+++ b/data/templates/npc/monster/21569-DevilBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21569" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21570-GhostOfBetrayer.xml b/data/templates/npc/monster/21570-GhostOfBetrayer.xml
index 1508ff7a9..6ba19df7d 100644
--- a/data/templates/npc/monster/21570-GhostOfBetrayer.xml
+++ b/data/templates/npc/monster/21570-GhostOfBetrayer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21570" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21571-GhostOfRebellionSoldier.xml b/data/templates/npc/monster/21571-GhostOfRebellionSoldier.xml
index 5d570cf8f..a819fb44d 100644
--- a/data/templates/npc/monster/21571-GhostOfRebellionSoldier.xml
+++ b/data/templates/npc/monster/21571-GhostOfRebellionSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21571" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21572-BoneSweeper.xml b/data/templates/npc/monster/21572-BoneSweeper.xml
index 35af28083..0c38c65ea 100644
--- a/data/templates/npc/monster/21572-BoneSweeper.xml
+++ b/data/templates/npc/monster/21572-BoneSweeper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21572" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21573-Atrox.xml b/data/templates/npc/monster/21573-Atrox.xml
index f6ff7c074..1a2765744 100644
--- a/data/templates/npc/monster/21573-Atrox.xml
+++ b/data/templates/npc/monster/21573-Atrox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21573" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21574-BoneGrinder.xml b/data/templates/npc/monster/21574-BoneGrinder.xml
index 95fed2de4..0f63fa20b 100644
--- a/data/templates/npc/monster/21574-BoneGrinder.xml
+++ b/data/templates/npc/monster/21574-BoneGrinder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21574" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21575-BoneGrinder.xml b/data/templates/npc/monster/21575-BoneGrinder.xml
index ae07673f6..39d29d389 100644
--- a/data/templates/npc/monster/21575-BoneGrinder.xml
+++ b/data/templates/npc/monster/21575-BoneGrinder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21575" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21576-GhostOfGuillotine.xml b/data/templates/npc/monster/21576-GhostOfGuillotine.xml
index bb504c516..cd2750e88 100644
--- a/data/templates/npc/monster/21576-GhostOfGuillotine.xml
+++ b/data/templates/npc/monster/21576-GhostOfGuillotine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21576" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21577-GhostOfGuillotine.xml b/data/templates/npc/monster/21577-GhostOfGuillotine.xml
index d65cd08d4..6d1e012e9 100644
--- a/data/templates/npc/monster/21577-GhostOfGuillotine.xml
+++ b/data/templates/npc/monster/21577-GhostOfGuillotine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21577" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21578-BehemothZombie.xml b/data/templates/npc/monster/21578-BehemothZombie.xml
index 05599ae90..c5a261e06 100644
--- a/data/templates/npc/monster/21578-BehemothZombie.xml
+++ b/data/templates/npc/monster/21578-BehemothZombie.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21578" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21579-GhostOfRebellionLeader.xml b/data/templates/npc/monster/21579-GhostOfRebellionLeader.xml
index ff1eb5490..39a814c1e 100644
--- a/data/templates/npc/monster/21579-GhostOfRebellionLeader.xml
+++ b/data/templates/npc/monster/21579-GhostOfRebellionLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21579" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21580-BoneCaster.xml b/data/templates/npc/monster/21580-BoneCaster.xml
index 4687e752a..22c6a77ba 100644
--- a/data/templates/npc/monster/21580-BoneCaster.xml
+++ b/data/templates/npc/monster/21580-BoneCaster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21580" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21581-BonePuppeteer.xml b/data/templates/npc/monster/21581-BonePuppeteer.xml
index a39099103..222e1543e 100644
--- a/data/templates/npc/monster/21581-BonePuppeteer.xml
+++ b/data/templates/npc/monster/21581-BonePuppeteer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21581" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21582-VampireSoldier.xml b/data/templates/npc/monster/21582-VampireSoldier.xml
index 64fcce7d2..336a03bf7 100644
--- a/data/templates/npc/monster/21582-VampireSoldier.xml
+++ b/data/templates/npc/monster/21582-VampireSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21582" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21583-BoneScavenger.xml b/data/templates/npc/monster/21583-BoneScavenger.xml
index 89a6a02a2..588221aeb 100644
--- a/data/templates/npc/monster/21583-BoneScavenger.xml
+++ b/data/templates/npc/monster/21583-BoneScavenger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21583" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21584-BoneScavenger.xml b/data/templates/npc/monster/21584-BoneScavenger.xml
index e2df23d3e..3ad52846e 100644
--- a/data/templates/npc/monster/21584-BoneScavenger.xml
+++ b/data/templates/npc/monster/21584-BoneScavenger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21584" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21585-VampireMagician.xml b/data/templates/npc/monster/21585-VampireMagician.xml
index 848735d1c..d786813e3 100644
--- a/data/templates/npc/monster/21585-VampireMagician.xml
+++ b/data/templates/npc/monster/21585-VampireMagician.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21585" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21586-VampireAdept.xml b/data/templates/npc/monster/21586-VampireAdept.xml
index f4a1fda04..e83ea0b7b 100644
--- a/data/templates/npc/monster/21586-VampireAdept.xml
+++ b/data/templates/npc/monster/21586-VampireAdept.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21586" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21587-VampireWarrior.xml b/data/templates/npc/monster/21587-VampireWarrior.xml
index ed1987519..5affb48b5 100644
--- a/data/templates/npc/monster/21587-VampireWarrior.xml
+++ b/data/templates/npc/monster/21587-VampireWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21587" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21588-VampireWizard.xml b/data/templates/npc/monster/21588-VampireWizard.xml
index 7b5243fae..eb2a09ad0 100644
--- a/data/templates/npc/monster/21588-VampireWizard.xml
+++ b/data/templates/npc/monster/21588-VampireWizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21588" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21589-VampireWizard.xml b/data/templates/npc/monster/21589-VampireWizard.xml
index 0af7cce6c..1ee516923 100644
--- a/data/templates/npc/monster/21589-VampireWizard.xml
+++ b/data/templates/npc/monster/21589-VampireWizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21589" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21590-VampireMagister.xml b/data/templates/npc/monster/21590-VampireMagister.xml
index cb63f82d7..8e609b833 100644
--- a/data/templates/npc/monster/21590-VampireMagister.xml
+++ b/data/templates/npc/monster/21590-VampireMagister.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21590" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21591-VampireMagister.xml b/data/templates/npc/monster/21591-VampireMagister.xml
index 91efc3603..27b38a6d3 100644
--- a/data/templates/npc/monster/21591-VampireMagister.xml
+++ b/data/templates/npc/monster/21591-VampireMagister.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21591" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21592-VampireMagister.xml b/data/templates/npc/monster/21592-VampireMagister.xml
index 52559395f..f71d64259 100644
--- a/data/templates/npc/monster/21592-VampireMagister.xml
+++ b/data/templates/npc/monster/21592-VampireMagister.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21592" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21593-VampireWarlord.xml b/data/templates/npc/monster/21593-VampireWarlord.xml
index cc3e48d2f..c8e1e669d 100644
--- a/data/templates/npc/monster/21593-VampireWarlord.xml
+++ b/data/templates/npc/monster/21593-VampireWarlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21593" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21594-VampireWarlord.xml b/data/templates/npc/monster/21594-VampireWarlord.xml
index ea4666273..8cf099d30 100644
--- a/data/templates/npc/monster/21594-VampireWarlord.xml
+++ b/data/templates/npc/monster/21594-VampireWarlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21594" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21595-VampireWarlord.xml b/data/templates/npc/monster/21595-VampireWarlord.xml
index 5ec4fb773..c952cd001 100644
--- a/data/templates/npc/monster/21595-VampireWarlord.xml
+++ b/data/templates/npc/monster/21595-VampireWarlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21595" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21596-RequiemLord.xml b/data/templates/npc/monster/21596-RequiemLord.xml
index a854e19fa..929a7bb34 100644
--- a/data/templates/npc/monster/21596-RequiemLord.xml
+++ b/data/templates/npc/monster/21596-RequiemLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21596" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21597-RequiemBehemoth.xml b/data/templates/npc/monster/21597-RequiemBehemoth.xml
index 891db3e12..4c54e817a 100644
--- a/data/templates/npc/monster/21597-RequiemBehemoth.xml
+++ b/data/templates/npc/monster/21597-RequiemBehemoth.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21597" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21598-RequiemBehemoth.xml b/data/templates/npc/monster/21598-RequiemBehemoth.xml
index ee5be4e90..7fec24158 100644
--- a/data/templates/npc/monster/21598-RequiemBehemoth.xml
+++ b/data/templates/npc/monster/21598-RequiemBehemoth.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21598" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21599-RequiemPriest.xml b/data/templates/npc/monster/21599-RequiemPriest.xml
index 345a73ffd..ce67562f5 100644
--- a/data/templates/npc/monster/21599-RequiemPriest.xml
+++ b/data/templates/npc/monster/21599-RequiemPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21599" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21600-RequiemBehemoth.xml b/data/templates/npc/monster/21600-RequiemBehemoth.xml
index 634988bbb..6ccaff808 100644
--- a/data/templates/npc/monster/21600-RequiemBehemoth.xml
+++ b/data/templates/npc/monster/21600-RequiemBehemoth.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21600" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21601-RequiemBehemoth.xml b/data/templates/npc/monster/21601-RequiemBehemoth.xml
index 6e16b6013..30fc5da79 100644
--- a/data/templates/npc/monster/21601-RequiemBehemoth.xml
+++ b/data/templates/npc/monster/21601-RequiemBehemoth.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21601" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21602-ZakenSPikeman.xml b/data/templates/npc/monster/21602-ZakenSPikeman.xml
index 20993be07..57ccf77f2 100644
--- a/data/templates/npc/monster/21602-ZakenSPikeman.xml
+++ b/data/templates/npc/monster/21602-ZakenSPikeman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21602" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21603-ZakenSPikeman.xml b/data/templates/npc/monster/21603-ZakenSPikeman.xml
index c38c994b1..1b2bda3fe 100644
--- a/data/templates/npc/monster/21603-ZakenSPikeman.xml
+++ b/data/templates/npc/monster/21603-ZakenSPikeman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21603" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21604-ZakenSElitePikeman.xml b/data/templates/npc/monster/21604-ZakenSElitePikeman.xml
index 89d9d5c75..60d9e0e45 100644
--- a/data/templates/npc/monster/21604-ZakenSElitePikeman.xml
+++ b/data/templates/npc/monster/21604-ZakenSElitePikeman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21604" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21605-ZakenSArcher.xml b/data/templates/npc/monster/21605-ZakenSArcher.xml
index 674662c9b..36774f521 100644
--- a/data/templates/npc/monster/21605-ZakenSArcher.xml
+++ b/data/templates/npc/monster/21605-ZakenSArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21605" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21606-ZakenSArcher.xml b/data/templates/npc/monster/21606-ZakenSArcher.xml
index 10568c046..491868943 100644
--- a/data/templates/npc/monster/21606-ZakenSArcher.xml
+++ b/data/templates/npc/monster/21606-ZakenSArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21606" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21607-ZakenSEliteArcher.xml b/data/templates/npc/monster/21607-ZakenSEliteArcher.xml
index 2e91b8c1f..e128b7c68 100644
--- a/data/templates/npc/monster/21607-ZakenSEliteArcher.xml
+++ b/data/templates/npc/monster/21607-ZakenSEliteArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21607" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21608-ZakenSWatchman.xml b/data/templates/npc/monster/21608-ZakenSWatchman.xml
index 8cdfc27ba..13a689855 100644
--- a/data/templates/npc/monster/21608-ZakenSWatchman.xml
+++ b/data/templates/npc/monster/21608-ZakenSWatchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21608" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21609-ZakenSWatchman.xml b/data/templates/npc/monster/21609-ZakenSWatchman.xml
index 42d684e91..b6aa7579f 100644
--- a/data/templates/npc/monster/21609-ZakenSWatchman.xml
+++ b/data/templates/npc/monster/21609-ZakenSWatchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21609" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21610-ZakenSHighGradeWatchman.xml b/data/templates/npc/monster/21610-ZakenSHighGradeWatchman.xml
index eddcd9d59..c28eeab4f 100644
--- a/data/templates/npc/monster/21610-ZakenSHighGradeWatchman.xml
+++ b/data/templates/npc/monster/21610-ZakenSHighGradeWatchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21610" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21611-UnpleasantHumming.xml b/data/templates/npc/monster/21611-UnpleasantHumming.xml
index 92bf9b46b..78f5f284f 100644
--- a/data/templates/npc/monster/21611-UnpleasantHumming.xml
+++ b/data/templates/npc/monster/21611-UnpleasantHumming.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21611" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21612-UnpleasantHumming.xml b/data/templates/npc/monster/21612-UnpleasantHumming.xml
index b8037d5ec..287732f45 100644
--- a/data/templates/npc/monster/21612-UnpleasantHumming.xml
+++ b/data/templates/npc/monster/21612-UnpleasantHumming.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21612" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21613-UnpleasantShout.xml b/data/templates/npc/monster/21613-UnpleasantShout.xml
index 6e64d5eff..d598bbefd 100644
--- a/data/templates/npc/monster/21613-UnpleasantShout.xml
+++ b/data/templates/npc/monster/21613-UnpleasantShout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21613" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21614-DeathFlyer.xml b/data/templates/npc/monster/21614-DeathFlyer.xml
index 4f0524309..558f22632 100644
--- a/data/templates/npc/monster/21614-DeathFlyer.xml
+++ b/data/templates/npc/monster/21614-DeathFlyer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21614" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21615-DeathFlyer.xml b/data/templates/npc/monster/21615-DeathFlyer.xml
index 29006fa3c..3ce2efc79 100644
--- a/data/templates/npc/monster/21615-DeathFlyer.xml
+++ b/data/templates/npc/monster/21615-DeathFlyer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21615" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21616-GiganticFlyer.xml b/data/templates/npc/monster/21616-GiganticFlyer.xml
index 1d7245b3d..ea5349e11 100644
--- a/data/templates/npc/monster/21616-GiganticFlyer.xml
+++ b/data/templates/npc/monster/21616-GiganticFlyer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21616" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21617-FiendArcher.xml b/data/templates/npc/monster/21617-FiendArcher.xml
index a73e57c0a..99de857e4 100644
--- a/data/templates/npc/monster/21617-FiendArcher.xml
+++ b/data/templates/npc/monster/21617-FiendArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21617" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21618-FiendArcher.xml b/data/templates/npc/monster/21618-FiendArcher.xml
index 19d8bfed7..89f882e89 100644
--- a/data/templates/npc/monster/21618-FiendArcher.xml
+++ b/data/templates/npc/monster/21618-FiendArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21618" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21619-PitArcher.xml b/data/templates/npc/monster/21619-PitArcher.xml
index 539a4c189..e13610871 100644
--- a/data/templates/npc/monster/21619-PitArcher.xml
+++ b/data/templates/npc/monster/21619-PitArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21619" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21620-Musveren.xml b/data/templates/npc/monster/21620-Musveren.xml
index a78cf6c46..aa46ff9a6 100644
--- a/data/templates/npc/monster/21620-Musveren.xml
+++ b/data/templates/npc/monster/21620-Musveren.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21620" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21621-Musveren.xml b/data/templates/npc/monster/21621-Musveren.xml
index b4565804e..fb476282f 100644
--- a/data/templates/npc/monster/21621-Musveren.xml
+++ b/data/templates/npc/monster/21621-Musveren.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21621" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21622-GreaterMusveren.xml b/data/templates/npc/monster/21622-GreaterMusveren.xml
index 3d195e58a..65c9a1ee3 100644
--- a/data/templates/npc/monster/21622-GreaterMusveren.xml
+++ b/data/templates/npc/monster/21622-GreaterMusveren.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21622" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21623-ZakenSGuard.xml b/data/templates/npc/monster/21623-ZakenSGuard.xml
index 6e99c4c22..f93b0fcb0 100644
--- a/data/templates/npc/monster/21623-ZakenSGuard.xml
+++ b/data/templates/npc/monster/21623-ZakenSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21623" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21624-ZakenSGuard.xml b/data/templates/npc/monster/21624-ZakenSGuard.xml
index d6f268e24..b3f4ef683 100644
--- a/data/templates/npc/monster/21624-ZakenSGuard.xml
+++ b/data/templates/npc/monster/21624-ZakenSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21624" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21625-ZakenSEliteGuard.xml b/data/templates/npc/monster/21625-ZakenSEliteGuard.xml
index 874e01dfa..e220f02ca 100644
--- a/data/templates/npc/monster/21625-ZakenSEliteGuard.xml
+++ b/data/templates/npc/monster/21625-ZakenSEliteGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21625" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21626-KaimVanul.xml b/data/templates/npc/monster/21626-KaimVanul.xml
index 8855886cc..b36303e4a 100644
--- a/data/templates/npc/monster/21626-KaimVanul.xml
+++ b/data/templates/npc/monster/21626-KaimVanul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21626" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21627-KaimVanul.xml b/data/templates/npc/monster/21627-KaimVanul.xml
index cfe154c84..ce8323843 100644
--- a/data/templates/npc/monster/21627-KaimVanul.xml
+++ b/data/templates/npc/monster/21627-KaimVanul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21627" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21628-KaimVanulLad.xml b/data/templates/npc/monster/21628-KaimVanulLad.xml
index 0dbe5aa8a..3b0c2015e 100644
--- a/data/templates/npc/monster/21628-KaimVanulLad.xml
+++ b/data/templates/npc/monster/21628-KaimVanulLad.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21628" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21629-PirateZombieCaptain.xml b/data/templates/npc/monster/21629-PirateZombieCaptain.xml
index 84ece59e2..e34075871 100644
--- a/data/templates/npc/monster/21629-PirateZombieCaptain.xml
+++ b/data/templates/npc/monster/21629-PirateZombieCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21629" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21630-PirateZombieCaptain.xml b/data/templates/npc/monster/21630-PirateZombieCaptain.xml
index 44d37cd5e..02bf74445 100644
--- a/data/templates/npc/monster/21630-PirateZombieCaptain.xml
+++ b/data/templates/npc/monster/21630-PirateZombieCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21630" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21631-ZombieCaptainSSpiritualBody.xml b/data/templates/npc/monster/21631-ZombieCaptainSSpiritualBody.xml
index 800017fef..e2319dd74 100644
--- a/data/templates/npc/monster/21631-ZombieCaptainSSpiritualBody.xml
+++ b/data/templates/npc/monster/21631-ZombieCaptainSSpiritualBody.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21631" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21632-DollBlader.xml b/data/templates/npc/monster/21632-DollBlader.xml
index d1bf4dff9..df7ae2e81 100644
--- a/data/templates/npc/monster/21632-DollBlader.xml
+++ b/data/templates/npc/monster/21632-DollBlader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21632" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21633-DollBlader.xml b/data/templates/npc/monster/21633-DollBlader.xml
index e25f49c8c..d4003631a 100644
--- a/data/templates/npc/monster/21633-DollBlader.xml
+++ b/data/templates/npc/monster/21633-DollBlader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21633" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21634-CrimsonDollBlader.xml b/data/templates/npc/monster/21634-CrimsonDollBlader.xml
index 081bea7d4..b6163c3c8 100644
--- a/data/templates/npc/monster/21634-CrimsonDollBlader.xml
+++ b/data/templates/npc/monster/21634-CrimsonDollBlader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21634" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21635-ValeMaster.xml b/data/templates/npc/monster/21635-ValeMaster.xml
index e82ad7e73..b6840268c 100644
--- a/data/templates/npc/monster/21635-ValeMaster.xml
+++ b/data/templates/npc/monster/21635-ValeMaster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21635" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21636-ValeMaster.xml b/data/templates/npc/monster/21636-ValeMaster.xml
index 27d658fba..64881b6bb 100644
--- a/data/templates/npc/monster/21636-ValeMaster.xml
+++ b/data/templates/npc/monster/21636-ValeMaster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21636" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21637-CrimsonValeMaster.xml b/data/templates/npc/monster/21637-CrimsonValeMaster.xml
index b22979a4f..38fe34883 100644
--- a/data/templates/npc/monster/21637-CrimsonValeMaster.xml
+++ b/data/templates/npc/monster/21637-CrimsonValeMaster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21637" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21638-DreadWolf.xml b/data/templates/npc/monster/21638-DreadWolf.xml
index 50b9ca386..26dcb8c4c 100644
--- a/data/templates/npc/monster/21638-DreadWolf.xml
+++ b/data/templates/npc/monster/21638-DreadWolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21638" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21639-TasabaLizardman.xml b/data/templates/npc/monster/21639-TasabaLizardman.xml
index be814ffb2..96a29f1c6 100644
--- a/data/templates/npc/monster/21639-TasabaLizardman.xml
+++ b/data/templates/npc/monster/21639-TasabaLizardman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21639" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21640-TasabaLizardmanShaman.xml b/data/templates/npc/monster/21640-TasabaLizardmanShaman.xml
index f7a875f00..7b4bd7595 100644
--- a/data/templates/npc/monster/21640-TasabaLizardmanShaman.xml
+++ b/data/templates/npc/monster/21640-TasabaLizardmanShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21640" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21641-Ogre.xml b/data/templates/npc/monster/21641-Ogre.xml
index c2686d7be..b82a4bcbf 100644
--- a/data/templates/npc/monster/21641-Ogre.xml
+++ b/data/templates/npc/monster/21641-Ogre.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21641" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21642-TasabaLizardmanSniper.xml b/data/templates/npc/monster/21642-TasabaLizardmanSniper.xml
index 0d619e5e4..036692275 100644
--- a/data/templates/npc/monster/21642-TasabaLizardmanSniper.xml
+++ b/data/templates/npc/monster/21642-TasabaLizardmanSniper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21642" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21643-TasabaLizardmanSniper.xml b/data/templates/npc/monster/21643-TasabaLizardmanSniper.xml
index 9478397ae..c06eb80de 100644
--- a/data/templates/npc/monster/21643-TasabaLizardmanSniper.xml
+++ b/data/templates/npc/monster/21643-TasabaLizardmanSniper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21643" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21644-Lienrik.xml b/data/templates/npc/monster/21644-Lienrik.xml
index 830829230..9e1d35eb0 100644
--- a/data/templates/npc/monster/21644-Lienrik.xml
+++ b/data/templates/npc/monster/21644-Lienrik.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21644" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21645-LienrikLad.xml b/data/templates/npc/monster/21645-LienrikLad.xml
index ec01d882c..23c8c7e7a 100644
--- a/data/templates/npc/monster/21645-LienrikLad.xml
+++ b/data/templates/npc/monster/21645-LienrikLad.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21645" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21646-GraveScarab.xml b/data/templates/npc/monster/21646-GraveScarab.xml
index 1ac1b5ba3..35f3d6fd5 100644
--- a/data/templates/npc/monster/21646-GraveScarab.xml
+++ b/data/templates/npc/monster/21646-GraveScarab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21646" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21647-ScavengerScarab.xml b/data/templates/npc/monster/21647-ScavengerScarab.xml
index 043545c44..c2fffd048 100644
--- a/data/templates/npc/monster/21647-ScavengerScarab.xml
+++ b/data/templates/npc/monster/21647-ScavengerScarab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21647" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21648-GraveAnt.xml b/data/templates/npc/monster/21648-GraveAnt.xml
index c05fa2f47..70efb7b17 100644
--- a/data/templates/npc/monster/21648-GraveAnt.xml
+++ b/data/templates/npc/monster/21648-GraveAnt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21648" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21649-ScavengerAnt.xml b/data/templates/npc/monster/21649-ScavengerAnt.xml
index 5724e285a..3f5131f1c 100644
--- a/data/templates/npc/monster/21649-ScavengerAnt.xml
+++ b/data/templates/npc/monster/21649-ScavengerAnt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21649" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21650-ShrineKnight.xml b/data/templates/npc/monster/21650-ShrineKnight.xml
index 363dc0429..4801c5d73 100644
--- a/data/templates/npc/monster/21650-ShrineKnight.xml
+++ b/data/templates/npc/monster/21650-ShrineKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21650" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21651-ShrineGuard.xml b/data/templates/npc/monster/21651-ShrineGuard.xml
index 807803301..c07d6cb42 100644
--- a/data/templates/npc/monster/21651-ShrineGuard.xml
+++ b/data/templates/npc/monster/21651-ShrineGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21651" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21652-ScarletStakatoNoble.xml b/data/templates/npc/monster/21652-ScarletStakatoNoble.xml
index 7d7ed8d56..d1d270765 100644
--- a/data/templates/npc/monster/21652-ScarletStakatoNoble.xml
+++ b/data/templates/npc/monster/21652-ScarletStakatoNoble.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21652" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21653-AssassinBeetle.xml b/data/templates/npc/monster/21653-AssassinBeetle.xml
index 8cd1cf282..0681b38b0 100644
--- a/data/templates/npc/monster/21653-AssassinBeetle.xml
+++ b/data/templates/npc/monster/21653-AssassinBeetle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21653" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21654-NecromancerOfDestruction.xml b/data/templates/npc/monster/21654-NecromancerOfDestruction.xml
index e3c244885..dd783b0de 100644
--- a/data/templates/npc/monster/21654-NecromancerOfDestruction.xml
+++ b/data/templates/npc/monster/21654-NecromancerOfDestruction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21654" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21655-ArimanesOfDestruction.xml b/data/templates/npc/monster/21655-ArimanesOfDestruction.xml
index 1015b9f68..49f440459 100644
--- a/data/templates/npc/monster/21655-ArimanesOfDestruction.xml
+++ b/data/templates/npc/monster/21655-ArimanesOfDestruction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21655" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21656-AshurasOfDestruction.xml b/data/templates/npc/monster/21656-AshurasOfDestruction.xml
index 00e0ca11a..0d92eae70 100644
--- a/data/templates/npc/monster/21656-AshurasOfDestruction.xml
+++ b/data/templates/npc/monster/21656-AshurasOfDestruction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21656" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21657-MagmaDrake.xml b/data/templates/npc/monster/21657-MagmaDrake.xml
index 55aba9be1..2b5535f41 100644
--- a/data/templates/npc/monster/21657-MagmaDrake.xml
+++ b/data/templates/npc/monster/21657-MagmaDrake.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21657" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21658-PunishmentOfSplendor.xml b/data/templates/npc/monster/21658-PunishmentOfSplendor.xml
index 9d311a842..f9b07c8f4 100644
--- a/data/templates/npc/monster/21658-PunishmentOfSplendor.xml
+++ b/data/templates/npc/monster/21658-PunishmentOfSplendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21658" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21797-SpiritOfTiminiel.xml b/data/templates/npc/monster/21797-SpiritOfTiminiel.xml
index 16291cd36..f40eb1046 100644
--- a/data/templates/npc/monster/21797-SpiritOfTiminiel.xml
+++ b/data/templates/npc/monster/21797-SpiritOfTiminiel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21797" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21798-GhostOfAGatekeeper.xml b/data/templates/npc/monster/21798-GhostOfAGatekeeper.xml
index c6d5bd440..a88f85d3e 100644
--- a/data/templates/npc/monster/21798-GhostOfAGatekeeper.xml
+++ b/data/templates/npc/monster/21798-GhostOfAGatekeeper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21798" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21799-GhostOfAGatekeeper.xml b/data/templates/npc/monster/21799-GhostOfAGatekeeper.xml
index f03b11ec8..97ada2916 100644
--- a/data/templates/npc/monster/21799-GhostOfAGatekeeper.xml
+++ b/data/templates/npc/monster/21799-GhostOfAGatekeeper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21799" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21800-VassalGhost.xml b/data/templates/npc/monster/21800-VassalGhost.xml
index b3960ec10..40f1514a1 100644
--- a/data/templates/npc/monster/21800-VassalGhost.xml
+++ b/data/templates/npc/monster/21800-VassalGhost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21800" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/21823-ExecutorOfSacrificialOfferings.xml b/data/templates/npc/monster/21823-ExecutorOfSacrificialOfferings.xml
index 38c85f225..78ae382b3 100644
--- a/data/templates/npc/monster/21823-ExecutorOfSacrificialOfferings.xml
+++ b/data/templates/npc/monster/21823-ExecutorOfSacrificialOfferings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="21823" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22001-GrimWolf.xml b/data/templates/npc/monster/22001-GrimWolf.xml
index 9b76bae81..f03035ebb 100644
--- a/data/templates/npc/monster/22001-GrimWolf.xml
+++ b/data/templates/npc/monster/22001-GrimWolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22001" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22002-GrimGrizzly.xml b/data/templates/npc/monster/22002-GrimGrizzly.xml
index ff7793e49..f59b3e88f 100644
--- a/data/templates/npc/monster/22002-GrimGrizzly.xml
+++ b/data/templates/npc/monster/22002-GrimGrizzly.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22002" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22003-GraveRobberScout.xml b/data/templates/npc/monster/22003-GraveRobberScout.xml
index 1265fc13d..1f4f35998 100644
--- a/data/templates/npc/monster/22003-GraveRobberScout.xml
+++ b/data/templates/npc/monster/22003-GraveRobberScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22003" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22004-GraveRobberLookout.xml b/data/templates/npc/monster/22004-GraveRobberLookout.xml
index c6a232f1f..70814dbb2 100644
--- a/data/templates/npc/monster/22004-GraveRobberLookout.xml
+++ b/data/templates/npc/monster/22004-GraveRobberLookout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22004" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22005-GraveRobberRanger.xml b/data/templates/npc/monster/22005-GraveRobberRanger.xml
index 45304f25b..87ec7b96f 100644
--- a/data/templates/npc/monster/22005-GraveRobberRanger.xml
+++ b/data/templates/npc/monster/22005-GraveRobberRanger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22005" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22006-GraveRobberGuard.xml b/data/templates/npc/monster/22006-GraveRobberGuard.xml
index f2821bfbd..422014983 100644
--- a/data/templates/npc/monster/22006-GraveRobberGuard.xml
+++ b/data/templates/npc/monster/22006-GraveRobberGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22006" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22007-GhostOfASoldier.xml b/data/templates/npc/monster/22007-GhostOfASoldier.xml
index 9f3ead20a..014476473 100644
--- a/data/templates/npc/monster/22007-GhostOfASoldier.xml
+++ b/data/templates/npc/monster/22007-GhostOfASoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22007" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22008-GraveRobberFighter.xml b/data/templates/npc/monster/22008-GraveRobberFighter.xml
index f59feed4a..564eecb55 100644
--- a/data/templates/npc/monster/22008-GraveRobberFighter.xml
+++ b/data/templates/npc/monster/22008-GraveRobberFighter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22008" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22009-GhostOfALoyalVassal.xml b/data/templates/npc/monster/22009-GhostOfALoyalVassal.xml
index 47adb8b49..3fa64e2b7 100644
--- a/data/templates/npc/monster/22009-GhostOfALoyalVassal.xml
+++ b/data/templates/npc/monster/22009-GhostOfALoyalVassal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22009" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22010-GhostOfAGeneral.xml b/data/templates/npc/monster/22010-GhostOfAGeneral.xml
index 5e0104b17..6a9c8acc0 100644
--- a/data/templates/npc/monster/22010-GhostOfAGeneral.xml
+++ b/data/templates/npc/monster/22010-GhostOfAGeneral.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22010" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22011-GhostOfABaturChief.xml b/data/templates/npc/monster/22011-GhostOfABaturChief.xml
index 856e937f1..1a87f9ade 100644
--- a/data/templates/npc/monster/22011-GhostOfABaturChief.xml
+++ b/data/templates/npc/monster/22011-GhostOfABaturChief.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22011" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22012-GhostOfABaturChief.xml b/data/templates/npc/monster/22012-GhostOfABaturChief.xml
index 89d958bc6..f9cfeb0b6 100644
--- a/data/templates/npc/monster/22012-GhostOfABaturChief.xml
+++ b/data/templates/npc/monster/22012-GhostOfABaturChief.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22012" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22013-GhostOfAMorekChief.xml b/data/templates/npc/monster/22013-GhostOfAMorekChief.xml
index dd14fd7c3..26b079927 100644
--- a/data/templates/npc/monster/22013-GhostOfAMorekChief.xml
+++ b/data/templates/npc/monster/22013-GhostOfAMorekChief.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22013" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22014-GhostOfAMorekChief.xml b/data/templates/npc/monster/22014-GhostOfAMorekChief.xml
index faaeffdf0..315233e53 100644
--- a/data/templates/npc/monster/22014-GhostOfAMorekChief.xml
+++ b/data/templates/npc/monster/22014-GhostOfAMorekChief.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22014" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22015-GhostOfATurkaChief.xml b/data/templates/npc/monster/22015-GhostOfATurkaChief.xml
index 3511839a7..cca2dbdfe 100644
--- a/data/templates/npc/monster/22015-GhostOfATurkaChief.xml
+++ b/data/templates/npc/monster/22015-GhostOfATurkaChief.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22015" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22016-GhostOfATurkaChief.xml b/data/templates/npc/monster/22016-GhostOfATurkaChief.xml
index 81143c129..cd9868a17 100644
--- a/data/templates/npc/monster/22016-GhostOfATurkaChief.xml
+++ b/data/templates/npc/monster/22016-GhostOfATurkaChief.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22016" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22017-BanditSweeper.xml b/data/templates/npc/monster/22017-BanditSweeper.xml
index 93aa3f7ec..7538ded64 100644
--- a/data/templates/npc/monster/22017-BanditSweeper.xml
+++ b/data/templates/npc/monster/22017-BanditSweeper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22017" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22018-BanditHound.xml b/data/templates/npc/monster/22018-BanditHound.xml
index 0cd935670..018a0257a 100644
--- a/data/templates/npc/monster/22018-BanditHound.xml
+++ b/data/templates/npc/monster/22018-BanditHound.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22018" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22019-BanditWatchman.xml b/data/templates/npc/monster/22019-BanditWatchman.xml
index efad4c40f..d2d2326b5 100644
--- a/data/templates/npc/monster/22019-BanditWatchman.xml
+++ b/data/templates/npc/monster/22019-BanditWatchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22019" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22020-SnowLynx.xml b/data/templates/npc/monster/22020-SnowLynx.xml
index 3aea289cb..973952bce 100644
--- a/data/templates/npc/monster/22020-SnowLynx.xml
+++ b/data/templates/npc/monster/22020-SnowLynx.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22020" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22021-BanditUndertaker.xml b/data/templates/npc/monster/22021-BanditUndertaker.xml
index 5600ec208..50facc43e 100644
--- a/data/templates/npc/monster/22021-BanditUndertaker.xml
+++ b/data/templates/npc/monster/22021-BanditUndertaker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22021" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22022-BanditAssassin.xml b/data/templates/npc/monster/22022-BanditAssassin.xml
index b28285ee1..fe7ca6ad6 100644
--- a/data/templates/npc/monster/22022-BanditAssassin.xml
+++ b/data/templates/npc/monster/22022-BanditAssassin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22022" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22023-BanditWarrior.xml b/data/templates/npc/monster/22023-BanditWarrior.xml
index b8a903e19..b10f6f25b 100644
--- a/data/templates/npc/monster/22023-BanditWarrior.xml
+++ b/data/templates/npc/monster/22023-BanditWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22023" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22024-BanditInspector.xml b/data/templates/npc/monster/22024-BanditInspector.xml
index 98a975d29..693c94cde 100644
--- a/data/templates/npc/monster/22024-BanditInspector.xml
+++ b/data/templates/npc/monster/22024-BanditInspector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22024" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22025-FrozenWastelandWerewolf.xml b/data/templates/npc/monster/22025-FrozenWastelandWerewolf.xml
index 04e07c422..871adc4e3 100644
--- a/data/templates/npc/monster/22025-FrozenWastelandWerewolf.xml
+++ b/data/templates/npc/monster/22025-FrozenWastelandWerewolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22025" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22026-BanditCaptain.xml b/data/templates/npc/monster/22026-BanditCaptain.xml
index 99e65a810..1a9627111 100644
--- a/data/templates/npc/monster/22026-BanditCaptain.xml
+++ b/data/templates/npc/monster/22026-BanditCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22026" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22027-ForgottenCrewman.xml b/data/templates/npc/monster/22027-ForgottenCrewman.xml
index 6b0dc5290..ae03201d2 100644
--- a/data/templates/npc/monster/22027-ForgottenCrewman.xml
+++ b/data/templates/npc/monster/22027-ForgottenCrewman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22027" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22028-VagabondOfTheRuins.xml b/data/templates/npc/monster/22028-VagabondOfTheRuins.xml
index 5554f2687..61135a0ab 100644
--- a/data/templates/npc/monster/22028-VagabondOfTheRuins.xml
+++ b/data/templates/npc/monster/22028-VagabondOfTheRuins.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22028" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22029-RagnaOrc.xml b/data/templates/npc/monster/22029-RagnaOrc.xml
index 4aaa7ff4f..e08de62c0 100644
--- a/data/templates/npc/monster/22029-RagnaOrc.xml
+++ b/data/templates/npc/monster/22029-RagnaOrc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22029" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22030-RagnaOrcShaman.xml b/data/templates/npc/monster/22030-RagnaOrcShaman.xml
index 2dbba38c9..75a28bcbf 100644
--- a/data/templates/npc/monster/22030-RagnaOrcShaman.xml
+++ b/data/templates/npc/monster/22030-RagnaOrcShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22030" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22031-RagnaOrcArcher.xml b/data/templates/npc/monster/22031-RagnaOrcArcher.xml
index c82dd6731..740c6e4a3 100644
--- a/data/templates/npc/monster/22031-RagnaOrcArcher.xml
+++ b/data/templates/npc/monster/22031-RagnaOrcArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22031" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22032-RagnaOrcWarrior.xml b/data/templates/npc/monster/22032-RagnaOrcWarrior.xml
index c32837493..76fbce683 100644
--- a/data/templates/npc/monster/22032-RagnaOrcWarrior.xml
+++ b/data/templates/npc/monster/22032-RagnaOrcWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22032" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22033-RagnaOrcMage.xml b/data/templates/npc/monster/22033-RagnaOrcMage.xml
index 4ee824002..d0cf91162 100644
--- a/data/templates/npc/monster/22033-RagnaOrcMage.xml
+++ b/data/templates/npc/monster/22033-RagnaOrcMage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22033" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22034-RagnaOrcMage.xml b/data/templates/npc/monster/22034-RagnaOrcMage.xml
index 69afb136a..80fb4be68 100644
--- a/data/templates/npc/monster/22034-RagnaOrcMage.xml
+++ b/data/templates/npc/monster/22034-RagnaOrcMage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22034" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22035-RagnaOrcMage.xml b/data/templates/npc/monster/22035-RagnaOrcMage.xml
index e07d5de01..e4ce69bb8 100644
--- a/data/templates/npc/monster/22035-RagnaOrcMage.xml
+++ b/data/templates/npc/monster/22035-RagnaOrcMage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22035" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22036-RagnaOrcMage.xml b/data/templates/npc/monster/22036-RagnaOrcMage.xml
index e8d6d8494..d9d24bfa7 100644
--- a/data/templates/npc/monster/22036-RagnaOrcMage.xml
+++ b/data/templates/npc/monster/22036-RagnaOrcMage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22036" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22037-RagnaOrcHealer.xml b/data/templates/npc/monster/22037-RagnaOrcHealer.xml
index 2705584d6..f362779df 100644
--- a/data/templates/npc/monster/22037-RagnaOrcHealer.xml
+++ b/data/templates/npc/monster/22037-RagnaOrcHealer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22037" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22038-RagnaOrcHero.xml b/data/templates/npc/monster/22038-RagnaOrcHero.xml
index 8c78baa07..66c31589f 100644
--- a/data/templates/npc/monster/22038-RagnaOrcHero.xml
+++ b/data/templates/npc/monster/22038-RagnaOrcHero.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22038" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22039-RagnaOrcCommander.xml b/data/templates/npc/monster/22039-RagnaOrcCommander.xml
index 1cb5da0c0..653473afe 100644
--- a/data/templates/npc/monster/22039-RagnaOrcCommander.xml
+++ b/data/templates/npc/monster/22039-RagnaOrcCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22039" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22040-RagnaOrcSniper.xml b/data/templates/npc/monster/22040-RagnaOrcSniper.xml
index 64b70f12b..6571d3cb7 100644
--- a/data/templates/npc/monster/22040-RagnaOrcSniper.xml
+++ b/data/templates/npc/monster/22040-RagnaOrcSniper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22040" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22041-RagnaOrcSorcerer.xml b/data/templates/npc/monster/22041-RagnaOrcSorcerer.xml
index 7975c6eea..141e8fe56 100644
--- a/data/templates/npc/monster/22041-RagnaOrcSorcerer.xml
+++ b/data/templates/npc/monster/22041-RagnaOrcSorcerer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22041" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22042-RagnaOrcSorcerer.xml b/data/templates/npc/monster/22042-RagnaOrcSorcerer.xml
index 00253b6d8..a05ee0154 100644
--- a/data/templates/npc/monster/22042-RagnaOrcSorcerer.xml
+++ b/data/templates/npc/monster/22042-RagnaOrcSorcerer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22042" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22043-RagnaOrcSorcerer.xml b/data/templates/npc/monster/22043-RagnaOrcSorcerer.xml
index e79d85d5f..0aab458e0 100644
--- a/data/templates/npc/monster/22043-RagnaOrcSorcerer.xml
+++ b/data/templates/npc/monster/22043-RagnaOrcSorcerer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22043" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22044-RagnaOrcSorcerer.xml b/data/templates/npc/monster/22044-RagnaOrcSorcerer.xml
index ac3046787..b24107654 100644
--- a/data/templates/npc/monster/22044-RagnaOrcSorcerer.xml
+++ b/data/templates/npc/monster/22044-RagnaOrcSorcerer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22044" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22045-DarkCorpse.xml b/data/templates/npc/monster/22045-DarkCorpse.xml
index d72bafec7..c47024a71 100644
--- a/data/templates/npc/monster/22045-DarkCorpse.xml
+++ b/data/templates/npc/monster/22045-DarkCorpse.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22045" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22046-VarangkaSDreVanul.xml b/data/templates/npc/monster/22046-VarangkaSDreVanul.xml
index 99be3ff21..f6a0b3978 100644
--- a/data/templates/npc/monster/22046-VarangkaSDreVanul.xml
+++ b/data/templates/npc/monster/22046-VarangkaSDreVanul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22046" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22047-GuardianOfTheGhostTown.xml b/data/templates/npc/monster/22047-GuardianOfTheGhostTown.xml
index 866ff7eea..a6fc57e69 100644
--- a/data/templates/npc/monster/22047-GuardianOfTheGhostTown.xml
+++ b/data/templates/npc/monster/22047-GuardianOfTheGhostTown.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22047" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22048-DarkSpider.xml b/data/templates/npc/monster/22048-DarkSpider.xml
index 6c6b2455d..6a1cdbe5e 100644
--- a/data/templates/npc/monster/22048-DarkSpider.xml
+++ b/data/templates/npc/monster/22048-DarkSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22048" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22049-VarangkaSSuccubus.xml b/data/templates/npc/monster/22049-VarangkaSSuccubus.xml
index d63e45651..135fe0026 100644
--- a/data/templates/npc/monster/22049-VarangkaSSuccubus.xml
+++ b/data/templates/npc/monster/22049-VarangkaSSuccubus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22049" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22050-ProbeGolemProdigyIv.xml b/data/templates/npc/monster/22050-ProbeGolemProdigyIv.xml
index c46127141..47543016a 100644
--- a/data/templates/npc/monster/22050-ProbeGolemProdigyIv.xml
+++ b/data/templates/npc/monster/22050-ProbeGolemProdigyIv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22050" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22051-SpelunkingSpider.xml b/data/templates/npc/monster/22051-SpelunkingSpider.xml
index b545b5229..c39e19d01 100644
--- a/data/templates/npc/monster/22051-SpelunkingSpider.xml
+++ b/data/templates/npc/monster/22051-SpelunkingSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22051" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22052-MenacingJackhammerGolem.xml b/data/templates/npc/monster/22052-MenacingJackhammerGolem.xml
index 712f6a04c..2ded5c741 100644
--- a/data/templates/npc/monster/22052-MenacingJackhammerGolem.xml
+++ b/data/templates/npc/monster/22052-MenacingJackhammerGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22052" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22053-HorrifyingCannonGolemI.xml b/data/templates/npc/monster/22053-HorrifyingCannonGolemI.xml
index a2314e9c9..9b5b086b5 100644
--- a/data/templates/npc/monster/22053-HorrifyingCannonGolemI.xml
+++ b/data/templates/npc/monster/22053-HorrifyingCannonGolemI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22053" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22054-HorrifyingCannonGolemIv.xml b/data/templates/npc/monster/22054-HorrifyingCannonGolemIv.xml
index 6a02e62ef..58376f6b6 100644
--- a/data/templates/npc/monster/22054-HorrifyingCannonGolemIv.xml
+++ b/data/templates/npc/monster/22054-HorrifyingCannonGolemIv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22054" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22055-CruelViceGolem.xml b/data/templates/npc/monster/22055-CruelViceGolem.xml
index e3cfee0e8..a63c13480 100644
--- a/data/templates/npc/monster/22055-CruelViceGolem.xml
+++ b/data/templates/npc/monster/22055-CruelViceGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22055" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22056-ProbeGolemChampionI.xml b/data/templates/npc/monster/22056-ProbeGolemChampionI.xml
index 6d7e72548..0dee621d2 100644
--- a/data/templates/npc/monster/22056-ProbeGolemChampionI.xml
+++ b/data/templates/npc/monster/22056-ProbeGolemChampionI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22056" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22057-SpelunkingAnt.xml b/data/templates/npc/monster/22057-SpelunkingAnt.xml
index c3a5bd589..98caf2b40 100644
--- a/data/templates/npc/monster/22057-SpelunkingAnt.xml
+++ b/data/templates/npc/monster/22057-SpelunkingAnt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22057" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22058-HorrifyingExcavatorGolemIii.xml b/data/templates/npc/monster/22058-HorrifyingExcavatorGolemIii.xml
index 16defbdb5..283ffa57d 100644
--- a/data/templates/npc/monster/22058-HorrifyingExcavatorGolemIii.xml
+++ b/data/templates/npc/monster/22058-HorrifyingExcavatorGolemIii.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22058" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22059-BloodthirstyGinzuGolemVii.xml b/data/templates/npc/monster/22059-BloodthirstyGinzuGolemVii.xml
index 4205d84bb..e630f52b6 100644
--- a/data/templates/npc/monster/22059-BloodthirstyGinzuGolemVii.xml
+++ b/data/templates/npc/monster/22059-BloodthirstyGinzuGolemVii.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22059" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22060-HorrifyingCannonGolem.xml b/data/templates/npc/monster/22060-HorrifyingCannonGolem.xml
index 87cca65b5..6cb0764ed 100644
--- a/data/templates/npc/monster/22060-HorrifyingCannonGolem.xml
+++ b/data/templates/npc/monster/22060-HorrifyingCannonGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22060" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22061-HorrifyingCannonGolemIii.xml b/data/templates/npc/monster/22061-HorrifyingCannonGolemIii.xml
index 16a2b97d0..f9dce673c 100644
--- a/data/templates/npc/monster/22061-HorrifyingCannonGolemIii.xml
+++ b/data/templates/npc/monster/22061-HorrifyingCannonGolemIii.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22061" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22062-HorrifyingJackhammerGolem.xml b/data/templates/npc/monster/22062-HorrifyingJackhammerGolem.xml
index e7e9dddcb..9526f875f 100644
--- a/data/templates/npc/monster/22062-HorrifyingJackhammerGolem.xml
+++ b/data/templates/npc/monster/22062-HorrifyingJackhammerGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22062" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22063-GinzuGolemProdigyX.xml b/data/templates/npc/monster/22063-GinzuGolemProdigyX.xml
index 6184559fc..e58ff86ee 100644
--- a/data/templates/npc/monster/22063-GinzuGolemProdigyX.xml
+++ b/data/templates/npc/monster/22063-GinzuGolemProdigyX.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22063" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22064-BloodthirstyGinzuGolemIi.xml b/data/templates/npc/monster/22064-BloodthirstyGinzuGolemIi.xml
index 9fdd03cbb..b96986e40 100644
--- a/data/templates/npc/monster/22064-BloodthirstyGinzuGolemIi.xml
+++ b/data/templates/npc/monster/22064-BloodthirstyGinzuGolemIi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22064" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22065-HorrifyingGinzuGolemV.xml b/data/templates/npc/monster/22065-HorrifyingGinzuGolemV.xml
index 8b01a8b9e..e974db948 100644
--- a/data/templates/npc/monster/22065-HorrifyingGinzuGolemV.xml
+++ b/data/templates/npc/monster/22065-HorrifyingGinzuGolemV.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22065" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22066-HorrifyingCannonGolemVi.xml b/data/templates/npc/monster/22066-HorrifyingCannonGolemVi.xml
index 653cdf427..fac660f13 100644
--- a/data/templates/npc/monster/22066-HorrifyingCannonGolemVi.xml
+++ b/data/templates/npc/monster/22066-HorrifyingCannonGolemVi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22066" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22067-HorrifyingCannonGolemVi.xml b/data/templates/npc/monster/22067-HorrifyingCannonGolemVi.xml
index 5eb9513ba..896befd93 100644
--- a/data/templates/npc/monster/22067-HorrifyingCannonGolemVi.xml
+++ b/data/templates/npc/monster/22067-HorrifyingCannonGolemVi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22067" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22068-HorrifyingCannonGolemVi.xml b/data/templates/npc/monster/22068-HorrifyingCannonGolemVi.xml
index 074c16e6c..e291552d4 100644
--- a/data/templates/npc/monster/22068-HorrifyingCannonGolemVi.xml
+++ b/data/templates/npc/monster/22068-HorrifyingCannonGolemVi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22068" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22069-HorrifyingCannonGolemVi.xml b/data/templates/npc/monster/22069-HorrifyingCannonGolemVi.xml
index 32c6444c0..61ec43ac2 100644
--- a/data/templates/npc/monster/22069-HorrifyingCannonGolemVi.xml
+++ b/data/templates/npc/monster/22069-HorrifyingCannonGolemVi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22069" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22070-HorrifyingCannonGolemVi.xml b/data/templates/npc/monster/22070-HorrifyingCannonGolemVi.xml
index 8172ec45b..19e53a778 100644
--- a/data/templates/npc/monster/22070-HorrifyingCannonGolemVi.xml
+++ b/data/templates/npc/monster/22070-HorrifyingCannonGolemVi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22070" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22071-HorrifyingCannonGolemVi.xml b/data/templates/npc/monster/22071-HorrifyingCannonGolemVi.xml
index 287cbf54e..a6257d851 100644
--- a/data/templates/npc/monster/22071-HorrifyingCannonGolemVi.xml
+++ b/data/templates/npc/monster/22071-HorrifyingCannonGolemVi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22071" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22072-HorrifyingCannonGolemVi.xml b/data/templates/npc/monster/22072-HorrifyingCannonGolemVi.xml
index 82ab69763..de23beb90 100644
--- a/data/templates/npc/monster/22072-HorrifyingCannonGolemVi.xml
+++ b/data/templates/npc/monster/22072-HorrifyingCannonGolemVi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22072" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22073-HorrifyingCannonGolemVi.xml b/data/templates/npc/monster/22073-HorrifyingCannonGolemVi.xml
index bb47b2694..54a220929 100644
--- a/data/templates/npc/monster/22073-HorrifyingCannonGolemVi.xml
+++ b/data/templates/npc/monster/22073-HorrifyingCannonGolemVi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22073" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22074-EpicCannonGolem.xml b/data/templates/npc/monster/22074-EpicCannonGolem.xml
index d80ed6804..51d5afc3b 100644
--- a/data/templates/npc/monster/22074-EpicCannonGolem.xml
+++ b/data/templates/npc/monster/22074-EpicCannonGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22074" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22075-EpicCannonGolemAdjunct.xml b/data/templates/npc/monster/22075-EpicCannonGolemAdjunct.xml
index cce099764..fae3399a9 100644
--- a/data/templates/npc/monster/22075-EpicCannonGolemAdjunct.xml
+++ b/data/templates/npc/monster/22075-EpicCannonGolemAdjunct.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22075" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22076-DeadlyGinzuGolemV.xml b/data/templates/npc/monster/22076-DeadlyGinzuGolemV.xml
index f21459c4c..b4cfe03e2 100644
--- a/data/templates/npc/monster/22076-DeadlyGinzuGolemV.xml
+++ b/data/templates/npc/monster/22076-DeadlyGinzuGolemV.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22076" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22077-HorrifyingGinzuGolemViii.xml b/data/templates/npc/monster/22077-HorrifyingGinzuGolemViii.xml
index 2ff657a37..9f296995f 100644
--- a/data/templates/npc/monster/22077-HorrifyingGinzuGolemViii.xml
+++ b/data/templates/npc/monster/22077-HorrifyingGinzuGolemViii.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22077" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22078-DeadlyGinzuGolemViii.xml b/data/templates/npc/monster/22078-DeadlyGinzuGolemViii.xml
index 95080df56..0b39f4abd 100644
--- a/data/templates/npc/monster/22078-DeadlyGinzuGolemViii.xml
+++ b/data/templates/npc/monster/22078-DeadlyGinzuGolemViii.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22078" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22079-LostBandersnatch.xml b/data/templates/npc/monster/22079-LostBandersnatch.xml
index 067f607e4..2e02e1bf7 100644
--- a/data/templates/npc/monster/22079-LostBandersnatch.xml
+++ b/data/templates/npc/monster/22079-LostBandersnatch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22079" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22080-MassiveMazeBandersnatch.xml b/data/templates/npc/monster/22080-MassiveMazeBandersnatch.xml
index e337e0ae9..95c18caea 100644
--- a/data/templates/npc/monster/22080-MassiveMazeBandersnatch.xml
+++ b/data/templates/npc/monster/22080-MassiveMazeBandersnatch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22080" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22081-LostWatcher.xml b/data/templates/npc/monster/22081-LostWatcher.xml
index 632b824c8..c243dd01a 100644
--- a/data/templates/npc/monster/22081-LostWatcher.xml
+++ b/data/templates/npc/monster/22081-LostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22081" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22082-ElderLostWatcher.xml b/data/templates/npc/monster/22082-ElderLostWatcher.xml
index 574d416ce..65924b687 100644
--- a/data/templates/npc/monster/22082-ElderLostWatcher.xml
+++ b/data/templates/npc/monster/22082-ElderLostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22082" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22083-BabyPanthera.xml b/data/templates/npc/monster/22083-BabyPanthera.xml
index 6cf5c1e75..923bcf113 100644
--- a/data/templates/npc/monster/22083-BabyPanthera.xml
+++ b/data/templates/npc/monster/22083-BabyPanthera.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22083" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22084-Panthera.xml b/data/templates/npc/monster/22084-Panthera.xml
index fc53f6def..13bf1fbcb 100644
--- a/data/templates/npc/monster/22084-Panthera.xml
+++ b/data/templates/npc/monster/22084-Panthera.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22084" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22085-LostGargoyle.xml b/data/templates/npc/monster/22085-LostGargoyle.xml
index c0cd6e17f..979502115 100644
--- a/data/templates/npc/monster/22085-LostGargoyle.xml
+++ b/data/templates/npc/monster/22085-LostGargoyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22085" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22086-LostGargoyleYoungling.xml b/data/templates/npc/monster/22086-LostGargoyleYoungling.xml
index 039441b65..4498f64ec 100644
--- a/data/templates/npc/monster/22086-LostGargoyleYoungling.xml
+++ b/data/templates/npc/monster/22086-LostGargoyleYoungling.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22086" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22087-PronghornSpirit.xml b/data/templates/npc/monster/22087-PronghornSpirit.xml
index ab7541064..8d015b408 100644
--- a/data/templates/npc/monster/22087-PronghornSpirit.xml
+++ b/data/templates/npc/monster/22087-PronghornSpirit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22087" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22088-Pronghorn.xml b/data/templates/npc/monster/22088-Pronghorn.xml
index 9dabc177d..af870f12d 100644
--- a/data/templates/npc/monster/22088-Pronghorn.xml
+++ b/data/templates/npc/monster/22088-Pronghorn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22088" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22089-IceTarantula.xml b/data/templates/npc/monster/22089-IceTarantula.xml
index 791bbfe46..4755cd24a 100644
--- a/data/templates/npc/monster/22089-IceTarantula.xml
+++ b/data/templates/npc/monster/22089-IceTarantula.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22089" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22090-FrostTarantula.xml b/data/templates/npc/monster/22090-FrostTarantula.xml
index b41a94c16..876eb1259 100644
--- a/data/templates/npc/monster/22090-FrostTarantula.xml
+++ b/data/templates/npc/monster/22090-FrostTarantula.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22090" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22091-LostIronGolem.xml b/data/templates/npc/monster/22091-LostIronGolem.xml
index e3378cc77..4992fda43 100644
--- a/data/templates/npc/monster/22091-LostIronGolem.xml
+++ b/data/templates/npc/monster/22091-LostIronGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22091" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22092-FrostIronGolem.xml b/data/templates/npc/monster/22092-FrostIronGolem.xml
index 1b0da79dd..15d663ade 100644
--- a/data/templates/npc/monster/22092-FrostIronGolem.xml
+++ b/data/templates/npc/monster/22092-FrostIronGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22092" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22093-LostBuffalo.xml b/data/templates/npc/monster/22093-LostBuffalo.xml
index ab1d394ac..6d9be2700 100644
--- a/data/templates/npc/monster/22093-LostBuffalo.xml
+++ b/data/templates/npc/monster/22093-LostBuffalo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22093" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22094-FrostBuffalo.xml b/data/templates/npc/monster/22094-FrostBuffalo.xml
index 682b5b6fc..06430f4b9 100644
--- a/data/templates/npc/monster/22094-FrostBuffalo.xml
+++ b/data/templates/npc/monster/22094-FrostBuffalo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22094" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22095-UrsusCub.xml b/data/templates/npc/monster/22095-UrsusCub.xml
index eab332d9d..32cb5c487 100644
--- a/data/templates/npc/monster/22095-UrsusCub.xml
+++ b/data/templates/npc/monster/22095-UrsusCub.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22095" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22096-Ursus.xml b/data/templates/npc/monster/22096-Ursus.xml
index 8050cc6e8..078f95feb 100644
--- a/data/templates/npc/monster/22096-Ursus.xml
+++ b/data/templates/npc/monster/22096-Ursus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22096" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22097-LostYeti.xml b/data/templates/npc/monster/22097-LostYeti.xml
index eecb3378e..d27a1be0f 100644
--- a/data/templates/npc/monster/22097-LostYeti.xml
+++ b/data/templates/npc/monster/22097-LostYeti.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22097" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22098-FrostYeti.xml b/data/templates/npc/monster/22098-FrostYeti.xml
index 204436a36..b9ded6357 100644
--- a/data/templates/npc/monster/22098-FrostYeti.xml
+++ b/data/templates/npc/monster/22098-FrostYeti.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22098" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22099-FreyaSBuffalo.xml b/data/templates/npc/monster/22099-FreyaSBuffalo.xml
index 6555606b9..c287a91d9 100644
--- a/data/templates/npc/monster/22099-FreyaSBuffalo.xml
+++ b/data/templates/npc/monster/22099-FreyaSBuffalo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22099" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22100-FreyaSGardener.xml b/data/templates/npc/monster/22100-FreyaSGardener.xml
index 704e7cbf9..8788ea594 100644
--- a/data/templates/npc/monster/22100-FreyaSGardener.xml
+++ b/data/templates/npc/monster/22100-FreyaSGardener.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22100" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22101-FreyaSServant.xml b/data/templates/npc/monster/22101-FreyaSServant.xml
index 9aa2d4205..9c03c62ad 100644
--- a/data/templates/npc/monster/22101-FreyaSServant.xml
+++ b/data/templates/npc/monster/22101-FreyaSServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22101" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22102-FreyaSServant.xml b/data/templates/npc/monster/22102-FreyaSServant.xml
index 0b89fcd37..e3a337297 100644
--- a/data/templates/npc/monster/22102-FreyaSServant.xml
+++ b/data/templates/npc/monster/22102-FreyaSServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22102" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22103-FreyaSWhiteBear.xml b/data/templates/npc/monster/22103-FreyaSWhiteBear.xml
index e83723181..174ab0e55 100644
--- a/data/templates/npc/monster/22103-FreyaSWhiteBear.xml
+++ b/data/templates/npc/monster/22103-FreyaSWhiteBear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22103" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22104-FreyaSDog.xml b/data/templates/npc/monster/22104-FreyaSDog.xml
index 84248173e..24d2f5aa9 100644
--- a/data/templates/npc/monster/22104-FreyaSDog.xml
+++ b/data/templates/npc/monster/22104-FreyaSDog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22104" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22105-SpikedStakato.xml b/data/templates/npc/monster/22105-SpikedStakato.xml
index dc1963c6c..7ed157f61 100644
--- a/data/templates/npc/monster/22105-SpikedStakato.xml
+++ b/data/templates/npc/monster/22105-SpikedStakato.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22105" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22106-SpikedStakatoWorker.xml b/data/templates/npc/monster/22106-SpikedStakatoWorker.xml
index 2d0d32339..b91089936 100644
--- a/data/templates/npc/monster/22106-SpikedStakatoWorker.xml
+++ b/data/templates/npc/monster/22106-SpikedStakatoWorker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22106" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22107-SpikedStakatoGuard.xml b/data/templates/npc/monster/22107-SpikedStakatoGuard.xml
index 75f0c4c45..3e00d2310 100644
--- a/data/templates/npc/monster/22107-SpikedStakatoGuard.xml
+++ b/data/templates/npc/monster/22107-SpikedStakatoGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22107" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22108-FemaleSpikedStakato.xml b/data/templates/npc/monster/22108-FemaleSpikedStakato.xml
index 4b690f452..a999a0919 100644
--- a/data/templates/npc/monster/22108-FemaleSpikedStakato.xml
+++ b/data/templates/npc/monster/22108-FemaleSpikedStakato.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22108" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22109-MaleSpikedStakato.xml b/data/templates/npc/monster/22109-MaleSpikedStakato.xml
index 9eef3ff78..43c7f0d25 100644
--- a/data/templates/npc/monster/22109-MaleSpikedStakato.xml
+++ b/data/templates/npc/monster/22109-MaleSpikedStakato.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22109" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22110-MaleSpikedStakato.xml b/data/templates/npc/monster/22110-MaleSpikedStakato.xml
index 92626ddbf..d1e4abfae 100644
--- a/data/templates/npc/monster/22110-MaleSpikedStakato.xml
+++ b/data/templates/npc/monster/22110-MaleSpikedStakato.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22110" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22111-SpikedStakatoSorcerer.xml b/data/templates/npc/monster/22111-SpikedStakatoSorcerer.xml
index 2f6c2282e..104762cb4 100644
--- a/data/templates/npc/monster/22111-SpikedStakatoSorcerer.xml
+++ b/data/templates/npc/monster/22111-SpikedStakatoSorcerer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22111" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22112-CannibalisticStakatoFollower.xml b/data/templates/npc/monster/22112-CannibalisticStakatoFollower.xml
index c02db51f5..a68d21b8c 100644
--- a/data/templates/npc/monster/22112-CannibalisticStakatoFollower.xml
+++ b/data/templates/npc/monster/22112-CannibalisticStakatoFollower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22112" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22113-CannibalisticStakatoLeader.xml b/data/templates/npc/monster/22113-CannibalisticStakatoLeader.xml
index 4afae95e8..cf8a633bf 100644
--- a/data/templates/npc/monster/22113-CannibalisticStakatoLeader.xml
+++ b/data/templates/npc/monster/22113-CannibalisticStakatoLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22113" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22114-CannibalisticStakatoLeader.xml b/data/templates/npc/monster/22114-CannibalisticStakatoLeader.xml
index bcd02dbfd..72a1e139d 100644
--- a/data/templates/npc/monster/22114-CannibalisticStakatoLeader.xml
+++ b/data/templates/npc/monster/22114-CannibalisticStakatoLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22114" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22115-SpikedStakatoSoldier.xml b/data/templates/npc/monster/22115-SpikedStakatoSoldier.xml
index f2ea4b8af..d3e9c37f2 100644
--- a/data/templates/npc/monster/22115-SpikedStakatoSoldier.xml
+++ b/data/templates/npc/monster/22115-SpikedStakatoSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22115" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22116-SpikedStakatoDrone.xml b/data/templates/npc/monster/22116-SpikedStakatoDrone.xml
index 1aba07db3..ce19db6cc 100644
--- a/data/templates/npc/monster/22116-SpikedStakatoDrone.xml
+++ b/data/templates/npc/monster/22116-SpikedStakatoDrone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22116" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22117-SpikedStakatoCaptain.xml b/data/templates/npc/monster/22117-SpikedStakatoCaptain.xml
index 6d4a8385c..e50fb5a63 100644
--- a/data/templates/npc/monster/22117-SpikedStakatoCaptain.xml
+++ b/data/templates/npc/monster/22117-SpikedStakatoCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22117" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22118-SpikedStakatoNurse.xml b/data/templates/npc/monster/22118-SpikedStakatoNurse.xml
index 271c86ca4..525dfefa6 100644
--- a/data/templates/npc/monster/22118-SpikedStakatoNurse.xml
+++ b/data/templates/npc/monster/22118-SpikedStakatoNurse.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22118" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22119-SpikedStakatoNurse.xml b/data/templates/npc/monster/22119-SpikedStakatoNurse.xml
index 3d8fa1907..b37361725 100644
--- a/data/templates/npc/monster/22119-SpikedStakatoNurse.xml
+++ b/data/templates/npc/monster/22119-SpikedStakatoNurse.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22119" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22120-SpikedStakatoBaby.xml b/data/templates/npc/monster/22120-SpikedStakatoBaby.xml
index 40fa52c4e..802412a20 100644
--- a/data/templates/npc/monster/22120-SpikedStakatoBaby.xml
+++ b/data/templates/npc/monster/22120-SpikedStakatoBaby.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22120" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22121-SpikedStakatoShaman.xml b/data/templates/npc/monster/22121-SpikedStakatoShaman.xml
index 1948d49a3..44850a173 100644
--- a/data/templates/npc/monster/22121-SpikedStakatoShaman.xml
+++ b/data/templates/npc/monster/22121-SpikedStakatoShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22121" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22122-MonasticPilgrim.xml b/data/templates/npc/monster/22122-MonasticPilgrim.xml
index f9fdf5287..23c1c290c 100644
--- a/data/templates/npc/monster/22122-MonasticPilgrim.xml
+++ b/data/templates/npc/monster/22122-MonasticPilgrim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22122" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22123-MonasticCrusader.xml b/data/templates/npc/monster/22123-MonasticCrusader.xml
index c3ad0a537..e7c44bb35 100644
--- a/data/templates/npc/monster/22123-MonasticCrusader.xml
+++ b/data/templates/npc/monster/22123-MonasticCrusader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22123" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22124-SolinaBrother.xml b/data/templates/npc/monster/22124-SolinaBrother.xml
index 37d26ab0a..131a5d1c5 100644
--- a/data/templates/npc/monster/22124-SolinaBrother.xml
+++ b/data/templates/npc/monster/22124-SolinaBrother.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22124" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22125-SolinaLayBrother.xml b/data/templates/npc/monster/22125-SolinaLayBrother.xml
index 03164841f..ff69096e9 100644
--- a/data/templates/npc/monster/22125-SolinaLayBrother.xml
+++ b/data/templates/npc/monster/22125-SolinaLayBrother.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22125" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22126-SilentSeeker.xml b/data/templates/npc/monster/22126-SilentSeeker.xml
index 10609a525..c1dadd466 100644
--- a/data/templates/npc/monster/22126-SilentSeeker.xml
+++ b/data/templates/npc/monster/22126-SilentSeeker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22126" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22127-SilentBrother.xml b/data/templates/npc/monster/22127-SilentBrother.xml
index ec80eaf1f..94f53dba6 100644
--- a/data/templates/npc/monster/22127-SilentBrother.xml
+++ b/data/templates/npc/monster/22127-SilentBrother.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22127" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22128-MonasteryGuardian.xml b/data/templates/npc/monster/22128-MonasteryGuardian.xml
index ac9ac7187..91156af1e 100644
--- a/data/templates/npc/monster/22128-MonasteryGuardian.xml
+++ b/data/templates/npc/monster/22128-MonasteryGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22128" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22129-WarriorMonk.xml b/data/templates/npc/monster/22129-WarriorMonk.xml
index 3b497b764..8ba204330 100644
--- a/data/templates/npc/monster/22129-WarriorMonk.xml
+++ b/data/templates/npc/monster/22129-WarriorMonk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22129" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22130-DivineAdvocate.xml b/data/templates/npc/monster/22130-DivineAdvocate.xml
index da50d9fb3..26a5b93bb 100644
--- a/data/templates/npc/monster/22130-DivineAdvocate.xml
+++ b/data/templates/npc/monster/22130-DivineAdvocate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22130" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22131-PilgrimOfLight.xml b/data/templates/npc/monster/22131-PilgrimOfLight.xml
index b30a9c3cb..60a418056 100644
--- a/data/templates/npc/monster/22131-PilgrimOfLight.xml
+++ b/data/templates/npc/monster/22131-PilgrimOfLight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22131" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22132-JudgeOfLight.xml b/data/templates/npc/monster/22132-JudgeOfLight.xml
index 2eabc9d73..af0492bba 100644
--- a/data/templates/npc/monster/22132-JudgeOfLight.xml
+++ b/data/templates/npc/monster/22132-JudgeOfLight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22132" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22133-GuardianOfTheGrail.xml b/data/templates/npc/monster/22133-GuardianOfTheGrail.xml
index ce922c186..0af222900 100644
--- a/data/templates/npc/monster/22133-GuardianOfTheGrail.xml
+++ b/data/templates/npc/monster/22133-GuardianOfTheGrail.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22133" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22134-GuardianOfTheHolyLand.xml b/data/templates/npc/monster/22134-GuardianOfTheHolyLand.xml
index 66c0a7e82..d59cf8848 100644
--- a/data/templates/npc/monster/22134-GuardianOfTheHolyLand.xml
+++ b/data/templates/npc/monster/22134-GuardianOfTheHolyLand.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22134" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22135-BeholderOfLight.xml b/data/templates/npc/monster/22135-BeholderOfLight.xml
index ce1777866..7810357c1 100644
--- a/data/templates/npc/monster/22135-BeholderOfLight.xml
+++ b/data/templates/npc/monster/22135-BeholderOfLight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22135" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22136-GatekeeperZombie.xml b/data/templates/npc/monster/22136-GatekeeperZombie.xml
index b158ab1ef..dcf560cee 100644
--- a/data/templates/npc/monster/22136-GatekeeperZombie.xml
+++ b/data/templates/npc/monster/22136-GatekeeperZombie.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22136" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22137-PenanceGuard.xml b/data/templates/npc/monster/22137-PenanceGuard.xml
index 990f43224..205e701d2 100644
--- a/data/templates/npc/monster/22137-PenanceGuard.xml
+++ b/data/templates/npc/monster/22137-PenanceGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22137" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22138-ChapelGuard.xml b/data/templates/npc/monster/22138-ChapelGuard.xml
index 9530578c0..07dff0053 100644
--- a/data/templates/npc/monster/22138-ChapelGuard.xml
+++ b/data/templates/npc/monster/22138-ChapelGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22138" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22139-OldAristocratSSoldier.xml b/data/templates/npc/monster/22139-OldAristocratSSoldier.xml
index 2116284e3..f75712ecc 100644
--- a/data/templates/npc/monster/22139-OldAristocratSSoldier.xml
+++ b/data/templates/npc/monster/22139-OldAristocratSSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22139" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22140-ZombieWorker.xml b/data/templates/npc/monster/22140-ZombieWorker.xml
index 782daf086..cfd0fd1e3 100644
--- a/data/templates/npc/monster/22140-ZombieWorker.xml
+++ b/data/templates/npc/monster/22140-ZombieWorker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22140" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22141-ForgottenVictim.xml b/data/templates/npc/monster/22141-ForgottenVictim.xml
index 3045061bd..727508672 100644
--- a/data/templates/npc/monster/22141-ForgottenVictim.xml
+++ b/data/templates/npc/monster/22141-ForgottenVictim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22141" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22142-TriolSLayperson.xml b/data/templates/npc/monster/22142-TriolSLayperson.xml
index 43ebf7edd..129baec66 100644
--- a/data/templates/npc/monster/22142-TriolSLayperson.xml
+++ b/data/templates/npc/monster/22142-TriolSLayperson.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22142" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22143-TriolSBeliever.xml b/data/templates/npc/monster/22143-TriolSBeliever.xml
index e4af7dd48..2b648b166 100644
--- a/data/templates/npc/monster/22143-TriolSBeliever.xml
+++ b/data/templates/npc/monster/22143-TriolSBeliever.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22143" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22144-ResurrectedTempleKnight.xml b/data/templates/npc/monster/22144-ResurrectedTempleKnight.xml
index 367ab6147..e0079e2a2 100644
--- a/data/templates/npc/monster/22144-ResurrectedTempleKnight.xml
+++ b/data/templates/npc/monster/22144-ResurrectedTempleKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22144" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22145-RitualSacrifice.xml b/data/templates/npc/monster/22145-RitualSacrifice.xml
index bee3d2e2a..9e1c9efd6 100644
--- a/data/templates/npc/monster/22145-RitualSacrifice.xml
+++ b/data/templates/npc/monster/22145-RitualSacrifice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22145" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22146-TriolSPriest.xml b/data/templates/npc/monster/22146-TriolSPriest.xml
index c45543f54..3ac82c5c8 100644
--- a/data/templates/npc/monster/22146-TriolSPriest.xml
+++ b/data/templates/npc/monster/22146-TriolSPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22146" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22147-RitualOffering.xml b/data/templates/npc/monster/22147-RitualOffering.xml
index b3836c5e0..6f6d29143 100644
--- a/data/templates/npc/monster/22147-RitualOffering.xml
+++ b/data/templates/npc/monster/22147-RitualOffering.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22147" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22148-TriolSBeliever.xml b/data/templates/npc/monster/22148-TriolSBeliever.xml
index 79e78733d..b529325c1 100644
--- a/data/templates/npc/monster/22148-TriolSBeliever.xml
+++ b/data/templates/npc/monster/22148-TriolSBeliever.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22148" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22149-RitualOffering.xml b/data/templates/npc/monster/22149-RitualOffering.xml
index 242369cfd..415332882 100644
--- a/data/templates/npc/monster/22149-RitualOffering.xml
+++ b/data/templates/npc/monster/22149-RitualOffering.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22149" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22150-TriolSBeliever.xml b/data/templates/npc/monster/22150-TriolSBeliever.xml
index 17e39e740..faf90af34 100644
--- a/data/templates/npc/monster/22150-TriolSBeliever.xml
+++ b/data/templates/npc/monster/22150-TriolSBeliever.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22150" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22151-TriolSPriest.xml b/data/templates/npc/monster/22151-TriolSPriest.xml
index af508c24c..311d94ada 100644
--- a/data/templates/npc/monster/22151-TriolSPriest.xml
+++ b/data/templates/npc/monster/22151-TriolSPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22151" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22152-TempleGuard.xml b/data/templates/npc/monster/22152-TempleGuard.xml
index 3f969be51..39513acd9 100644
--- a/data/templates/npc/monster/22152-TempleGuard.xml
+++ b/data/templates/npc/monster/22152-TempleGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22152" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22153-TempleGuardCaptain.xml b/data/templates/npc/monster/22153-TempleGuardCaptain.xml
index 11a1634be..7b6becf6a 100644
--- a/data/templates/npc/monster/22153-TempleGuardCaptain.xml
+++ b/data/templates/npc/monster/22153-TempleGuardCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22153" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22154-RitualSacrifice.xml b/data/templates/npc/monster/22154-RitualSacrifice.xml
index cd5d4523f..00ae40389 100644
--- a/data/templates/npc/monster/22154-RitualSacrifice.xml
+++ b/data/templates/npc/monster/22154-RitualSacrifice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22154" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22155-TriolSHighPriest.xml b/data/templates/npc/monster/22155-TriolSHighPriest.xml
index 17e07f06c..9deb57fc5 100644
--- a/data/templates/npc/monster/22155-TriolSHighPriest.xml
+++ b/data/templates/npc/monster/22155-TriolSHighPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22155" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22156-TriolSPriest.xml b/data/templates/npc/monster/22156-TriolSPriest.xml
index 4cd819525..f6d852c76 100644
--- a/data/templates/npc/monster/22156-TriolSPriest.xml
+++ b/data/templates/npc/monster/22156-TriolSPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22156" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22157-TriolSPriest.xml b/data/templates/npc/monster/22157-TriolSPriest.xml
index 65e75e375..eef7c2594 100644
--- a/data/templates/npc/monster/22157-TriolSPriest.xml
+++ b/data/templates/npc/monster/22157-TriolSPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22157" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22158-TriolSBeliever.xml b/data/templates/npc/monster/22158-TriolSBeliever.xml
index f68d1e778..b841ffd2e 100644
--- a/data/templates/npc/monster/22158-TriolSBeliever.xml
+++ b/data/templates/npc/monster/22158-TriolSBeliever.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22158" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22159-TriolSHighPriest.xml b/data/templates/npc/monster/22159-TriolSHighPriest.xml
index 719bbdc45..d5b2e4ca8 100644
--- a/data/templates/npc/monster/22159-TriolSHighPriest.xml
+++ b/data/templates/npc/monster/22159-TriolSHighPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22159" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22160-TriolSPriest.xml b/data/templates/npc/monster/22160-TriolSPriest.xml
index e1a4ee8cd..dcf06609e 100644
--- a/data/templates/npc/monster/22160-TriolSPriest.xml
+++ b/data/templates/npc/monster/22160-TriolSPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22160" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22161-RitualSacrifice.xml b/data/templates/npc/monster/22161-RitualSacrifice.xml
index c2265646a..10166a0d9 100644
--- a/data/templates/npc/monster/22161-RitualSacrifice.xml
+++ b/data/templates/npc/monster/22161-RitualSacrifice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22161" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22162-TriolSBeliever.xml b/data/templates/npc/monster/22162-TriolSBeliever.xml
index b9cc230b1..0e1d84b90 100644
--- a/data/templates/npc/monster/22162-TriolSBeliever.xml
+++ b/data/templates/npc/monster/22162-TriolSBeliever.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22162" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22163-TriolSHighPriest.xml b/data/templates/npc/monster/22163-TriolSHighPriest.xml
index 6e7aa6129..f3d683ad2 100644
--- a/data/templates/npc/monster/22163-TriolSHighPriest.xml
+++ b/data/templates/npc/monster/22163-TriolSHighPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22163" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22164-TriolSBeliever.xml b/data/templates/npc/monster/22164-TriolSBeliever.xml
index f08e477f3..3fc7669be 100644
--- a/data/templates/npc/monster/22164-TriolSBeliever.xml
+++ b/data/templates/npc/monster/22164-TriolSBeliever.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22164" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22165-TriolSPriest.xml b/data/templates/npc/monster/22165-TriolSPriest.xml
index 4a9b7ac7e..f5da1f2f5 100644
--- a/data/templates/npc/monster/22165-TriolSPriest.xml
+++ b/data/templates/npc/monster/22165-TriolSPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22165" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22166-TriolSBeliever.xml b/data/templates/npc/monster/22166-TriolSBeliever.xml
index 49e6af283..028b44edd 100644
--- a/data/templates/npc/monster/22166-TriolSBeliever.xml
+++ b/data/templates/npc/monster/22166-TriolSBeliever.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22166" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22167-TriolSHighPriest.xml b/data/templates/npc/monster/22167-TriolSHighPriest.xml
index 8416fcab4..359cf1c4a 100644
--- a/data/templates/npc/monster/22167-TriolSHighPriest.xml
+++ b/data/templates/npc/monster/22167-TriolSHighPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22167" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22168-TriolSPriest.xml b/data/templates/npc/monster/22168-TriolSPriest.xml
index 9bfc96286..62e1e2a23 100644
--- a/data/templates/npc/monster/22168-TriolSPriest.xml
+++ b/data/templates/npc/monster/22168-TriolSPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22168" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22169-RitualSacrifice.xml b/data/templates/npc/monster/22169-RitualSacrifice.xml
index 0b7114335..07c6a6612 100644
--- a/data/templates/npc/monster/22169-RitualSacrifice.xml
+++ b/data/templates/npc/monster/22169-RitualSacrifice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22169" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22170-TriolSBeliever.xml b/data/templates/npc/monster/22170-TriolSBeliever.xml
index 130a0f3fc..409adf3d2 100644
--- a/data/templates/npc/monster/22170-TriolSBeliever.xml
+++ b/data/templates/npc/monster/22170-TriolSBeliever.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22170" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22171-TriolSHighPriest.xml b/data/templates/npc/monster/22171-TriolSHighPriest.xml
index 70dacff98..de07f66eb 100644
--- a/data/templates/npc/monster/22171-TriolSHighPriest.xml
+++ b/data/templates/npc/monster/22171-TriolSHighPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22171" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22172-RitualSacrifice.xml b/data/templates/npc/monster/22172-RitualSacrifice.xml
index eef616d8a..6e9362f9b 100644
--- a/data/templates/npc/monster/22172-RitualSacrifice.xml
+++ b/data/templates/npc/monster/22172-RitualSacrifice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22172" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22173-TriolSPriest.xml b/data/templates/npc/monster/22173-TriolSPriest.xml
index d0545951f..4135067e1 100644
--- a/data/templates/npc/monster/22173-TriolSPriest.xml
+++ b/data/templates/npc/monster/22173-TriolSPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22173" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22174-TriolSPriest.xml b/data/templates/npc/monster/22174-TriolSPriest.xml
index d049ec58c..9b2dd6b5d 100644
--- a/data/templates/npc/monster/22174-TriolSPriest.xml
+++ b/data/templates/npc/monster/22174-TriolSPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22174" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22175-AndreasCaptainOfTheRoyalGuard.xml b/data/templates/npc/monster/22175-AndreasCaptainOfTheRoyalGuard.xml
index 8a8f51e47..7d65b422f 100644
--- a/data/templates/npc/monster/22175-AndreasCaptainOfTheRoyalGuard.xml
+++ b/data/templates/npc/monster/22175-AndreasCaptainOfTheRoyalGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22175" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22176-AndreasRoyalGuards.xml b/data/templates/npc/monster/22176-AndreasRoyalGuards.xml
index 17611afa7..ffeff48f5 100644
--- a/data/templates/npc/monster/22176-AndreasRoyalGuards.xml
+++ b/data/templates/npc/monster/22176-AndreasRoyalGuards.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22176" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22188-AndreasCaptainOfTheRoyalGuard.xml b/data/templates/npc/monster/22188-AndreasCaptainOfTheRoyalGuard.xml
index fac237662..a22236072 100644
--- a/data/templates/npc/monster/22188-AndreasCaptainOfTheRoyalGuard.xml
+++ b/data/templates/npc/monster/22188-AndreasCaptainOfTheRoyalGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22188" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22189-AndreasRoyalGuards.xml b/data/templates/npc/monster/22189-AndreasRoyalGuards.xml
index 52786a12b..4f20c8f84 100644
--- a/data/templates/npc/monster/22189-AndreasRoyalGuards.xml
+++ b/data/templates/npc/monster/22189-AndreasRoyalGuards.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22189" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22190-RitualSacrifice.xml b/data/templates/npc/monster/22190-RitualSacrifice.xml
index 2feb8da80..1bcd9c3b1 100644
--- a/data/templates/npc/monster/22190-RitualSacrifice.xml
+++ b/data/templates/npc/monster/22190-RitualSacrifice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22190" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22191-AndreasCaptainOfTheRoyalGuard.xml b/data/templates/npc/monster/22191-AndreasCaptainOfTheRoyalGuard.xml
index d5dc4ccb7..0638f8065 100644
--- a/data/templates/npc/monster/22191-AndreasCaptainOfTheRoyalGuard.xml
+++ b/data/templates/npc/monster/22191-AndreasCaptainOfTheRoyalGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22191" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22192-AndreasRoyalGuards.xml b/data/templates/npc/monster/22192-AndreasRoyalGuards.xml
index e52020135..a9d831e42 100644
--- a/data/templates/npc/monster/22192-AndreasRoyalGuards.xml
+++ b/data/templates/npc/monster/22192-AndreasRoyalGuards.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22192" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22193-AndreasRoyalGuards.xml b/data/templates/npc/monster/22193-AndreasRoyalGuards.xml
index 35541746f..311ad3582 100644
--- a/data/templates/npc/monster/22193-AndreasRoyalGuards.xml
+++ b/data/templates/npc/monster/22193-AndreasRoyalGuards.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22193" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22194-PenanceGuard.xml b/data/templates/npc/monster/22194-PenanceGuard.xml
index 16b9fd36c..d620cbffc 100644
--- a/data/templates/npc/monster/22194-PenanceGuard.xml
+++ b/data/templates/npc/monster/22194-PenanceGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22194" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22195-RitualSacrifice.xml b/data/templates/npc/monster/22195-RitualSacrifice.xml
index b5b83335e..058cbdcc3 100644
--- a/data/templates/npc/monster/22195-RitualSacrifice.xml
+++ b/data/templates/npc/monster/22195-RitualSacrifice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22195" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22196-Velociraptor.xml b/data/templates/npc/monster/22196-Velociraptor.xml
index 3ce3a57d8..83abcc3e9 100644
--- a/data/templates/npc/monster/22196-Velociraptor.xml
+++ b/data/templates/npc/monster/22196-Velociraptor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22196" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22197-Velociraptor.xml b/data/templates/npc/monster/22197-Velociraptor.xml
index 7151e33a1..88fe77bbd 100644
--- a/data/templates/npc/monster/22197-Velociraptor.xml
+++ b/data/templates/npc/monster/22197-Velociraptor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22197" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22198-Velociraptor.xml b/data/templates/npc/monster/22198-Velociraptor.xml
index 36c1f6e97..3e32e9d04 100644
--- a/data/templates/npc/monster/22198-Velociraptor.xml
+++ b/data/templates/npc/monster/22198-Velociraptor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22198" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22199-Pterosaur.xml b/data/templates/npc/monster/22199-Pterosaur.xml
index 44bf66271..38386e435 100644
--- a/data/templates/npc/monster/22199-Pterosaur.xml
+++ b/data/templates/npc/monster/22199-Pterosaur.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22199" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22200-Ornithomimus.xml b/data/templates/npc/monster/22200-Ornithomimus.xml
index 533c88ba2..2b5c33689 100644
--- a/data/templates/npc/monster/22200-Ornithomimus.xml
+++ b/data/templates/npc/monster/22200-Ornithomimus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22200" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22201-Ornithomimus.xml b/data/templates/npc/monster/22201-Ornithomimus.xml
index 5dbbda2c9..08183cfba 100644
--- a/data/templates/npc/monster/22201-Ornithomimus.xml
+++ b/data/templates/npc/monster/22201-Ornithomimus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22201" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22202-Ornithomimus.xml b/data/templates/npc/monster/22202-Ornithomimus.xml
index 741a7bc4d..c9a44fdbb 100644
--- a/data/templates/npc/monster/22202-Ornithomimus.xml
+++ b/data/templates/npc/monster/22202-Ornithomimus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22202" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22203-Deinonychus.xml b/data/templates/npc/monster/22203-Deinonychus.xml
index b08073d74..3a69dde2d 100644
--- a/data/templates/npc/monster/22203-Deinonychus.xml
+++ b/data/templates/npc/monster/22203-Deinonychus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22203" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22204-Deinonychus.xml b/data/templates/npc/monster/22204-Deinonychus.xml
index 9c365a8fe..e3ec6b34a 100644
--- a/data/templates/npc/monster/22204-Deinonychus.xml
+++ b/data/templates/npc/monster/22204-Deinonychus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22204" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22205-Deinonychus.xml b/data/templates/npc/monster/22205-Deinonychus.xml
index adbcc4300..215f975e6 100644
--- a/data/templates/npc/monster/22205-Deinonychus.xml
+++ b/data/templates/npc/monster/22205-Deinonychus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22205" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22208-Pachycephalosaurus.xml b/data/templates/npc/monster/22208-Pachycephalosaurus.xml
index f674091a7..8edac1f37 100644
--- a/data/templates/npc/monster/22208-Pachycephalosaurus.xml
+++ b/data/templates/npc/monster/22208-Pachycephalosaurus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22208" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22209-Pachycephalosaurus.xml b/data/templates/npc/monster/22209-Pachycephalosaurus.xml
index 49f580f14..5d1f92fa7 100644
--- a/data/templates/npc/monster/22209-Pachycephalosaurus.xml
+++ b/data/templates/npc/monster/22209-Pachycephalosaurus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22209" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22210-Pachycephalosaurus.xml b/data/templates/npc/monster/22210-Pachycephalosaurus.xml
index c364c7076..d0f139e01 100644
--- a/data/templates/npc/monster/22210-Pachycephalosaurus.xml
+++ b/data/templates/npc/monster/22210-Pachycephalosaurus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22210" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22211-WildStrider.xml b/data/templates/npc/monster/22211-WildStrider.xml
index fc5afffd3..95e0722a4 100644
--- a/data/templates/npc/monster/22211-WildStrider.xml
+++ b/data/templates/npc/monster/22211-WildStrider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22211" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22212-WildStrider.xml b/data/templates/npc/monster/22212-WildStrider.xml
index 2b3408d47..65abe6542 100644
--- a/data/templates/npc/monster/22212-WildStrider.xml
+++ b/data/templates/npc/monster/22212-WildStrider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22212" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22213-WildStrider.xml b/data/templates/npc/monster/22213-WildStrider.xml
index d13f7e812..750c22f83 100644
--- a/data/templates/npc/monster/22213-WildStrider.xml
+++ b/data/templates/npc/monster/22213-WildStrider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22213" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22214-Elroki.xml b/data/templates/npc/monster/22214-Elroki.xml
index 56974bb2c..1469b9f09 100644
--- a/data/templates/npc/monster/22214-Elroki.xml
+++ b/data/templates/npc/monster/22214-Elroki.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22214" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22215-Tyrannosaurus.xml b/data/templates/npc/monster/22215-Tyrannosaurus.xml
index 17e540a03..5ae513859 100644
--- a/data/templates/npc/monster/22215-Tyrannosaurus.xml
+++ b/data/templates/npc/monster/22215-Tyrannosaurus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22215" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22216-Tyrannosaurus.xml b/data/templates/npc/monster/22216-Tyrannosaurus.xml
index 80c150d51..1a4ac5824 100644
--- a/data/templates/npc/monster/22216-Tyrannosaurus.xml
+++ b/data/templates/npc/monster/22216-Tyrannosaurus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22216" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22217-Tyrannosaurus.xml b/data/templates/npc/monster/22217-Tyrannosaurus.xml
index 13f110804..15a5e20e2 100644
--- a/data/templates/npc/monster/22217-Tyrannosaurus.xml
+++ b/data/templates/npc/monster/22217-Tyrannosaurus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22217" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22218-Velociraptor.xml b/data/templates/npc/monster/22218-Velociraptor.xml
index 2d1fbf24f..2d7c7bdf2 100644
--- a/data/templates/npc/monster/22218-Velociraptor.xml
+++ b/data/templates/npc/monster/22218-Velociraptor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22218" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22219-Ornithomimus.xml b/data/templates/npc/monster/22219-Ornithomimus.xml
index 4b2bf6c41..c21c87dce 100644
--- a/data/templates/npc/monster/22219-Ornithomimus.xml
+++ b/data/templates/npc/monster/22219-Ornithomimus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22219" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22220-Deinonychus.xml b/data/templates/npc/monster/22220-Deinonychus.xml
index cfd6a3df5..4816907e8 100644
--- a/data/templates/npc/monster/22220-Deinonychus.xml
+++ b/data/templates/npc/monster/22220-Deinonychus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22220" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22221-Pachycephalosaurus.xml b/data/templates/npc/monster/22221-Pachycephalosaurus.xml
index 36ac6e144..9da494016 100644
--- a/data/templates/npc/monster/22221-Pachycephalosaurus.xml
+++ b/data/templates/npc/monster/22221-Pachycephalosaurus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22221" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22222-WildStrider.xml b/data/templates/npc/monster/22222-WildStrider.xml
index 1254357da..2c0d50b6b 100644
--- a/data/templates/npc/monster/22222-WildStrider.xml
+++ b/data/templates/npc/monster/22222-WildStrider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22222" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22223-Velociraptor.xml b/data/templates/npc/monster/22223-Velociraptor.xml
index 9db186486..2f68696bb 100644
--- a/data/templates/npc/monster/22223-Velociraptor.xml
+++ b/data/templates/npc/monster/22223-Velociraptor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22223" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22224-Ornithomimus.xml b/data/templates/npc/monster/22224-Ornithomimus.xml
index 7f2f9960a..2b82104e8 100644
--- a/data/templates/npc/monster/22224-Ornithomimus.xml
+++ b/data/templates/npc/monster/22224-Ornithomimus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22224" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22225-Deinonychus.xml b/data/templates/npc/monster/22225-Deinonychus.xml
index 66b07d9d7..16abd3c57 100644
--- a/data/templates/npc/monster/22225-Deinonychus.xml
+++ b/data/templates/npc/monster/22225-Deinonychus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22225" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22226-Pachycephalosaurus.xml b/data/templates/npc/monster/22226-Pachycephalosaurus.xml
index bb9f60963..26c385f1a 100644
--- a/data/templates/npc/monster/22226-Pachycephalosaurus.xml
+++ b/data/templates/npc/monster/22226-Pachycephalosaurus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22226" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22227-WildStrider.xml b/data/templates/npc/monster/22227-WildStrider.xml
index b74ff8f84..46a4c1656 100644
--- a/data/templates/npc/monster/22227-WildStrider.xml
+++ b/data/templates/npc/monster/22227-WildStrider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22227" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22228-GreyElpy.xml b/data/templates/npc/monster/22228-GreyElpy.xml
index 15151fdec..e94317646 100644
--- a/data/templates/npc/monster/22228-GreyElpy.xml
+++ b/data/templates/npc/monster/22228-GreyElpy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22228" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22229-YoungGreyKeltir.xml b/data/templates/npc/monster/22229-YoungGreyKeltir.xml
index 16d4e5325..f68161bd6 100644
--- a/data/templates/npc/monster/22229-YoungGreyKeltir.xml
+++ b/data/templates/npc/monster/22229-YoungGreyKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22229" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22230-GreyKeltir.xml b/data/templates/npc/monster/22230-GreyKeltir.xml
index d5d086c55..72f1cc1d5 100644
--- a/data/templates/npc/monster/22230-GreyKeltir.xml
+++ b/data/templates/npc/monster/22230-GreyKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22230" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22231-DominantGreyKeltir.xml b/data/templates/npc/monster/22231-DominantGreyKeltir.xml
index aa8e18881..1547d52f7 100644
--- a/data/templates/npc/monster/22231-DominantGreyKeltir.xml
+++ b/data/templates/npc/monster/22231-DominantGreyKeltir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22231" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22232-BlackWolf.xml b/data/templates/npc/monster/22232-BlackWolf.xml
index 047f3a86b..1580fedc6 100644
--- a/data/templates/npc/monster/22232-BlackWolf.xml
+++ b/data/templates/npc/monster/22232-BlackWolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22232" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22233-DominantBlackWolf.xml b/data/templates/npc/monster/22233-DominantBlackWolf.xml
index ba1ed6c27..f575f5709 100644
--- a/data/templates/npc/monster/22233-DominantBlackWolf.xml
+++ b/data/templates/npc/monster/22233-DominantBlackWolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22233" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22234-GreenGoblin.xml b/data/templates/npc/monster/22234-GreenGoblin.xml
index cfb04afac..9a1484ea0 100644
--- a/data/templates/npc/monster/22234-GreenGoblin.xml
+++ b/data/templates/npc/monster/22234-GreenGoblin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22234" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22235-MountainWerewolf.xml b/data/templates/npc/monster/22235-MountainWerewolf.xml
index f93a7c905..1db7f4c3c 100644
--- a/data/templates/npc/monster/22235-MountainWerewolf.xml
+++ b/data/templates/npc/monster/22235-MountainWerewolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22235" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22236-MuertosArcher.xml b/data/templates/npc/monster/22236-MuertosArcher.xml
index c8d5d0600..bcfd322b3 100644
--- a/data/templates/npc/monster/22236-MuertosArcher.xml
+++ b/data/templates/npc/monster/22236-MuertosArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22236" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22237-MountainFungus.xml b/data/templates/npc/monster/22237-MountainFungus.xml
index dcc99a415..738cf3942 100644
--- a/data/templates/npc/monster/22237-MountainFungus.xml
+++ b/data/templates/npc/monster/22237-MountainFungus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22237" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22238-MountainWerewolfChief.xml b/data/templates/npc/monster/22238-MountainWerewolfChief.xml
index 26180d17c..1c756fe87 100644
--- a/data/templates/npc/monster/22238-MountainWerewolfChief.xml
+++ b/data/templates/npc/monster/22238-MountainWerewolfChief.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22238" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22239-MuertosGuard.xml b/data/templates/npc/monster/22239-MuertosGuard.xml
index 07d9209f1..a30f60fa8 100644
--- a/data/templates/npc/monster/22239-MuertosGuard.xml
+++ b/data/templates/npc/monster/22239-MuertosGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22239" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22240-MuertosScout.xml b/data/templates/npc/monster/22240-MuertosScout.xml
index c028a480d..573a8af5e 100644
--- a/data/templates/npc/monster/22240-MuertosScout.xml
+++ b/data/templates/npc/monster/22240-MuertosScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22240" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22241-Colossus.xml b/data/templates/npc/monster/22241-Colossus.xml
index e0913f027..1b7b7d72a 100644
--- a/data/templates/npc/monster/22241-Colossus.xml
+++ b/data/templates/npc/monster/22241-Colossus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22241" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22242-MuertosWarrior.xml b/data/templates/npc/monster/22242-MuertosWarrior.xml
index 28e14ea35..8ef9287a1 100644
--- a/data/templates/npc/monster/22242-MuertosWarrior.xml
+++ b/data/templates/npc/monster/22242-MuertosWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22242" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22243-MuertosCaptain.xml b/data/templates/npc/monster/22243-MuertosCaptain.xml
index 0cc128b0b..8b98340fb 100644
--- a/data/templates/npc/monster/22243-MuertosCaptain.xml
+++ b/data/templates/npc/monster/22243-MuertosCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22243" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22244-CrimsonSpider.xml b/data/templates/npc/monster/22244-CrimsonSpider.xml
index b9caf3d06..72d7b9e3c 100644
--- a/data/templates/npc/monster/22244-CrimsonSpider.xml
+++ b/data/templates/npc/monster/22244-CrimsonSpider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22244" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22245-MuertosLieutenant.xml b/data/templates/npc/monster/22245-MuertosLieutenant.xml
index 3ddd4fb4d..ca2f1d6b0 100644
--- a/data/templates/npc/monster/22245-MuertosLieutenant.xml
+++ b/data/templates/npc/monster/22245-MuertosLieutenant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22245" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22246-MuertosCommander.xml b/data/templates/npc/monster/22246-MuertosCommander.xml
index fa94afcd8..8179c74fc 100644
--- a/data/templates/npc/monster/22246-MuertosCommander.xml
+++ b/data/templates/npc/monster/22246-MuertosCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22246" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22247-GrottoGolem.xml b/data/templates/npc/monster/22247-GrottoGolem.xml
index f7e330b62..8f9a63d27 100644
--- a/data/templates/npc/monster/22247-GrottoGolem.xml
+++ b/data/templates/npc/monster/22247-GrottoGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22247" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22248-ShadyMuertos.xml b/data/templates/npc/monster/22248-ShadyMuertos.xml
index c827555d9..bf33f1921 100644
--- a/data/templates/npc/monster/22248-ShadyMuertos.xml
+++ b/data/templates/npc/monster/22248-ShadyMuertos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22248" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22249-ShadyMuertosGuard.xml b/data/templates/npc/monster/22249-ShadyMuertosGuard.xml
index 6445cc60e..37620303c 100644
--- a/data/templates/npc/monster/22249-ShadyMuertosGuard.xml
+++ b/data/templates/npc/monster/22249-ShadyMuertosGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22249" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22250-GrottoLeopard.xml b/data/templates/npc/monster/22250-GrottoLeopard.xml
index 6193ef5dd..2bbb1b415 100644
--- a/data/templates/npc/monster/22250-GrottoLeopard.xml
+++ b/data/templates/npc/monster/22250-GrottoLeopard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22250" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22251-ShadyMuertosCaptain.xml b/data/templates/npc/monster/22251-ShadyMuertosCaptain.xml
index 263a66e5e..efca33ca2 100644
--- a/data/templates/npc/monster/22251-ShadyMuertosCaptain.xml
+++ b/data/templates/npc/monster/22251-ShadyMuertosCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22251" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22252-GrottoGrizzly.xml b/data/templates/npc/monster/22252-GrottoGrizzly.xml
index dc748596c..47a212777 100644
--- a/data/templates/npc/monster/22252-GrottoGrizzly.xml
+++ b/data/templates/npc/monster/22252-GrottoGrizzly.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22252" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22253-ShadyMuertosWarrior.xml b/data/templates/npc/monster/22253-ShadyMuertosWarrior.xml
index 0790f53b5..e04a9aafa 100644
--- a/data/templates/npc/monster/22253-ShadyMuertosWarrior.xml
+++ b/data/templates/npc/monster/22253-ShadyMuertosWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22253" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22254-ShadyMuertosArcher.xml b/data/templates/npc/monster/22254-ShadyMuertosArcher.xml
index bcfdc6356..813afcd0b 100644
--- a/data/templates/npc/monster/22254-ShadyMuertosArcher.xml
+++ b/data/templates/npc/monster/22254-ShadyMuertosArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22254" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22255-ShadyMuertosCommander.xml b/data/templates/npc/monster/22255-ShadyMuertosCommander.xml
index e7833a17c..bd24ee28a 100644
--- a/data/templates/npc/monster/22255-ShadyMuertosCommander.xml
+++ b/data/templates/npc/monster/22255-ShadyMuertosCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22255" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22256-ShadyMuertosWizard.xml b/data/templates/npc/monster/22256-ShadyMuertosWizard.xml
index ffca62a1e..b14df544a 100644
--- a/data/templates/npc/monster/22256-ShadyMuertosWizard.xml
+++ b/data/templates/npc/monster/22256-ShadyMuertosWizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22256" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22257-IslandGuardian.xml b/data/templates/npc/monster/22257-IslandGuardian.xml
index 2b5ad6684..dd27fc63d 100644
--- a/data/templates/npc/monster/22257-IslandGuardian.xml
+++ b/data/templates/npc/monster/22257-IslandGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22257" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22258-WhiteSandMirage.xml b/data/templates/npc/monster/22258-WhiteSandMirage.xml
index 5032a57ce..b8b285c2e 100644
--- a/data/templates/npc/monster/22258-WhiteSandMirage.xml
+++ b/data/templates/npc/monster/22258-WhiteSandMirage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22258" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22259-MuddyCoral.xml b/data/templates/npc/monster/22259-MuddyCoral.xml
index 6f4b183c8..7daa39ebf 100644
--- a/data/templates/npc/monster/22259-MuddyCoral.xml
+++ b/data/templates/npc/monster/22259-MuddyCoral.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22259" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22260-Kleopora.xml b/data/templates/npc/monster/22260-Kleopora.xml
index 85a552d28..d150fa20a 100644
--- a/data/templates/npc/monster/22260-Kleopora.xml
+++ b/data/templates/npc/monster/22260-Kleopora.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22260" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22261-Seychelles.xml b/data/templates/npc/monster/22261-Seychelles.xml
index 43f7449de..f8f5fabf3 100644
--- a/data/templates/npc/monster/22261-Seychelles.xml
+++ b/data/templates/npc/monster/22261-Seychelles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22261" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22262-Naiad.xml b/data/templates/npc/monster/22262-Naiad.xml
index 4a6e7cd15..f3be36d43 100644
--- a/data/templates/npc/monster/22262-Naiad.xml
+++ b/data/templates/npc/monster/22262-Naiad.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22262" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22263-Sonneratia.xml b/data/templates/npc/monster/22263-Sonneratia.xml
index 97b665a53..7d80ea0a4 100644
--- a/data/templates/npc/monster/22263-Sonneratia.xml
+++ b/data/templates/npc/monster/22263-Sonneratia.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22263" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22264-Castalia.xml b/data/templates/npc/monster/22264-Castalia.xml
index 6c3654ecb..c46ade445 100644
--- a/data/templates/npc/monster/22264-Castalia.xml
+++ b/data/templates/npc/monster/22264-Castalia.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22264" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22265-Chrysocolla.xml b/data/templates/npc/monster/22265-Chrysocolla.xml
index 6397ee205..5d5511e31 100644
--- a/data/templates/npc/monster/22265-Chrysocolla.xml
+++ b/data/templates/npc/monster/22265-Chrysocolla.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22265" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22266-Pythia.xml b/data/templates/npc/monster/22266-Pythia.xml
index 5862c9e21..1784235d3 100644
--- a/data/templates/npc/monster/22266-Pythia.xml
+++ b/data/templates/npc/monster/22266-Pythia.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22266" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22267-DarkWaterDragon.xml b/data/templates/npc/monster/22267-DarkWaterDragon.xml
index 899d3eb58..6f902df02 100644
--- a/data/templates/npc/monster/22267-DarkWaterDragon.xml
+++ b/data/templates/npc/monster/22267-DarkWaterDragon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22267" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22268-Shade.xml b/data/templates/npc/monster/22268-Shade.xml
index d4f35d558..6dee5e93c 100644
--- a/data/templates/npc/monster/22268-Shade.xml
+++ b/data/templates/npc/monster/22268-Shade.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22268" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22269-Shade.xml b/data/templates/npc/monster/22269-Shade.xml
index 767ffbde1..3f4d21c79 100644
--- a/data/templates/npc/monster/22269-Shade.xml
+++ b/data/templates/npc/monster/22269-Shade.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22269" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22270-WaterDragonDetractor.xml b/data/templates/npc/monster/22270-WaterDragonDetractor.xml
index 022e1cf30..9009cc96c 100644
--- a/data/templates/npc/monster/22270-WaterDragonDetractor.xml
+++ b/data/templates/npc/monster/22270-WaterDragonDetractor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22270" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22271-WaterDragonDetractor.xml b/data/templates/npc/monster/22271-WaterDragonDetractor.xml
index b42f69050..b0c873688 100644
--- a/data/templates/npc/monster/22271-WaterDragonDetractor.xml
+++ b/data/templates/npc/monster/22271-WaterDragonDetractor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22271" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22272-BelethSMinion.xml b/data/templates/npc/monster/22272-BelethSMinion.xml
index e8504b121..532d794d3 100644
--- a/data/templates/npc/monster/22272-BelethSMinion.xml
+++ b/data/templates/npc/monster/22272-BelethSMinion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22272" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22273-BelethSMinion.xml b/data/templates/npc/monster/22273-BelethSMinion.xml
index 95fc524a7..ccae590af 100644
--- a/data/templates/npc/monster/22273-BelethSMinion.xml
+++ b/data/templates/npc/monster/22273-BelethSMinion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22273" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22274-BelethSMinion.xml b/data/templates/npc/monster/22274-BelethSMinion.xml
index 29aad794b..a222c73a4 100644
--- a/data/templates/npc/monster/22274-BelethSMinion.xml
+++ b/data/templates/npc/monster/22274-BelethSMinion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22274" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22275-GatekeeperLohan.xml b/data/templates/npc/monster/22275-GatekeeperLohan.xml
index 383dba67d..1575dab49 100644
--- a/data/templates/npc/monster/22275-GatekeeperLohan.xml
+++ b/data/templates/npc/monster/22275-GatekeeperLohan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22275" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22276-GatekeeperOfTheSquare.xml b/data/templates/npc/monster/22276-GatekeeperOfTheSquare.xml
index e8b3ef06d..31bc94255 100644
--- a/data/templates/npc/monster/22276-GatekeeperOfTheSquare.xml
+++ b/data/templates/npc/monster/22276-GatekeeperOfTheSquare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22276" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22277-GatekeeperProvo.xml b/data/templates/npc/monster/22277-GatekeeperProvo.xml
index 10f552511..3b081d6ed 100644
--- a/data/templates/npc/monster/22277-GatekeeperProvo.xml
+++ b/data/templates/npc/monster/22277-GatekeeperProvo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22277" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22278-GatekeeperOfFire.xml b/data/templates/npc/monster/22278-GatekeeperOfFire.xml
index 9ec73795c..da1e97cd7 100644
--- a/data/templates/npc/monster/22278-GatekeeperOfFire.xml
+++ b/data/templates/npc/monster/22278-GatekeeperOfFire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22278" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22279-ChromaticDetainee.xml b/data/templates/npc/monster/22279-ChromaticDetainee.xml
index f91754449..1d9e51fdd 100644
--- a/data/templates/npc/monster/22279-ChromaticDetainee.xml
+++ b/data/templates/npc/monster/22279-ChromaticDetainee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22279" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22280-RodoKnight.xml b/data/templates/npc/monster/22280-RodoKnight.xml
index 028e02c8d..783efdc8c 100644
--- a/data/templates/npc/monster/22280-RodoKnight.xml
+++ b/data/templates/npc/monster/22280-RodoKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22280" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22281-PlazaCaiman.xml b/data/templates/npc/monster/22281-PlazaCaiman.xml
index 13ea4186d..660e549f3 100644
--- a/data/templates/npc/monster/22281-PlazaCaiman.xml
+++ b/data/templates/npc/monster/22281-PlazaCaiman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22281" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22282-ChromaticDetainee.xml b/data/templates/npc/monster/22282-ChromaticDetainee.xml
index c56ca0b59..c08b0c612 100644
--- a/data/templates/npc/monster/22282-ChromaticDetainee.xml
+++ b/data/templates/npc/monster/22282-ChromaticDetainee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22282" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22283-EmeraldAlligar.xml b/data/templates/npc/monster/22283-EmeraldAlligar.xml
index 267a6fd51..42b518657 100644
--- a/data/templates/npc/monster/22283-EmeraldAlligar.xml
+++ b/data/templates/npc/monster/22283-EmeraldAlligar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22283" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22284-ChromaticDetainee.xml b/data/templates/npc/monster/22284-ChromaticDetainee.xml
index 77d75f1f9..35618209d 100644
--- a/data/templates/npc/monster/22284-ChromaticDetainee.xml
+++ b/data/templates/npc/monster/22284-ChromaticDetainee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22284" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22285-ChromaticDetainee.xml b/data/templates/npc/monster/22285-ChromaticDetainee.xml
index b903f85a9..9098bdbcc 100644
--- a/data/templates/npc/monster/22285-ChromaticDetainee.xml
+++ b/data/templates/npc/monster/22285-ChromaticDetainee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22285" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22286-PlazaGaviel.xml b/data/templates/npc/monster/22286-PlazaGaviel.xml
index 267d4c9c9..6948e8f82 100644
--- a/data/templates/npc/monster/22286-PlazaGaviel.xml
+++ b/data/templates/npc/monster/22286-PlazaGaviel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22286" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22287-CrystallineUnicorn.xml b/data/templates/npc/monster/22287-CrystallineUnicorn.xml
index 03048a79e..c41f50e34 100644
--- a/data/templates/npc/monster/22287-CrystallineUnicorn.xml
+++ b/data/templates/npc/monster/22287-CrystallineUnicorn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22287" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22288-EmeraldBoar.xml b/data/templates/npc/monster/22288-EmeraldBoar.xml
index abd0aaef1..6373eca87 100644
--- a/data/templates/npc/monster/22288-EmeraldBoar.xml
+++ b/data/templates/npc/monster/22288-EmeraldBoar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22288" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22289-PlazaHelm.xml b/data/templates/npc/monster/22289-PlazaHelm.xml
index 518229c36..8d9ed12ca 100644
--- a/data/templates/npc/monster/22289-PlazaHelm.xml
+++ b/data/templates/npc/monster/22289-PlazaHelm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22289" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22290-TerodSMinion.xml b/data/templates/npc/monster/22290-TerodSMinion.xml
index 21b2926b8..aa6452b5f 100644
--- a/data/templates/npc/monster/22290-TerodSMinion.xml
+++ b/data/templates/npc/monster/22290-TerodSMinion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22290" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22291-WeylinSMinion.xml b/data/templates/npc/monster/22291-WeylinSMinion.xml
index 884a521ce..6f19ddeee 100644
--- a/data/templates/npc/monster/22291-WeylinSMinion.xml
+++ b/data/templates/npc/monster/22291-WeylinSMinion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22291" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22292-Tourmaline.xml b/data/templates/npc/monster/22292-Tourmaline.xml
index 9fd98482f..cd322a16a 100644
--- a/data/templates/npc/monster/22292-Tourmaline.xml
+++ b/data/templates/npc/monster/22292-Tourmaline.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22292" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22293-Spinel.xml b/data/templates/npc/monster/22293-Spinel.xml
index 1b04f67ab..adab1f419 100644
--- a/data/templates/npc/monster/22293-Spinel.xml
+++ b/data/templates/npc/monster/22293-Spinel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22293" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22294-FireOpal.xml b/data/templates/npc/monster/22294-FireOpal.xml
index 2c6311db3..d21b7702a 100644
--- a/data/templates/npc/monster/22294-FireOpal.xml
+++ b/data/templates/npc/monster/22294-FireOpal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22294" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22295-ReefGolem.xml b/data/templates/npc/monster/22295-ReefGolem.xml
index 18234b591..1be1629b6 100644
--- a/data/templates/npc/monster/22295-ReefGolem.xml
+++ b/data/templates/npc/monster/22295-ReefGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22295" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22296-ReefGolem.xml b/data/templates/npc/monster/22296-ReefGolem.xml
index a1452e764..342c06f0f 100644
--- a/data/templates/npc/monster/22296-ReefGolem.xml
+++ b/data/templates/npc/monster/22296-ReefGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22296" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22297-ReefGolem.xml b/data/templates/npc/monster/22297-ReefGolem.xml
index a3213cf47..2beb9e60f 100644
--- a/data/templates/npc/monster/22297-ReefGolem.xml
+++ b/data/templates/npc/monster/22297-ReefGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22297" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22298-Weylin.xml b/data/templates/npc/monster/22298-Weylin.xml
index e01fb1562..c0c2e100e 100644
--- a/data/templates/npc/monster/22298-Weylin.xml
+++ b/data/templates/npc/monster/22298-Weylin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22298" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22299-Dolph.xml b/data/templates/npc/monster/22299-Dolph.xml
index 8a4164dc6..bf83cc930 100644
--- a/data/templates/npc/monster/22299-Dolph.xml
+++ b/data/templates/npc/monster/22299-Dolph.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22299" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22300-DolphSMinion.xml b/data/templates/npc/monster/22300-DolphSMinion.xml
index 0fab65d48..eca39b20b 100644
--- a/data/templates/npc/monster/22300-DolphSMinion.xml
+++ b/data/templates/npc/monster/22300-DolphSMinion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22300" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22301-Terod.xml b/data/templates/npc/monster/22301-Terod.xml
index 14238f8e0..ac6babaf4 100644
--- a/data/templates/npc/monster/22301-Terod.xml
+++ b/data/templates/npc/monster/22301-Terod.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22301" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22302-DarnelSGuardian.xml b/data/templates/npc/monster/22302-DarnelSGuardian.xml
index ddcd08d57..1b1f3160f 100644
--- a/data/templates/npc/monster/22302-DarnelSGuardian.xml
+++ b/data/templates/npc/monster/22302-DarnelSGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22302" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22303-GuardianOfTheSquare.xml b/data/templates/npc/monster/22303-GuardianOfTheSquare.xml
index 648cc5dca..0709c4d8a 100644
--- a/data/templates/npc/monster/22303-GuardianOfTheSquare.xml
+++ b/data/templates/npc/monster/22303-GuardianOfTheSquare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22303" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22304-GuardianOfTheEmerald.xml b/data/templates/npc/monster/22304-GuardianOfTheEmerald.xml
index 73788eeab..3067ee1bf 100644
--- a/data/templates/npc/monster/22304-GuardianOfTheEmerald.xml
+++ b/data/templates/npc/monster/22304-GuardianOfTheEmerald.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22304" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22305-KechiSCaptain.xml b/data/templates/npc/monster/22305-KechiSCaptain.xml
index df49f7aaa..2042c0212 100644
--- a/data/templates/npc/monster/22305-KechiSCaptain.xml
+++ b/data/templates/npc/monster/22305-KechiSCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22305" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22306-KechiSCaptain.xml b/data/templates/npc/monster/22306-KechiSCaptain.xml
index 035c967aa..a126768f7 100644
--- a/data/templates/npc/monster/22306-KechiSCaptain.xml
+++ b/data/templates/npc/monster/22306-KechiSCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22306" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22307-KechiSCaptain.xml b/data/templates/npc/monster/22307-KechiSCaptain.xml
index d39a142b0..da5df8488 100644
--- a/data/templates/npc/monster/22307-KechiSCaptain.xml
+++ b/data/templates/npc/monster/22307-KechiSCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22307" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22308-KechiSGuard.xml b/data/templates/npc/monster/22308-KechiSGuard.xml
index 3c3d3337d..c53bf4dfe 100644
--- a/data/templates/npc/monster/22308-KechiSGuard.xml
+++ b/data/templates/npc/monster/22308-KechiSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22308" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22309-KechiSGuard.xml b/data/templates/npc/monster/22309-KechiSGuard.xml
index aa6569fb2..ff0912a03 100644
--- a/data/templates/npc/monster/22309-KechiSGuard.xml
+++ b/data/templates/npc/monster/22309-KechiSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22309" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22310-KechiSGuard.xml b/data/templates/npc/monster/22310-KechiSGuard.xml
index bb23aab36..3536b2cf8 100644
--- a/data/templates/npc/monster/22310-KechiSGuard.xml
+++ b/data/templates/npc/monster/22310-KechiSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22310" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22311-ParmeSGuardian.xml b/data/templates/npc/monster/22311-ParmeSGuardian.xml
index cf6f2f23b..6510fec6a 100644
--- a/data/templates/npc/monster/22311-ParmeSGuardian.xml
+++ b/data/templates/npc/monster/22311-ParmeSGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22311" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22312-FafurionSHenchman.xml b/data/templates/npc/monster/22312-FafurionSHenchman.xml
index ee85ad49d..4c0322266 100644
--- a/data/templates/npc/monster/22312-FafurionSHenchman.xml
+++ b/data/templates/npc/monster/22312-FafurionSHenchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22312" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22313-GardenStakato.xml b/data/templates/npc/monster/22313-GardenStakato.xml
index 6d679c636..87b94a287 100644
--- a/data/templates/npc/monster/22313-GardenStakato.xml
+++ b/data/templates/npc/monster/22313-GardenStakato.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22313" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22314-GardenPoisonMoth.xml b/data/templates/npc/monster/22314-GardenPoisonMoth.xml
index 4ea4d494d..a9a9f1653 100644
--- a/data/templates/npc/monster/22314-GardenPoisonMoth.xml
+++ b/data/templates/npc/monster/22314-GardenPoisonMoth.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22314" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22315-GardenGuard.xml b/data/templates/npc/monster/22315-GardenGuard.xml
index 9ed521d0b..4f6ebe293 100644
--- a/data/templates/npc/monster/22315-GardenGuard.xml
+++ b/data/templates/npc/monster/22315-GardenGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22315" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22316-GardenGuardianTree.xml b/data/templates/npc/monster/22316-GardenGuardianTree.xml
index 9806cc54e..c9f7213e7 100644
--- a/data/templates/npc/monster/22316-GardenGuardianTree.xml
+++ b/data/templates/npc/monster/22316-GardenGuardianTree.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22316" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22317-GardenCastalia.xml b/data/templates/npc/monster/22317-GardenCastalia.xml
index 5f3f7b3b5..4d8980661 100644
--- a/data/templates/npc/monster/22317-GardenCastalia.xml
+++ b/data/templates/npc/monster/22317-GardenCastalia.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22317" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22320-JuniorWatchman.xml b/data/templates/npc/monster/22320-JuniorWatchman.xml
index 6ee73bf38..75f72fc1b 100644
--- a/data/templates/npc/monster/22320-JuniorWatchman.xml
+++ b/data/templates/npc/monster/22320-JuniorWatchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22320" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22321-JuniorSummoner.xml b/data/templates/npc/monster/22321-JuniorSummoner.xml
index afa3843a7..1731ec5e3 100644
--- a/data/templates/npc/monster/22321-JuniorSummoner.xml
+++ b/data/templates/npc/monster/22321-JuniorSummoner.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22321" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22322-SubjugatedNative.xml b/data/templates/npc/monster/22322-SubjugatedNative.xml
index ea480735c..9494e3801 100644
--- a/data/templates/npc/monster/22322-SubjugatedNative.xml
+++ b/data/templates/npc/monster/22322-SubjugatedNative.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22322" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22323-CharmedNative.xml b/data/templates/npc/monster/22323-CharmedNative.xml
index 67d525d35..91d56a581 100644
--- a/data/templates/npc/monster/22323-CharmedNative.xml
+++ b/data/templates/npc/monster/22323-CharmedNative.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22323" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22324-BlindHuntsman.xml b/data/templates/npc/monster/22324-BlindHuntsman.xml
index 34ee1f01d..f379756c3 100644
--- a/data/templates/npc/monster/22324-BlindHuntsman.xml
+++ b/data/templates/npc/monster/22324-BlindHuntsman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22324" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22325-BlindWatchman.xml b/data/templates/npc/monster/22325-BlindWatchman.xml
index b97f2b03a..cc618dff0 100644
--- a/data/templates/npc/monster/22325-BlindWatchman.xml
+++ b/data/templates/npc/monster/22325-BlindWatchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22325" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22326-Hellinark.xml b/data/templates/npc/monster/22326-Hellinark.xml
index ab54edded..45d23506d 100644
--- a/data/templates/npc/monster/22326-Hellinark.xml
+++ b/data/templates/npc/monster/22326-Hellinark.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22326" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22327-ArcaneScout.xml b/data/templates/npc/monster/22327-ArcaneScout.xml
index 10752438d..94e5f5c64 100644
--- a/data/templates/npc/monster/22327-ArcaneScout.xml
+++ b/data/templates/npc/monster/22327-ArcaneScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22327" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22328-ArcaneGuardian.xml b/data/templates/npc/monster/22328-ArcaneGuardian.xml
index b6aedd3a5..94f2f19d2 100644
--- a/data/templates/npc/monster/22328-ArcaneGuardian.xml
+++ b/data/templates/npc/monster/22328-ArcaneGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22328" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22329-ArcaneWatchman.xml b/data/templates/npc/monster/22329-ArcaneWatchman.xml
index 36dbe63a4..453e19e58 100644
--- a/data/templates/npc/monster/22329-ArcaneWatchman.xml
+++ b/data/templates/npc/monster/22329-ArcaneWatchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22329" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22330-RemnantWraith.xml b/data/templates/npc/monster/22330-RemnantWraith.xml
index ff0aa8b5b..f07916a96 100644
--- a/data/templates/npc/monster/22330-RemnantWraith.xml
+++ b/data/templates/npc/monster/22330-RemnantWraith.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22330" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22334-SandScorpion.xml b/data/templates/npc/monster/22334-SandScorpion.xml
index 1439b8610..b732a47c5 100644
--- a/data/templates/npc/monster/22334-SandScorpion.xml
+++ b/data/templates/npc/monster/22334-SandScorpion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22334" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22335-DesertScorpion.xml b/data/templates/npc/monster/22335-DesertScorpion.xml
index 49ac8d925..1106790a7 100644
--- a/data/templates/npc/monster/22335-DesertScorpion.xml
+++ b/data/templates/npc/monster/22335-DesertScorpion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22335" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22336-SandDevil.xml b/data/templates/npc/monster/22336-SandDevil.xml
index 07cbc976d..b565ac6b1 100644
--- a/data/templates/npc/monster/22336-SandDevil.xml
+++ b/data/templates/npc/monster/22336-SandDevil.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22336" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22337-Desiccator.xml b/data/templates/npc/monster/22337-Desiccator.xml
index bb891def5..0931a0e7b 100644
--- a/data/templates/npc/monster/22337-Desiccator.xml
+++ b/data/templates/npc/monster/22337-Desiccator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22337" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22339-WanderingCaravan.xml b/data/templates/npc/monster/22339-WanderingCaravan.xml
index a42920121..7920ec69b 100644
--- a/data/templates/npc/monster/22339-WanderingCaravan.xml
+++ b/data/templates/npc/monster/22339-WanderingCaravan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22339" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22340-Sandstorm.xml b/data/templates/npc/monster/22340-Sandstorm.xml
index b4e75d50e..255de7807 100644
--- a/data/templates/npc/monster/22340-Sandstorm.xml
+++ b/data/templates/npc/monster/22340-Sandstorm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22340" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22341-Keltas.xml b/data/templates/npc/monster/22341-Keltas.xml
index 07b2f3902..15e957e6c 100644
--- a/data/templates/npc/monster/22341-Keltas.xml
+++ b/data/templates/npc/monster/22341-Keltas.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22341" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22342-DarionSEnforcer.xml b/data/templates/npc/monster/22342-DarionSEnforcer.xml
index ad35abc59..efe546c05 100644
--- a/data/templates/npc/monster/22342-DarionSEnforcer.xml
+++ b/data/templates/npc/monster/22342-DarionSEnforcer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22342" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22343-DarionSExecutioner.xml b/data/templates/npc/monster/22343-DarionSExecutioner.xml
index 611107cf0..50b8d98b0 100644
--- a/data/templates/npc/monster/22343-DarionSExecutioner.xml
+++ b/data/templates/npc/monster/22343-DarionSExecutioner.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22343" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22344-QuarrySupervisor.xml b/data/templates/npc/monster/22344-QuarrySupervisor.xml
index 2c597138e..75f53f040 100644
--- a/data/templates/npc/monster/22344-QuarrySupervisor.xml
+++ b/data/templates/npc/monster/22344-QuarrySupervisor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22344" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22345-QuarryBowman.xml b/data/templates/npc/monster/22345-QuarryBowman.xml
index 9c80d708f..8e44afb4a 100644
--- a/data/templates/npc/monster/22345-QuarryBowman.xml
+++ b/data/templates/npc/monster/22345-QuarryBowman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22345" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22346-QuarryForeman.xml b/data/templates/npc/monster/22346-QuarryForeman.xml
index 35bcbfc37..7c588e5b3 100644
--- a/data/templates/npc/monster/22346-QuarryForeman.xml
+++ b/data/templates/npc/monster/22346-QuarryForeman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22346" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22347-QuarryPatrolman.xml b/data/templates/npc/monster/22347-QuarryPatrolman.xml
index af187ab33..46e50c374 100644
--- a/data/templates/npc/monster/22347-QuarryPatrolman.xml
+++ b/data/templates/npc/monster/22347-QuarryPatrolman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22347" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22349-ChimeraOfEarth.xml b/data/templates/npc/monster/22349-ChimeraOfEarth.xml
index 4ec9d46dd..a48a94fa5 100644
--- a/data/templates/npc/monster/22349-ChimeraOfEarth.xml
+++ b/data/templates/npc/monster/22349-ChimeraOfEarth.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22349" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22350-ChimeraOfDarkness.xml b/data/templates/npc/monster/22350-ChimeraOfDarkness.xml
index 21c64c574..d19aaffd2 100644
--- a/data/templates/npc/monster/22350-ChimeraOfDarkness.xml
+++ b/data/templates/npc/monster/22350-ChimeraOfDarkness.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22350" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22351-ChimeraOfWind.xml b/data/templates/npc/monster/22351-ChimeraOfWind.xml
index 438a0819d..0c73ff2ab 100644
--- a/data/templates/npc/monster/22351-ChimeraOfWind.xml
+++ b/data/templates/npc/monster/22351-ChimeraOfWind.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22351" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22352-ChimeraOfFire.xml b/data/templates/npc/monster/22352-ChimeraOfFire.xml
index bbbce9043..da8e6bb70 100644
--- a/data/templates/npc/monster/22352-ChimeraOfFire.xml
+++ b/data/templates/npc/monster/22352-ChimeraOfFire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22352" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22353-Celtus.xml b/data/templates/npc/monster/22353-Celtus.xml
index d820cb1b1..21474ab05 100644
--- a/data/templates/npc/monster/22353-Celtus.xml
+++ b/data/templates/npc/monster/22353-Celtus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22353" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22355-EnceinteDefender.xml b/data/templates/npc/monster/22355-EnceinteDefender.xml
index caaa3ee73..bd40eb81b 100644
--- a/data/templates/npc/monster/22355-EnceinteDefender.xml
+++ b/data/templates/npc/monster/22355-EnceinteDefender.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22355" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22356-EnceinteDefender.xml b/data/templates/npc/monster/22356-EnceinteDefender.xml
index 3b1d0b9cb..1881aa502 100644
--- a/data/templates/npc/monster/22356-EnceinteDefender.xml
+++ b/data/templates/npc/monster/22356-EnceinteDefender.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22356" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22357-EnceinteDefender.xml b/data/templates/npc/monster/22357-EnceinteDefender.xml
index 2276740ee..63fe79bba 100644
--- a/data/templates/npc/monster/22357-EnceinteDefender.xml
+++ b/data/templates/npc/monster/22357-EnceinteDefender.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22357" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22358-EnceinteDefender.xml b/data/templates/npc/monster/22358-EnceinteDefender.xml
index 836d5e7ea..bdaa4590b 100644
--- a/data/templates/npc/monster/22358-EnceinteDefender.xml
+++ b/data/templates/npc/monster/22358-EnceinteDefender.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22358" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22359-TownGuard.xml b/data/templates/npc/monster/22359-TownGuard.xml
index c314c2892..92311ec56 100644
--- a/data/templates/npc/monster/22359-TownGuard.xml
+++ b/data/templates/npc/monster/22359-TownGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22359" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22360-TownPatrolman.xml b/data/templates/npc/monster/22360-TownPatrolman.xml
index 1d43ad6cf..a1dbbb213 100644
--- a/data/templates/npc/monster/22360-TownPatrolman.xml
+++ b/data/templates/npc/monster/22360-TownPatrolman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22360" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22361-SteelCitadelKeymaster.xml b/data/templates/npc/monster/22361-SteelCitadelKeymaster.xml
index 1ec12cab4..caaca18c9 100644
--- a/data/templates/npc/monster/22361-SteelCitadelKeymaster.xml
+++ b/data/templates/npc/monster/22361-SteelCitadelKeymaster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22361" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22362-Guzen.xml b/data/templates/npc/monster/22362-Guzen.xml
index 469f9dd18..336d2019d 100644
--- a/data/templates/npc/monster/22362-Guzen.xml
+++ b/data/templates/npc/monster/22362-Guzen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22362" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22363-BodyDestroyer.xml b/data/templates/npc/monster/22363-BodyDestroyer.xml
index c3c1a3152..572eef557 100644
--- a/data/templates/npc/monster/22363-BodyDestroyer.xml
+++ b/data/templates/npc/monster/22363-BodyDestroyer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22363" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22364-SoulDominator.xml b/data/templates/npc/monster/22364-SoulDominator.xml
index 89bf22b3b..1e0c96057 100644
--- a/data/templates/npc/monster/22364-SoulDominator.xml
+++ b/data/templates/npc/monster/22364-SoulDominator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22364" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22365-LabyrinthWatchman.xml b/data/templates/npc/monster/22365-LabyrinthWatchman.xml
index 2d556df5f..59c9eefd0 100644
--- a/data/templates/npc/monster/22365-LabyrinthWatchman.xml
+++ b/data/templates/npc/monster/22365-LabyrinthWatchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22365" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22366-LabyrinthWatchman.xml b/data/templates/npc/monster/22366-LabyrinthWatchman.xml
index 7451cccf9..616e15c94 100644
--- a/data/templates/npc/monster/22366-LabyrinthWatchman.xml
+++ b/data/templates/npc/monster/22366-LabyrinthWatchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22366" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22367-LabyrinthMystic.xml b/data/templates/npc/monster/22367-LabyrinthMystic.xml
index a35a10e02..21661ba39 100644
--- a/data/templates/npc/monster/22367-LabyrinthMystic.xml
+++ b/data/templates/npc/monster/22367-LabyrinthMystic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22367" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22368-LabyrinthCaptain.xml b/data/templates/npc/monster/22368-LabyrinthCaptain.xml
index 7d087bb41..a86f15e60 100644
--- a/data/templates/npc/monster/22368-LabyrinthCaptain.xml
+++ b/data/templates/npc/monster/22368-LabyrinthCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22368" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22369-LabyrinthSeer.xml b/data/templates/npc/monster/22369-LabyrinthSeer.xml
index 752f150ce..b085a7e64 100644
--- a/data/templates/npc/monster/22369-LabyrinthSeer.xml
+++ b/data/templates/npc/monster/22369-LabyrinthSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22369" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22370-PassagewayCaptain.xml b/data/templates/npc/monster/22370-PassagewayCaptain.xml
index cf8ec31e2..38f9903e7 100644
--- a/data/templates/npc/monster/22370-PassagewayCaptain.xml
+++ b/data/templates/npc/monster/22370-PassagewayCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22370" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22371-PassagewayGuards.xml b/data/templates/npc/monster/22371-PassagewayGuards.xml
index 869831b7f..8bd122862 100644
--- a/data/templates/npc/monster/22371-PassagewayGuards.xml
+++ b/data/templates/npc/monster/22371-PassagewayGuards.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22371" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22372-PassagewayMystic.xml b/data/templates/npc/monster/22372-PassagewayMystic.xml
index 9f4ec6fb9..8c55146db 100644
--- a/data/templates/npc/monster/22372-PassagewayMystic.xml
+++ b/data/templates/npc/monster/22372-PassagewayMystic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22372" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22373-CosmicScout.xml b/data/templates/npc/monster/22373-CosmicScout.xml
index 322cafefc..fcbf829f9 100644
--- a/data/templates/npc/monster/22373-CosmicScout.xml
+++ b/data/templates/npc/monster/22373-CosmicScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22373" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22374-CosmicWatcher.xml b/data/templates/npc/monster/22374-CosmicWatcher.xml
index 30d46859e..2283db4f2 100644
--- a/data/templates/npc/monster/22374-CosmicWatcher.xml
+++ b/data/templates/npc/monster/22374-CosmicWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22374" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22375-CosmicPriest.xml b/data/templates/npc/monster/22375-CosmicPriest.xml
index c96dfb25b..716de09f9 100644
--- a/data/templates/npc/monster/22375-CosmicPriest.xml
+++ b/data/templates/npc/monster/22375-CosmicPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22375" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22376-CosmicLord.xml b/data/templates/npc/monster/22376-CosmicLord.xml
index cdece669e..c91430e8b 100644
--- a/data/templates/npc/monster/22376-CosmicLord.xml
+++ b/data/templates/npc/monster/22376-CosmicLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22376" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22377-MasterZelos.xml b/data/templates/npc/monster/22377-MasterZelos.xml
index c1bcdb031..2346de219 100644
--- a/data/templates/npc/monster/22377-MasterZelos.xml
+++ b/data/templates/npc/monster/22377-MasterZelos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22377" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22378-MasterSMinion.xml b/data/templates/npc/monster/22378-MasterSMinion.xml
index 723f4ecc7..8eabdcc4a 100644
--- a/data/templates/npc/monster/22378-MasterSMinion.xml
+++ b/data/templates/npc/monster/22378-MasterSMinion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22378" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22379-MasterSMinion.xml b/data/templates/npc/monster/22379-MasterSMinion.xml
index 7a8a73dcb..fc37487ef 100644
--- a/data/templates/npc/monster/22379-MasterSMinion.xml
+++ b/data/templates/npc/monster/22379-MasterSMinion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22379" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22380-MasterFestina.xml b/data/templates/npc/monster/22380-MasterFestina.xml
index a8774566b..cb19443db 100644
--- a/data/templates/npc/monster/22380-MasterFestina.xml
+++ b/data/templates/npc/monster/22380-MasterFestina.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22380" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22381-MasterSGuard.xml b/data/templates/npc/monster/22381-MasterSGuard.xml
index 5cf36abbd..64424b5be 100644
--- a/data/templates/npc/monster/22381-MasterSGuard.xml
+++ b/data/templates/npc/monster/22381-MasterSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22381" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22382-MasterSGuard.xml b/data/templates/npc/monster/22382-MasterSGuard.xml
index 7f170d617..a53bf9cb3 100644
--- a/data/templates/npc/monster/22382-MasterSGuard.xml
+++ b/data/templates/npc/monster/22382-MasterSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22382" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22383-TullySToy.xml b/data/templates/npc/monster/22383-TullySToy.xml
index 6be1138ab..9da73c3fe 100644
--- a/data/templates/npc/monster/22383-TullySToy.xml
+++ b/data/templates/npc/monster/22383-TullySToy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22383" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22384-MysticSToy.xml b/data/templates/npc/monster/22384-MysticSToy.xml
index 8f98a8675..7d14de709 100644
--- a/data/templates/npc/monster/22384-MysticSToy.xml
+++ b/data/templates/npc/monster/22384-MysticSToy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22384" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22385-TullySGolemGuard.xml b/data/templates/npc/monster/22385-TullySGolemGuard.xml
index 6fe02405a..9fcd4e86e 100644
--- a/data/templates/npc/monster/22385-TullySGolemGuard.xml
+++ b/data/templates/npc/monster/22385-TullySGolemGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22385" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22386-FoundryMystic.xml b/data/templates/npc/monster/22386-FoundryMystic.xml
index 2fbe387d3..fa1865408 100644
--- a/data/templates/npc/monster/22386-FoundryMystic.xml
+++ b/data/templates/npc/monster/22386-FoundryMystic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22386" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22387-FoundryMystic.xml b/data/templates/npc/monster/22387-FoundryMystic.xml
index adce07867..91f5938b3 100644
--- a/data/templates/npc/monster/22387-FoundryMystic.xml
+++ b/data/templates/npc/monster/22387-FoundryMystic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22387" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22388-FoundrySpiritGuard.xml b/data/templates/npc/monster/22388-FoundrySpiritGuard.xml
index 12cccd4dc..ef4913e6d 100644
--- a/data/templates/npc/monster/22388-FoundrySpiritGuard.xml
+++ b/data/templates/npc/monster/22388-FoundrySpiritGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22388" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22390-FoundryForeman.xml b/data/templates/npc/monster/22390-FoundryForeman.xml
index eb3fecddb..3d0454f78 100644
--- a/data/templates/npc/monster/22390-FoundryForeman.xml
+++ b/data/templates/npc/monster/22390-FoundryForeman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22390" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22391-FoundryAssistantOverseer.xml b/data/templates/npc/monster/22391-FoundryAssistantOverseer.xml
index 905ff8b5d..3410f000a 100644
--- a/data/templates/npc/monster/22391-FoundryAssistantOverseer.xml
+++ b/data/templates/npc/monster/22391-FoundryAssistantOverseer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22391" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22392-FailedExperimentalTimetwisterGolem.xml b/data/templates/npc/monster/22392-FailedExperimentalTimetwisterGolem.xml
index 8fc72604b..3eba40207 100644
--- a/data/templates/npc/monster/22392-FailedExperimentalTimetwisterGolem.xml
+++ b/data/templates/npc/monster/22392-FailedExperimentalTimetwisterGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22392" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22393-BelethSFollower.xml b/data/templates/npc/monster/22393-BelethSFollower.xml
index 57331276f..5994d31da 100644
--- a/data/templates/npc/monster/22393-BelethSFollower.xml
+++ b/data/templates/npc/monster/22393-BelethSFollower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22393" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22394-BelethSDevotee.xml b/data/templates/npc/monster/22394-BelethSDevotee.xml
index 3f1136aa5..cb72ba676 100644
--- a/data/templates/npc/monster/22394-BelethSDevotee.xml
+++ b/data/templates/npc/monster/22394-BelethSDevotee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22394" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22395-BelethSProjection.xml b/data/templates/npc/monster/22395-BelethSProjection.xml
index 968e2b623..3653b2025 100644
--- a/data/templates/npc/monster/22395-BelethSProjection.xml
+++ b/data/templates/npc/monster/22395-BelethSProjection.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22395" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22396-FoundryLaborer.xml b/data/templates/npc/monster/22396-FoundryLaborer.xml
index 0f2d1a72d..d07f64117 100644
--- a/data/templates/npc/monster/22396-FoundryLaborer.xml
+++ b/data/templates/npc/monster/22396-FoundryLaborer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22396" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22397-FoundryForeman.xml b/data/templates/npc/monster/22397-FoundryForeman.xml
index c07462b93..dd59709b9 100644
--- a/data/templates/npc/monster/22397-FoundryForeman.xml
+++ b/data/templates/npc/monster/22397-FoundryForeman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22397" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22398-LesserEvil.xml b/data/templates/npc/monster/22398-LesserEvil.xml
index d6861070b..f9d6b444a 100644
--- a/data/templates/npc/monster/22398-LesserEvil.xml
+++ b/data/templates/npc/monster/22398-LesserEvil.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22398" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22399-GreaterEvil.xml b/data/templates/npc/monster/22399-GreaterEvil.xml
index 2b06314ab..a4fc2e94b 100644
--- a/data/templates/npc/monster/22399-GreaterEvil.xml
+++ b/data/templates/npc/monster/22399-GreaterEvil.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22399" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22400-ParmeSHealer.xml b/data/templates/npc/monster/22400-ParmeSHealer.xml
index 7e35e9cc3..63cd85934 100644
--- a/data/templates/npc/monster/22400-ParmeSHealer.xml
+++ b/data/templates/npc/monster/22400-ParmeSHealer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22400" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22401-ParmeSHealer.xml b/data/templates/npc/monster/22401-ParmeSHealer.xml
index 531a3e29f..285930d9f 100644
--- a/data/templates/npc/monster/22401-ParmeSHealer.xml
+++ b/data/templates/npc/monster/22401-ParmeSHealer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22401" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22402-ShadowColumn.xml b/data/templates/npc/monster/22402-ShadowColumn.xml
index 94de185cb..d820f60ba 100644
--- a/data/templates/npc/monster/22402-ShadowColumn.xml
+++ b/data/templates/npc/monster/22402-ShadowColumn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22402" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22403-FoundryForeman.xml b/data/templates/npc/monster/22403-FoundryForeman.xml
index 4c47cdff9..d60ca16ae 100644
--- a/data/templates/npc/monster/22403-FoundryForeman.xml
+++ b/data/templates/npc/monster/22403-FoundryForeman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22403" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22404-ArcaneCaptain.xml b/data/templates/npc/monster/22404-ArcaneCaptain.xml
index 08b6c5a0e..ed6b9bf0d 100644
--- a/data/templates/npc/monster/22404-ArcaneCaptain.xml
+++ b/data/templates/npc/monster/22404-ArcaneCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22404" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22405-DarionSFaithfulServant.xml b/data/templates/npc/monster/22405-DarionSFaithfulServant.xml
index d19cff78c..a89dd94e2 100644
--- a/data/templates/npc/monster/22405-DarionSFaithfulServant.xml
+++ b/data/templates/npc/monster/22405-DarionSFaithfulServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22405" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22406-DarionSFaithfulServant.xml b/data/templates/npc/monster/22406-DarionSFaithfulServant.xml
index 09c0e80fc..d024534ba 100644
--- a/data/templates/npc/monster/22406-DarionSFaithfulServant.xml
+++ b/data/templates/npc/monster/22406-DarionSFaithfulServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22406" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22407-DarionSFaithfulServant.xml b/data/templates/npc/monster/22407-DarionSFaithfulServant.xml
index ff6d7c844..d87e80a02 100644
--- a/data/templates/npc/monster/22407-DarionSFaithfulServant.xml
+++ b/data/templates/npc/monster/22407-DarionSFaithfulServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22407" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22408-DarionSFaithfulServant.xml b/data/templates/npc/monster/22408-DarionSFaithfulServant.xml
index ea6fa33ed..c26150997 100644
--- a/data/templates/npc/monster/22408-DarionSFaithfulServant.xml
+++ b/data/templates/npc/monster/22408-DarionSFaithfulServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22408" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22409-DarionSFaithfulServant.xml b/data/templates/npc/monster/22409-DarionSFaithfulServant.xml
index d6942113a..aaa85e32a 100644
--- a/data/templates/npc/monster/22409-DarionSFaithfulServant.xml
+++ b/data/templates/npc/monster/22409-DarionSFaithfulServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22409" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22410-DarionSFaithfulServant.xml b/data/templates/npc/monster/22410-DarionSFaithfulServant.xml
index c930e4b42..22cfdaa1b 100644
--- a/data/templates/npc/monster/22410-DarionSFaithfulServant.xml
+++ b/data/templates/npc/monster/22410-DarionSFaithfulServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22410" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22411-BelethSRetainer.xml b/data/templates/npc/monster/22411-BelethSRetainer.xml
index 46901c327..0317ae864 100644
--- a/data/templates/npc/monster/22411-BelethSRetainer.xml
+++ b/data/templates/npc/monster/22411-BelethSRetainer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22411" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22412-BelethSFighter.xml b/data/templates/npc/monster/22412-BelethSFighter.xml
index 7b738507d..78e1f1a34 100644
--- a/data/templates/npc/monster/22412-BelethSFighter.xml
+++ b/data/templates/npc/monster/22412-BelethSFighter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22412" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22413-BelethSLowServant.xml b/data/templates/npc/monster/22413-BelethSLowServant.xml
index 3ba828551..7cc1dc246 100644
--- a/data/templates/npc/monster/22413-BelethSLowServant.xml
+++ b/data/templates/npc/monster/22413-BelethSLowServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22413" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22414-BelethSFollower.xml b/data/templates/npc/monster/22414-BelethSFollower.xml
index 018488864..5d0759eda 100644
--- a/data/templates/npc/monster/22414-BelethSFollower.xml
+++ b/data/templates/npc/monster/22414-BelethSFollower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22414" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22415-BelethSDevotee.xml b/data/templates/npc/monster/22415-BelethSDevotee.xml
index d4107ad2d..fb0994ac7 100644
--- a/data/templates/npc/monster/22415-BelethSDevotee.xml
+++ b/data/templates/npc/monster/22415-BelethSDevotee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22415" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22416-KechiSCaptain.xml b/data/templates/npc/monster/22416-KechiSCaptain.xml
index 54b114447..e340a0d9c 100644
--- a/data/templates/npc/monster/22416-KechiSCaptain.xml
+++ b/data/templates/npc/monster/22416-KechiSCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22416" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22417-KechiSGuard.xml b/data/templates/npc/monster/22417-KechiSGuard.xml
index 2616dbffe..f42eee7df 100644
--- a/data/templates/npc/monster/22417-KechiSGuard.xml
+++ b/data/templates/npc/monster/22417-KechiSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22417" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22418-BurningIris.xml b/data/templates/npc/monster/22418-BurningIris.xml
index f0c5721e8..451e2b03d 100644
--- a/data/templates/npc/monster/22418-BurningIris.xml
+++ b/data/templates/npc/monster/22418-BurningIris.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22418" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22419-FlameIris.xml b/data/templates/npc/monster/22419-FlameIris.xml
index f27f66794..b0f184629 100644
--- a/data/templates/npc/monster/22419-FlameIris.xml
+++ b/data/templates/npc/monster/22419-FlameIris.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22419" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22420-BrimstoneIris.xml b/data/templates/npc/monster/22420-BrimstoneIris.xml
index b8d524379..b9eb4aae5 100644
--- a/data/templates/npc/monster/22420-BrimstoneIris.xml
+++ b/data/templates/npc/monster/22420-BrimstoneIris.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22420" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22422-FailanSGuard.xml b/data/templates/npc/monster/22422-FailanSGuard.xml
index 75a7e7690..c65f38cf4 100644
--- a/data/templates/npc/monster/22422-FailanSGuard.xml
+++ b/data/templates/npc/monster/22422-FailanSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22422" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22423-OriginalSinWarden.xml b/data/templates/npc/monster/22423-OriginalSinWarden.xml
index 9e1818938..f32fcb9e7 100644
--- a/data/templates/npc/monster/22423-OriginalSinWarden.xml
+++ b/data/templates/npc/monster/22423-OriginalSinWarden.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22423" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22424-SlaveOfGreed.xml b/data/templates/npc/monster/22424-SlaveOfGreed.xml
index dbfccdd82..42eb9091a 100644
--- a/data/templates/npc/monster/22424-SlaveOfGreed.xml
+++ b/data/templates/npc/monster/22424-SlaveOfGreed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22424" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22425-SlaveOfLust.xml b/data/templates/npc/monster/22425-SlaveOfLust.xml
index 405f77f83..4cf574848 100644
--- a/data/templates/npc/monster/22425-SlaveOfLust.xml
+++ b/data/templates/npc/monster/22425-SlaveOfLust.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22425" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22426-SlaveOfWrath.xml b/data/templates/npc/monster/22426-SlaveOfWrath.xml
index 33951550d..b3fd905c5 100644
--- a/data/templates/npc/monster/22426-SlaveOfWrath.xml
+++ b/data/templates/npc/monster/22426-SlaveOfWrath.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22426" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22427-SlaveOfSloth.xml b/data/templates/npc/monster/22427-SlaveOfSloth.xml
index 9afd2d57d..012ad764a 100644
--- a/data/templates/npc/monster/22427-SlaveOfSloth.xml
+++ b/data/templates/npc/monster/22427-SlaveOfSloth.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22427" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22428-SlaveOfEnvy.xml b/data/templates/npc/monster/22428-SlaveOfEnvy.xml
index 6267c6653..a9e024a16 100644
--- a/data/templates/npc/monster/22428-SlaveOfEnvy.xml
+++ b/data/templates/npc/monster/22428-SlaveOfEnvy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22428" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22429-SlaveOfPride.xml b/data/templates/npc/monster/22429-SlaveOfPride.xml
index 7f3ec278d..de6ceef40 100644
--- a/data/templates/npc/monster/22429-SlaveOfPride.xml
+++ b/data/templates/npc/monster/22429-SlaveOfPride.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22429" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22430-SlaveOfGluttony.xml b/data/templates/npc/monster/22430-SlaveOfGluttony.xml
index dd3c312d8..738ea0b8f 100644
--- a/data/templates/npc/monster/22430-SlaveOfGluttony.xml
+++ b/data/templates/npc/monster/22430-SlaveOfGluttony.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22430" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22431-OriginalSinWarden.xml b/data/templates/npc/monster/22431-OriginalSinWarden.xml
index 7fc7c0d25..df12bb2f0 100644
--- a/data/templates/npc/monster/22431-OriginalSinWarden.xml
+++ b/data/templates/npc/monster/22431-OriginalSinWarden.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22431" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22432-SlaveOfGreed.xml b/data/templates/npc/monster/22432-SlaveOfGreed.xml
index 67d6589bf..c8b36f256 100644
--- a/data/templates/npc/monster/22432-SlaveOfGreed.xml
+++ b/data/templates/npc/monster/22432-SlaveOfGreed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22432" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22433-SlaveOfLust.xml b/data/templates/npc/monster/22433-SlaveOfLust.xml
index f5344dffd..4d6807b7e 100644
--- a/data/templates/npc/monster/22433-SlaveOfLust.xml
+++ b/data/templates/npc/monster/22433-SlaveOfLust.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22433" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22434-SlaveOfWrath.xml b/data/templates/npc/monster/22434-SlaveOfWrath.xml
index 959514f44..8fc2af168 100644
--- a/data/templates/npc/monster/22434-SlaveOfWrath.xml
+++ b/data/templates/npc/monster/22434-SlaveOfWrath.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22434" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22435-SlaveOfSloth.xml b/data/templates/npc/monster/22435-SlaveOfSloth.xml
index c7ca347d4..63b235ef1 100644
--- a/data/templates/npc/monster/22435-SlaveOfSloth.xml
+++ b/data/templates/npc/monster/22435-SlaveOfSloth.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22435" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22436-SlaveOfEnvy.xml b/data/templates/npc/monster/22436-SlaveOfEnvy.xml
index 58e6dd316..33d734fe1 100644
--- a/data/templates/npc/monster/22436-SlaveOfEnvy.xml
+++ b/data/templates/npc/monster/22436-SlaveOfEnvy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22436" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22437-SlaveOfPride.xml b/data/templates/npc/monster/22437-SlaveOfPride.xml
index 2140ea8c5..cf80c74c9 100644
--- a/data/templates/npc/monster/22437-SlaveOfPride.xml
+++ b/data/templates/npc/monster/22437-SlaveOfPride.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22437" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22438-SlaveOfGluttony.xml b/data/templates/npc/monster/22438-SlaveOfGluttony.xml
index 5b7f47003..eb8655d1e 100644
--- a/data/templates/npc/monster/22438-SlaveOfGluttony.xml
+++ b/data/templates/npc/monster/22438-SlaveOfGluttony.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22438" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22439-BelethSAssassin.xml b/data/templates/npc/monster/22439-BelethSAssassin.xml
index 798e635ac..6e3013ed5 100644
--- a/data/templates/npc/monster/22439-BelethSAssassin.xml
+++ b/data/templates/npc/monster/22439-BelethSAssassin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22439" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22440-BelethSAssassin.xml b/data/templates/npc/monster/22440-BelethSAssassin.xml
index 5a0643eeb..e4b11b072 100644
--- a/data/templates/npc/monster/22440-BelethSAssassin.xml
+++ b/data/templates/npc/monster/22440-BelethSAssassin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22440" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22441-BelethSMinion.xml b/data/templates/npc/monster/22441-BelethSMinion.xml
index dff6dd78d..d8831fd17 100644
--- a/data/templates/npc/monster/22441-BelethSMinion.xml
+++ b/data/templates/npc/monster/22441-BelethSMinion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22441" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22442-BelethSMinion.xml b/data/templates/npc/monster/22442-BelethSMinion.xml
index 36501f67f..cee5f1863 100644
--- a/data/templates/npc/monster/22442-BelethSMinion.xml
+++ b/data/templates/npc/monster/22442-BelethSMinion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22442" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22443-KertangSMessenger.xml b/data/templates/npc/monster/22443-KertangSMessenger.xml
index 2798192a1..b5e7e50ad 100644
--- a/data/templates/npc/monster/22443-KertangSMessenger.xml
+++ b/data/templates/npc/monster/22443-KertangSMessenger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22443" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22444-KertangSMessenger.xml b/data/templates/npc/monster/22444-KertangSMessenger.xml
index 4b476fb73..8784373cd 100644
--- a/data/templates/npc/monster/22444-KertangSMessenger.xml
+++ b/data/templates/npc/monster/22444-KertangSMessenger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22444" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22445-KertangSMessenger.xml b/data/templates/npc/monster/22445-KertangSMessenger.xml
index 99d6ca483..049c14f73 100644
--- a/data/templates/npc/monster/22445-KertangSMessenger.xml
+++ b/data/templates/npc/monster/22445-KertangSMessenger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22445" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22446-KertangSMessenger.xml b/data/templates/npc/monster/22446-KertangSMessenger.xml
index 649627f3b..ed1fcb188 100644
--- a/data/templates/npc/monster/22446-KertangSMessenger.xml
+++ b/data/templates/npc/monster/22446-KertangSMessenger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22446" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22447-KertangSMessenger.xml b/data/templates/npc/monster/22447-KertangSMessenger.xml
index d99f25701..5e5c92ba7 100644
--- a/data/templates/npc/monster/22447-KertangSMessenger.xml
+++ b/data/templates/npc/monster/22447-KertangSMessenger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22447" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22448-Leodas.xml b/data/templates/npc/monster/22448-Leodas.xml
index 9d1843c00..172eb57d6 100644
--- a/data/templates/npc/monster/22448-Leodas.xml
+++ b/data/templates/npc/monster/22448-Leodas.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22448" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22449-Amaskari.xml b/data/templates/npc/monster/22449-Amaskari.xml
index d4ba05915..7aa483d47 100644
--- a/data/templates/npc/monster/22449-Amaskari.xml
+++ b/data/templates/npc/monster/22449-Amaskari.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22449" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22450-TorturedNative.xml b/data/templates/npc/monster/22450-TorturedNative.xml
index 9825cd83e..fe68d8dd8 100644
--- a/data/templates/npc/monster/22450-TorturedNative.xml
+++ b/data/templates/npc/monster/22450-TorturedNative.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22450" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22451-NativeEliteSoldier.xml b/data/templates/npc/monster/22451-NativeEliteSoldier.xml
index 5b456ebe9..feb1d5cdf 100644
--- a/data/templates/npc/monster/22451-NativeEliteSoldier.xml
+++ b/data/templates/npc/monster/22451-NativeEliteSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22451" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22452-WhiteSkullKanabion.xml b/data/templates/npc/monster/22452-WhiteSkullKanabion.xml
index 14b4986c7..ca362b237 100644
--- a/data/templates/npc/monster/22452-WhiteSkullKanabion.xml
+++ b/data/templates/npc/monster/22452-WhiteSkullKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22452" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22453-WhiteSkullKanabion.xml b/data/templates/npc/monster/22453-WhiteSkullKanabion.xml
index 7d4dd558b..e12688e9a 100644
--- a/data/templates/npc/monster/22453-WhiteSkullKanabion.xml
+++ b/data/templates/npc/monster/22453-WhiteSkullKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22453" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22454-WhiteSkullKanabion.xml b/data/templates/npc/monster/22454-WhiteSkullKanabion.xml
index dad2b1671..646d22bab 100644
--- a/data/templates/npc/monster/22454-WhiteSkullKanabion.xml
+++ b/data/templates/npc/monster/22454-WhiteSkullKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22454" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22455-BegrudgedKanabion.xml b/data/templates/npc/monster/22455-BegrudgedKanabion.xml
index 809bdee00..e9a87b035 100644
--- a/data/templates/npc/monster/22455-BegrudgedKanabion.xml
+++ b/data/templates/npc/monster/22455-BegrudgedKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22455" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22456-BegrudgedKanabion.xml b/data/templates/npc/monster/22456-BegrudgedKanabion.xml
index f88b608aa..2a55c36cc 100644
--- a/data/templates/npc/monster/22456-BegrudgedKanabion.xml
+++ b/data/templates/npc/monster/22456-BegrudgedKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22456" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22457-BegrudgedKanabion.xml b/data/templates/npc/monster/22457-BegrudgedKanabion.xml
index 0091c4eb0..356c6173d 100644
--- a/data/templates/npc/monster/22457-BegrudgedKanabion.xml
+++ b/data/templates/npc/monster/22457-BegrudgedKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22457" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22458-RottenKanabion.xml b/data/templates/npc/monster/22458-RottenKanabion.xml
index 238d4c2f3..1241e93b0 100644
--- a/data/templates/npc/monster/22458-RottenKanabion.xml
+++ b/data/templates/npc/monster/22458-RottenKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22458" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22459-RottenKanabion.xml b/data/templates/npc/monster/22459-RottenKanabion.xml
index 07f7217b8..cca5a29b4 100644
--- a/data/templates/npc/monster/22459-RottenKanabion.xml
+++ b/data/templates/npc/monster/22459-RottenKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22459" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22460-RottenKanabion.xml b/data/templates/npc/monster/22460-RottenKanabion.xml
index 57cfcaa3b..856cdc602 100644
--- a/data/templates/npc/monster/22460-RottenKanabion.xml
+++ b/data/templates/npc/monster/22460-RottenKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22460" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22461-GluttonousKanabion.xml b/data/templates/npc/monster/22461-GluttonousKanabion.xml
index 0e440c2d0..1f4ede020 100644
--- a/data/templates/npc/monster/22461-GluttonousKanabion.xml
+++ b/data/templates/npc/monster/22461-GluttonousKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22461" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22462-GluttonousKanabion.xml b/data/templates/npc/monster/22462-GluttonousKanabion.xml
index dae06a03c..99495b36d 100644
--- a/data/templates/npc/monster/22462-GluttonousKanabion.xml
+++ b/data/templates/npc/monster/22462-GluttonousKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22462" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22463-GluttonousKanabion.xml b/data/templates/npc/monster/22463-GluttonousKanabion.xml
index b3fa37d8e..42d698a3a 100644
--- a/data/templates/npc/monster/22463-GluttonousKanabion.xml
+++ b/data/templates/npc/monster/22463-GluttonousKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22463" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22464-CallousKanabion.xml b/data/templates/npc/monster/22464-CallousKanabion.xml
index 84ebbf011..cd777066b 100644
--- a/data/templates/npc/monster/22464-CallousKanabion.xml
+++ b/data/templates/npc/monster/22464-CallousKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22464" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22465-CallousKanabion.xml b/data/templates/npc/monster/22465-CallousKanabion.xml
index 744515a82..54fdd9df1 100644
--- a/data/templates/npc/monster/22465-CallousKanabion.xml
+++ b/data/templates/npc/monster/22465-CallousKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22465" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22466-CallousKanabion.xml b/data/templates/npc/monster/22466-CallousKanabion.xml
index ce359f8b2..e761780f4 100644
--- a/data/templates/npc/monster/22466-CallousKanabion.xml
+++ b/data/templates/npc/monster/22466-CallousKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22466" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22467-SavageKanabion.xml b/data/templates/npc/monster/22467-SavageKanabion.xml
index 08e01b298..02b084eac 100644
--- a/data/templates/npc/monster/22467-SavageKanabion.xml
+++ b/data/templates/npc/monster/22467-SavageKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22467" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22468-SavageKanabion.xml b/data/templates/npc/monster/22468-SavageKanabion.xml
index 1fe4e95c1..35c457e5b 100644
--- a/data/templates/npc/monster/22468-SavageKanabion.xml
+++ b/data/templates/npc/monster/22468-SavageKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22468" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22469-SavageKanabion.xml b/data/templates/npc/monster/22469-SavageKanabion.xml
index 4306cd9b5..570fac721 100644
--- a/data/templates/npc/monster/22469-SavageKanabion.xml
+++ b/data/templates/npc/monster/22469-SavageKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22469" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22470-PeerlessKanabion.xml b/data/templates/npc/monster/22470-PeerlessKanabion.xml
index f87eca8a9..504c611e7 100644
--- a/data/templates/npc/monster/22470-PeerlessKanabion.xml
+++ b/data/templates/npc/monster/22470-PeerlessKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22470" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22471-PeerlessKanabion.xml b/data/templates/npc/monster/22471-PeerlessKanabion.xml
index 0117b645b..d3f0c63bc 100644
--- a/data/templates/npc/monster/22471-PeerlessKanabion.xml
+++ b/data/templates/npc/monster/22471-PeerlessKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22471" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22472-PeerlessKanabion.xml b/data/templates/npc/monster/22472-PeerlessKanabion.xml
index 4384d553b..41f751e59 100644
--- a/data/templates/npc/monster/22472-PeerlessKanabion.xml
+++ b/data/templates/npc/monster/22472-PeerlessKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22472" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22473-MassiveKanabion.xml b/data/templates/npc/monster/22473-MassiveKanabion.xml
index d711ad703..cc59f3370 100644
--- a/data/templates/npc/monster/22473-MassiveKanabion.xml
+++ b/data/templates/npc/monster/22473-MassiveKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22473" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22474-MassiveKanabion.xml b/data/templates/npc/monster/22474-MassiveKanabion.xml
index 308b1771c..ebf57ee03 100644
--- a/data/templates/npc/monster/22474-MassiveKanabion.xml
+++ b/data/templates/npc/monster/22474-MassiveKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22474" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22475-MassiveKanabion.xml b/data/templates/npc/monster/22475-MassiveKanabion.xml
index 3b31620cf..53ca52626 100644
--- a/data/templates/npc/monster/22475-MassiveKanabion.xml
+++ b/data/templates/npc/monster/22475-MassiveKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22475" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22476-FerventKanabion.xml b/data/templates/npc/monster/22476-FerventKanabion.xml
index 03d6d1270..6b0fa1977 100644
--- a/data/templates/npc/monster/22476-FerventKanabion.xml
+++ b/data/templates/npc/monster/22476-FerventKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22476" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22477-FerventKanabion.xml b/data/templates/npc/monster/22477-FerventKanabion.xml
index 0f6aad06d..30f8dac22 100644
--- a/data/templates/npc/monster/22477-FerventKanabion.xml
+++ b/data/templates/npc/monster/22477-FerventKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22477" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22478-FerventKanabion.xml b/data/templates/npc/monster/22478-FerventKanabion.xml
index 0c81915ce..d9b3143a5 100644
--- a/data/templates/npc/monster/22478-FerventKanabion.xml
+++ b/data/templates/npc/monster/22478-FerventKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22478" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22479-RupturedKanabion.xml b/data/templates/npc/monster/22479-RupturedKanabion.xml
index 943dcd93a..08e9be386 100644
--- a/data/templates/npc/monster/22479-RupturedKanabion.xml
+++ b/data/templates/npc/monster/22479-RupturedKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22479" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22480-RupturedKanabion.xml b/data/templates/npc/monster/22480-RupturedKanabion.xml
index aa479b137..ad8b8cfa3 100644
--- a/data/templates/npc/monster/22480-RupturedKanabion.xml
+++ b/data/templates/npc/monster/22480-RupturedKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22480" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22481-RupturedKanabion.xml b/data/templates/npc/monster/22481-RupturedKanabion.xml
index 6873371d8..1f7195524 100644
--- a/data/templates/npc/monster/22481-RupturedKanabion.xml
+++ b/data/templates/npc/monster/22481-RupturedKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22481" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22482-SwordKanabion.xml b/data/templates/npc/monster/22482-SwordKanabion.xml
index 700fe135d..4c760b337 100644
--- a/data/templates/npc/monster/22482-SwordKanabion.xml
+++ b/data/templates/npc/monster/22482-SwordKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22482" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22483-SwordKanabion.xml b/data/templates/npc/monster/22483-SwordKanabion.xml
index e026a0d43..ee0f3fb95 100644
--- a/data/templates/npc/monster/22483-SwordKanabion.xml
+++ b/data/templates/npc/monster/22483-SwordKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22483" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22484-SwordKanabion.xml b/data/templates/npc/monster/22484-SwordKanabion.xml
index 952401b6e..151d56982 100644
--- a/data/templates/npc/monster/22484-SwordKanabion.xml
+++ b/data/templates/npc/monster/22484-SwordKanabion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22484" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22485-LostWatcher.xml b/data/templates/npc/monster/22485-LostWatcher.xml
index 8ba0a3b3a..46db52f99 100644
--- a/data/templates/npc/monster/22485-LostWatcher.xml
+++ b/data/templates/npc/monster/22485-LostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22485" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22486-LostWatcher.xml b/data/templates/npc/monster/22486-LostWatcher.xml
index 6b2aa5279..5073496a0 100644
--- a/data/templates/npc/monster/22486-LostWatcher.xml
+++ b/data/templates/npc/monster/22486-LostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22486" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22487-LostBeholder.xml b/data/templates/npc/monster/22487-LostBeholder.xml
index 498119553..cb733c109 100644
--- a/data/templates/npc/monster/22487-LostBeholder.xml
+++ b/data/templates/npc/monster/22487-LostBeholder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22487" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22488-LostWatcher.xml b/data/templates/npc/monster/22488-LostWatcher.xml
index fa74dac4d..ca41b5d8c 100644
--- a/data/templates/npc/monster/22488-LostWatcher.xml
+++ b/data/templates/npc/monster/22488-LostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22488" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22489-LostWatcher.xml b/data/templates/npc/monster/22489-LostWatcher.xml
index 1cb5d0851..5386eab7a 100644
--- a/data/templates/npc/monster/22489-LostWatcher.xml
+++ b/data/templates/npc/monster/22489-LostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22489" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22490-LostBeholder.xml b/data/templates/npc/monster/22490-LostBeholder.xml
index c03f94b8c..dfa3ddbfa 100644
--- a/data/templates/npc/monster/22490-LostBeholder.xml
+++ b/data/templates/npc/monster/22490-LostBeholder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22490" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22491-LostWatcher.xml b/data/templates/npc/monster/22491-LostWatcher.xml
index cdc466c24..ab88397d5 100644
--- a/data/templates/npc/monster/22491-LostWatcher.xml
+++ b/data/templates/npc/monster/22491-LostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22491" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22492-LostWatcher.xml b/data/templates/npc/monster/22492-LostWatcher.xml
index 70e936177..ac191b43a 100644
--- a/data/templates/npc/monster/22492-LostWatcher.xml
+++ b/data/templates/npc/monster/22492-LostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22492" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22493-LostBeholder.xml b/data/templates/npc/monster/22493-LostBeholder.xml
index 68925438e..7b10c65f5 100644
--- a/data/templates/npc/monster/22493-LostBeholder.xml
+++ b/data/templates/npc/monster/22493-LostBeholder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22493" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22494-LostWatcher.xml b/data/templates/npc/monster/22494-LostWatcher.xml
index 12d99022a..a74dfb496 100644
--- a/data/templates/npc/monster/22494-LostWatcher.xml
+++ b/data/templates/npc/monster/22494-LostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22494" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22495-LostWatcher.xml b/data/templates/npc/monster/22495-LostWatcher.xml
index b64e47c39..7ed21cbcc 100644
--- a/data/templates/npc/monster/22495-LostWatcher.xml
+++ b/data/templates/npc/monster/22495-LostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22495" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22496-LostBeholder.xml b/data/templates/npc/monster/22496-LostBeholder.xml
index a6fd2a6f1..b69701f80 100644
--- a/data/templates/npc/monster/22496-LostBeholder.xml
+++ b/data/templates/npc/monster/22496-LostBeholder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22496" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22497-LostWatcher.xml b/data/templates/npc/monster/22497-LostWatcher.xml
index 0fe0cde4d..bbb0a0b47 100644
--- a/data/templates/npc/monster/22497-LostWatcher.xml
+++ b/data/templates/npc/monster/22497-LostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22497" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22498-LostWatcher.xml b/data/templates/npc/monster/22498-LostWatcher.xml
index 898e9461b..68d4dcfb5 100644
--- a/data/templates/npc/monster/22498-LostWatcher.xml
+++ b/data/templates/npc/monster/22498-LostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22498" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22499-LostBeholder.xml b/data/templates/npc/monster/22499-LostBeholder.xml
index fde2d8026..4ed827d97 100644
--- a/data/templates/npc/monster/22499-LostBeholder.xml
+++ b/data/templates/npc/monster/22499-LostBeholder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22499" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22500-LostWatcher.xml b/data/templates/npc/monster/22500-LostWatcher.xml
index e9148f063..7e59571db 100644
--- a/data/templates/npc/monster/22500-LostWatcher.xml
+++ b/data/templates/npc/monster/22500-LostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22500" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22501-LostWatcher.xml b/data/templates/npc/monster/22501-LostWatcher.xml
index bf00b251e..17d2a338c 100644
--- a/data/templates/npc/monster/22501-LostWatcher.xml
+++ b/data/templates/npc/monster/22501-LostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22501" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22502-LostBeholder.xml b/data/templates/npc/monster/22502-LostBeholder.xml
index 1d9fb3650..1b4781ab9 100644
--- a/data/templates/npc/monster/22502-LostBeholder.xml
+++ b/data/templates/npc/monster/22502-LostBeholder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22502" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22503-LostWatcher.xml b/data/templates/npc/monster/22503-LostWatcher.xml
index c266d4956..46f8c7978 100644
--- a/data/templates/npc/monster/22503-LostWatcher.xml
+++ b/data/templates/npc/monster/22503-LostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22503" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22504-LostWatcher.xml b/data/templates/npc/monster/22504-LostWatcher.xml
index 8e4d4fc54..a36385373 100644
--- a/data/templates/npc/monster/22504-LostWatcher.xml
+++ b/data/templates/npc/monster/22504-LostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22504" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22505-LostBeholder.xml b/data/templates/npc/monster/22505-LostBeholder.xml
index 6095f33c8..9708ee656 100644
--- a/data/templates/npc/monster/22505-LostBeholder.xml
+++ b/data/templates/npc/monster/22505-LostBeholder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22505" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22506-BoomChild.xml b/data/templates/npc/monster/22506-BoomChild.xml
index 416d72718..f2ada7709 100644
--- a/data/templates/npc/monster/22506-BoomChild.xml
+++ b/data/templates/npc/monster/22506-BoomChild.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22506" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22507-BoomChild.xml b/data/templates/npc/monster/22507-BoomChild.xml
index 9bc9a9b00..27ffd642d 100644
--- a/data/templates/npc/monster/22507-BoomChild.xml
+++ b/data/templates/npc/monster/22507-BoomChild.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22507" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22508-BoomChild.xml b/data/templates/npc/monster/22508-BoomChild.xml
index b7f397546..59f330155 100644
--- a/data/templates/npc/monster/22508-BoomChild.xml
+++ b/data/templates/npc/monster/22508-BoomChild.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22508" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22509-FanaticOfInfinity.xml b/data/templates/npc/monster/22509-FanaticOfInfinity.xml
index 98b397088..4c4f818d4 100644
--- a/data/templates/npc/monster/22509-FanaticOfInfinity.xml
+++ b/data/templates/npc/monster/22509-FanaticOfInfinity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22509" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22510-RottenMessenger.xml b/data/templates/npc/monster/22510-RottenMessenger.xml
index 874ad7d44..7453b5bea 100644
--- a/data/templates/npc/monster/22510-RottenMessenger.xml
+++ b/data/templates/npc/monster/22510-RottenMessenger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22510" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22511-ZealotOfInfinity.xml b/data/templates/npc/monster/22511-ZealotOfInfinity.xml
index e6390127d..5bac7bd0c 100644
--- a/data/templates/npc/monster/22511-ZealotOfInfinity.xml
+++ b/data/templates/npc/monster/22511-ZealotOfInfinity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22511" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22512-BodySeverer.xml b/data/templates/npc/monster/22512-BodySeverer.xml
index c177190ea..79df96ce7 100644
--- a/data/templates/npc/monster/22512-BodySeverer.xml
+++ b/data/templates/npc/monster/22512-BodySeverer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22512" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22513-BodyHarvester.xml b/data/templates/npc/monster/22513-BodyHarvester.xml
index 351b0f199..08b36f10e 100644
--- a/data/templates/npc/monster/22513-BodyHarvester.xml
+++ b/data/templates/npc/monster/22513-BodyHarvester.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22513" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22514-SoulExploiter.xml b/data/templates/npc/monster/22514-SoulExploiter.xml
index ad7feb6ed..d704ef063 100644
--- a/data/templates/npc/monster/22514-SoulExploiter.xml
+++ b/data/templates/npc/monster/22514-SoulExploiter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22514" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22515-SoulDevourer.xml b/data/templates/npc/monster/22515-SoulDevourer.xml
index ab230bf2c..70d4657e9 100644
--- a/data/templates/npc/monster/22515-SoulDevourer.xml
+++ b/data/templates/npc/monster/22515-SoulDevourer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22515" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22516-ButcherOfInfinity.xml b/data/templates/npc/monster/22516-ButcherOfInfinity.xml
index e4e608751..77deb0c60 100644
--- a/data/templates/npc/monster/22516-ButcherOfInfinity.xml
+++ b/data/templates/npc/monster/22516-ButcherOfInfinity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22516" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22517-DiscipleOfInfinity.xml b/data/templates/npc/monster/22517-DiscipleOfInfinity.xml
index 3935fe22b..572ed7380 100644
--- a/data/templates/npc/monster/22517-DiscipleOfInfinity.xml
+++ b/data/templates/npc/monster/22517-DiscipleOfInfinity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22517" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22518-RottenMessenger.xml b/data/templates/npc/monster/22518-RottenMessenger.xml
index 18c41d54b..731e87793 100644
--- a/data/templates/npc/monster/22518-RottenMessenger.xml
+++ b/data/templates/npc/monster/22518-RottenMessenger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22518" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22519-BodyHarvester.xml b/data/templates/npc/monster/22519-BodyHarvester.xml
index 6a7c4e83e..c028104ad 100644
--- a/data/templates/npc/monster/22519-BodyHarvester.xml
+++ b/data/templates/npc/monster/22519-BodyHarvester.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22519" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22520-BodySeverer.xml b/data/templates/npc/monster/22520-BodySeverer.xml
index 5beeda462..724986cfe 100644
--- a/data/templates/npc/monster/22520-BodySeverer.xml
+++ b/data/templates/npc/monster/22520-BodySeverer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22520" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22521-SoulExploiter.xml b/data/templates/npc/monster/22521-SoulExploiter.xml
index f201bb828..aacdac816 100644
--- a/data/templates/npc/monster/22521-SoulExploiter.xml
+++ b/data/templates/npc/monster/22521-SoulExploiter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22521" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22522-SoulDevourer.xml b/data/templates/npc/monster/22522-SoulDevourer.xml
index f0e74495b..70a665cee 100644
--- a/data/templates/npc/monster/22522-SoulDevourer.xml
+++ b/data/templates/npc/monster/22522-SoulDevourer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22522" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22523-SoulDevourer.xml b/data/templates/npc/monster/22523-SoulDevourer.xml
index 50c1b75c3..46cf1b0fb 100644
--- a/data/templates/npc/monster/22523-SoulDevourer.xml
+++ b/data/templates/npc/monster/22523-SoulDevourer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22523" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22524-EmissaryOfDeath.xml b/data/templates/npc/monster/22524-EmissaryOfDeath.xml
index 49a6cd9c1..059941471 100644
--- a/data/templates/npc/monster/22524-EmissaryOfDeath.xml
+++ b/data/templates/npc/monster/22524-EmissaryOfDeath.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22524" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22525-EmissaryOfDeath.xml b/data/templates/npc/monster/22525-EmissaryOfDeath.xml
index 8b6430a03..832be8a62 100644
--- a/data/templates/npc/monster/22525-EmissaryOfDeath.xml
+++ b/data/templates/npc/monster/22525-EmissaryOfDeath.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22525" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22526-EmissaryOfDeath.xml b/data/templates/npc/monster/22526-EmissaryOfDeath.xml
index 29e845c5f..8b3ae2c1a 100644
--- a/data/templates/npc/monster/22526-EmissaryOfDeath.xml
+++ b/data/templates/npc/monster/22526-EmissaryOfDeath.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22526" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22527-EmissaryOfDeath.xml b/data/templates/npc/monster/22527-EmissaryOfDeath.xml
index 243dab19c..ebb9c98af 100644
--- a/data/templates/npc/monster/22527-EmissaryOfDeath.xml
+++ b/data/templates/npc/monster/22527-EmissaryOfDeath.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22527" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22528-CursedPrefect.xml b/data/templates/npc/monster/22528-CursedPrefect.xml
index ed8028e0b..946009ea5 100644
--- a/data/templates/npc/monster/22528-CursedPrefect.xml
+++ b/data/templates/npc/monster/22528-CursedPrefect.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22528" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22529-CursedPrefect.xml b/data/templates/npc/monster/22529-CursedPrefect.xml
index 538d692b3..d719d7fef 100644
--- a/data/templates/npc/monster/22529-CursedPrefect.xml
+++ b/data/templates/npc/monster/22529-CursedPrefect.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22529" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22530-CursedPrefect.xml b/data/templates/npc/monster/22530-CursedPrefect.xml
index 889149598..1eb5f2c0c 100644
--- a/data/templates/npc/monster/22530-CursedPrefect.xml
+++ b/data/templates/npc/monster/22530-CursedPrefect.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22530" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22531-CursedPrefect.xml b/data/templates/npc/monster/22531-CursedPrefect.xml
index 722f92c1d..e0a1d074d 100644
--- a/data/templates/npc/monster/22531-CursedPrefect.xml
+++ b/data/templates/npc/monster/22531-CursedPrefect.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22531" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22532-LawScholarOfConclusions.xml b/data/templates/npc/monster/22532-LawScholarOfConclusions.xml
index fc67ff45e..ea985654e 100644
--- a/data/templates/npc/monster/22532-LawScholarOfConclusions.xml
+++ b/data/templates/npc/monster/22532-LawScholarOfConclusions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22532" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22533-LawScholarOfConclusions.xml b/data/templates/npc/monster/22533-LawScholarOfConclusions.xml
index b69ec2092..268088460 100644
--- a/data/templates/npc/monster/22533-LawScholarOfConclusions.xml
+++ b/data/templates/npc/monster/22533-LawScholarOfConclusions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22533" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22534-LawScholarOfConclusions.xml b/data/templates/npc/monster/22534-LawScholarOfConclusions.xml
index cc055c42b..d27408a77 100644
--- a/data/templates/npc/monster/22534-LawScholarOfConclusions.xml
+++ b/data/templates/npc/monster/22534-LawScholarOfConclusions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22534" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22535-LawScholarOfConclusions.xml b/data/templates/npc/monster/22535-LawScholarOfConclusions.xml
index 7ec5952b9..985a8113d 100644
--- a/data/templates/npc/monster/22535-LawScholarOfConclusions.xml
+++ b/data/templates/npc/monster/22535-LawScholarOfConclusions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22535" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22536-RoyalGuardCaptain.xml b/data/templates/npc/monster/22536-RoyalGuardCaptain.xml
index cd4064f44..c0d828dde 100644
--- a/data/templates/npc/monster/22536-RoyalGuardCaptain.xml
+++ b/data/templates/npc/monster/22536-RoyalGuardCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22536" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22537-DragonSteedTroopGrandMagician.xml b/data/templates/npc/monster/22537-DragonSteedTroopGrandMagician.xml
index 76c5504e1..e76c9fce5 100644
--- a/data/templates/npc/monster/22537-DragonSteedTroopGrandMagician.xml
+++ b/data/templates/npc/monster/22537-DragonSteedTroopGrandMagician.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22537" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22538-DragonSteedTroopCommander.xml b/data/templates/npc/monster/22538-DragonSteedTroopCommander.xml
index ce901b5aa..f56ca9c6e 100644
--- a/data/templates/npc/monster/22538-DragonSteedTroopCommander.xml
+++ b/data/templates/npc/monster/22538-DragonSteedTroopCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22538" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22539-DragonSteedTroopsNo1BattalionCommander.xml b/data/templates/npc/monster/22539-DragonSteedTroopsNo1BattalionCommander.xml
index f089936ff..381596514 100644
--- a/data/templates/npc/monster/22539-DragonSteedTroopsNo1BattalionCommander.xml
+++ b/data/templates/npc/monster/22539-DragonSteedTroopsNo1BattalionCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22539" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22540-WhiteDragonLeader.xml b/data/templates/npc/monster/22540-WhiteDragonLeader.xml
index 9eb8b7243..85d0f4113 100644
--- a/data/templates/npc/monster/22540-WhiteDragonLeader.xml
+++ b/data/templates/npc/monster/22540-WhiteDragonLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22540" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22541-DragonSteedTroopInfantry.xml b/data/templates/npc/monster/22541-DragonSteedTroopInfantry.xml
index 1f2864a50..0519ddd21 100644
--- a/data/templates/npc/monster/22541-DragonSteedTroopInfantry.xml
+++ b/data/templates/npc/monster/22541-DragonSteedTroopInfantry.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22541" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22542-DragonSteedTroopMagicLeader.xml b/data/templates/npc/monster/22542-DragonSteedTroopMagicLeader.xml
index 4d87f2647..4cb84c7f5 100644
--- a/data/templates/npc/monster/22542-DragonSteedTroopMagicLeader.xml
+++ b/data/templates/npc/monster/22542-DragonSteedTroopMagicLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22542" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22543-DragonSteedTroopMagician.xml b/data/templates/npc/monster/22543-DragonSteedTroopMagician.xml
index 8ab7e2d00..206638259 100644
--- a/data/templates/npc/monster/22543-DragonSteedTroopMagician.xml
+++ b/data/templates/npc/monster/22543-DragonSteedTroopMagician.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22543" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22544-DragonSteedTroopMagicSoldier.xml b/data/templates/npc/monster/22544-DragonSteedTroopMagicSoldier.xml
index d81798f3d..8b776842b 100644
--- a/data/templates/npc/monster/22544-DragonSteedTroopMagicSoldier.xml
+++ b/data/templates/npc/monster/22544-DragonSteedTroopMagicSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22544" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22545-WifeOfTheDragonOfDarkness.xml b/data/templates/npc/monster/22545-WifeOfTheDragonOfDarkness.xml
index 8332a63b4..808acab4a 100644
--- a/data/templates/npc/monster/22545-WifeOfTheDragonOfDarkness.xml
+++ b/data/templates/npc/monster/22545-WifeOfTheDragonOfDarkness.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22545" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22546-WarriorOfLight.xml b/data/templates/npc/monster/22546-WarriorOfLight.xml
index 60e681827..295a8d8a3 100644
--- a/data/templates/npc/monster/22546-WarriorOfLight.xml
+++ b/data/templates/npc/monster/22546-WarriorOfLight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22546" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22547-DragonSteedTroopHealer.xml b/data/templates/npc/monster/22547-DragonSteedTroopHealer.xml
index 04af05422..a4fd39a7a 100644
--- a/data/templates/npc/monster/22547-DragonSteedTroopHealer.xml
+++ b/data/templates/npc/monster/22547-DragonSteedTroopHealer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22547" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22548-DragonSteedTroopJavelinThrower.xml b/data/templates/npc/monster/22548-DragonSteedTroopJavelinThrower.xml
index 9d37ab27e..662983b0c 100644
--- a/data/templates/npc/monster/22548-DragonSteedTroopJavelinThrower.xml
+++ b/data/templates/npc/monster/22548-DragonSteedTroopJavelinThrower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22548" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22549-DragonSteedTroopJavelinThrower.xml b/data/templates/npc/monster/22549-DragonSteedTroopJavelinThrower.xml
index 04bed70d4..ff278668b 100644
--- a/data/templates/npc/monster/22549-DragonSteedTroopJavelinThrower.xml
+++ b/data/templates/npc/monster/22549-DragonSteedTroopJavelinThrower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22549" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22550-SavageWarrior.xml b/data/templates/npc/monster/22550-SavageWarrior.xml
index 5cdb45cd4..e4f1c2342 100644
--- a/data/templates/npc/monster/22550-SavageWarrior.xml
+++ b/data/templates/npc/monster/22550-SavageWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22550" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22551-PriestOfDarkness.xml b/data/templates/npc/monster/22551-PriestOfDarkness.xml
index dbf9cf818..a2a3fb563 100644
--- a/data/templates/npc/monster/22551-PriestOfDarkness.xml
+++ b/data/templates/npc/monster/22551-PriestOfDarkness.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22551" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22552-MutationDrake.xml b/data/templates/npc/monster/22552-MutationDrake.xml
index 7693727f1..cd83b1988 100644
--- a/data/templates/npc/monster/22552-MutationDrake.xml
+++ b/data/templates/npc/monster/22552-MutationDrake.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22552" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22553-LargeCrystalCore.xml b/data/templates/npc/monster/22553-LargeCrystalCore.xml
index 850e39019..b2306182d 100644
--- a/data/templates/npc/monster/22553-LargeCrystalCore.xml
+++ b/data/templates/npc/monster/22553-LargeCrystalCore.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22553" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22554-SmallCrystalCore.xml b/data/templates/npc/monster/22554-SmallCrystalCore.xml
index f991bd447..d9eff48b2 100644
--- a/data/templates/npc/monster/22554-SmallCrystalCore.xml
+++ b/data/templates/npc/monster/22554-SmallCrystalCore.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22554" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22555-SmallCrystalCore.xml b/data/templates/npc/monster/22555-SmallCrystalCore.xml
index 240479950..66618950e 100644
--- a/data/templates/npc/monster/22555-SmallCrystalCore.xml
+++ b/data/templates/npc/monster/22555-SmallCrystalCore.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22555" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22556-SmallCrystalCore.xml b/data/templates/npc/monster/22556-SmallCrystalCore.xml
index a3be36059..84a2d9961 100644
--- a/data/templates/npc/monster/22556-SmallCrystalCore.xml
+++ b/data/templates/npc/monster/22556-SmallCrystalCore.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22556" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22557-DefenseMechanism.xml b/data/templates/npc/monster/22557-DefenseMechanism.xml
index 0b900ad0c..3c0d755fc 100644
--- a/data/templates/npc/monster/22557-DefenseMechanism.xml
+++ b/data/templates/npc/monster/22557-DefenseMechanism.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22557" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22558-DefenseBattery.xml b/data/templates/npc/monster/22558-DefenseBattery.xml
index ca40d1fd4..d2cb7b1bf 100644
--- a/data/templates/npc/monster/22558-DefenseBattery.xml
+++ b/data/templates/npc/monster/22558-DefenseBattery.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22558" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22559-DefeatedTroopsCommander.xml b/data/templates/npc/monster/22559-DefeatedTroopsCommander.xml
index 8aeb1cf33..2569d21fa 100644
--- a/data/templates/npc/monster/22559-DefeatedTroopsCommander.xml
+++ b/data/templates/npc/monster/22559-DefeatedTroopsCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22559" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22560-DefeatedTroopsNo1BattalionCommander.xml b/data/templates/npc/monster/22560-DefeatedTroopsNo1BattalionCommander.xml
index 7b85fad1c..4c71cf268 100644
--- a/data/templates/npc/monster/22560-DefeatedTroopsNo1BattalionCommander.xml
+++ b/data/templates/npc/monster/22560-DefeatedTroopsNo1BattalionCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22560" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22561-DefeatedTroopsWhiteDragonLeader.xml b/data/templates/npc/monster/22561-DefeatedTroopsWhiteDragonLeader.xml
index e78fb0c51..25e12ad0f 100644
--- a/data/templates/npc/monster/22561-DefeatedTroopsWhiteDragonLeader.xml
+++ b/data/templates/npc/monster/22561-DefeatedTroopsWhiteDragonLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22561" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22562-DefeatedTroopsInfantry.xml b/data/templates/npc/monster/22562-DefeatedTroopsInfantry.xml
index 374a740f6..581adc754 100644
--- a/data/templates/npc/monster/22562-DefeatedTroopsInfantry.xml
+++ b/data/templates/npc/monster/22562-DefeatedTroopsInfantry.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22562" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22563-DefeatedTroopsMagicLeader.xml b/data/templates/npc/monster/22563-DefeatedTroopsMagicLeader.xml
index 3fc063b94..d081a35c4 100644
--- a/data/templates/npc/monster/22563-DefeatedTroopsMagicLeader.xml
+++ b/data/templates/npc/monster/22563-DefeatedTroopsMagicLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22563" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22564-DefeatedTroopsMagician.xml b/data/templates/npc/monster/22564-DefeatedTroopsMagician.xml
index 066a06a44..5aee2eb8e 100644
--- a/data/templates/npc/monster/22564-DefeatedTroopsMagician.xml
+++ b/data/templates/npc/monster/22564-DefeatedTroopsMagician.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22564" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22565-DefeatedTroopsMagicSoldier.xml b/data/templates/npc/monster/22565-DefeatedTroopsMagicSoldier.xml
index 17fbceced..493866f93 100644
--- a/data/templates/npc/monster/22565-DefeatedTroopsMagicSoldier.xml
+++ b/data/templates/npc/monster/22565-DefeatedTroopsMagicSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22565" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22566-DefeatedTroopsHealer.xml b/data/templates/npc/monster/22566-DefeatedTroopsHealer.xml
index 7c4bbcacf..cfd35c720 100644
--- a/data/templates/npc/monster/22566-DefeatedTroopsHealer.xml
+++ b/data/templates/npc/monster/22566-DefeatedTroopsHealer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22566" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22567-DefeatedTroopsJavelinThrower.xml b/data/templates/npc/monster/22567-DefeatedTroopsJavelinThrower.xml
index 74063d32c..2e65dc129 100644
--- a/data/templates/npc/monster/22567-DefeatedTroopsJavelinThrower.xml
+++ b/data/templates/npc/monster/22567-DefeatedTroopsJavelinThrower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22567" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22568-DefeatedTroopsJavelinThrower.xml b/data/templates/npc/monster/22568-DefeatedTroopsJavelinThrower.xml
index 8e1e965d2..7aa27c712 100644
--- a/data/templates/npc/monster/22568-DefeatedTroopsJavelinThrower.xml
+++ b/data/templates/npc/monster/22568-DefeatedTroopsJavelinThrower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22568" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22569-SoldiersOfBravery.xml b/data/templates/npc/monster/22569-SoldiersOfBravery.xml
index 8cf4d2b84..82d4941c5 100644
--- a/data/templates/npc/monster/22569-SoldiersOfBravery.xml
+++ b/data/templates/npc/monster/22569-SoldiersOfBravery.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22569" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22570-RoyalGuardCaptain.xml b/data/templates/npc/monster/22570-RoyalGuardCaptain.xml
index 5f34f65e7..dd77ac6a3 100644
--- a/data/templates/npc/monster/22570-RoyalGuardCaptain.xml
+++ b/data/templates/npc/monster/22570-RoyalGuardCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22570" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22571-DragonSteedTroopGrandMagician.xml b/data/templates/npc/monster/22571-DragonSteedTroopGrandMagician.xml
index e15155979..754945e52 100644
--- a/data/templates/npc/monster/22571-DragonSteedTroopGrandMagician.xml
+++ b/data/templates/npc/monster/22571-DragonSteedTroopGrandMagician.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22571" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22572-DragonSteedTroopCommander.xml b/data/templates/npc/monster/22572-DragonSteedTroopCommander.xml
index e86c48e44..f664deac9 100644
--- a/data/templates/npc/monster/22572-DragonSteedTroopCommander.xml
+++ b/data/templates/npc/monster/22572-DragonSteedTroopCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22572" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22573-DragonSteedTroopsNo1BattalionCommander.xml b/data/templates/npc/monster/22573-DragonSteedTroopsNo1BattalionCommander.xml
index 2a83647b1..1cc71d5c0 100644
--- a/data/templates/npc/monster/22573-DragonSteedTroopsNo1BattalionCommander.xml
+++ b/data/templates/npc/monster/22573-DragonSteedTroopsNo1BattalionCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22573" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22574-WhiteDragonLeader.xml b/data/templates/npc/monster/22574-WhiteDragonLeader.xml
index c86ba0ea3..dbac44980 100644
--- a/data/templates/npc/monster/22574-WhiteDragonLeader.xml
+++ b/data/templates/npc/monster/22574-WhiteDragonLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22574" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22575-DragonSteedTroopInfantry.xml b/data/templates/npc/monster/22575-DragonSteedTroopInfantry.xml
index bee8a8aca..36ed3f83e 100644
--- a/data/templates/npc/monster/22575-DragonSteedTroopInfantry.xml
+++ b/data/templates/npc/monster/22575-DragonSteedTroopInfantry.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22575" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22576-DragonSteedTroopMagicLeader.xml b/data/templates/npc/monster/22576-DragonSteedTroopMagicLeader.xml
index d35987d23..d41293a69 100644
--- a/data/templates/npc/monster/22576-DragonSteedTroopMagicLeader.xml
+++ b/data/templates/npc/monster/22576-DragonSteedTroopMagicLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22576" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22577-DragonSteedTroopMagician.xml b/data/templates/npc/monster/22577-DragonSteedTroopMagician.xml
index 08c146cf0..2120c6fa0 100644
--- a/data/templates/npc/monster/22577-DragonSteedTroopMagician.xml
+++ b/data/templates/npc/monster/22577-DragonSteedTroopMagician.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22577" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22578-DragonSteedTroopMagicSoldier.xml b/data/templates/npc/monster/22578-DragonSteedTroopMagicSoldier.xml
index 29e3d5552..174310ece 100644
--- a/data/templates/npc/monster/22578-DragonSteedTroopMagicSoldier.xml
+++ b/data/templates/npc/monster/22578-DragonSteedTroopMagicSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22578" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22579-WarriorOfLight.xml b/data/templates/npc/monster/22579-WarriorOfLight.xml
index 403ea9115..1eeb33fe7 100644
--- a/data/templates/npc/monster/22579-WarriorOfLight.xml
+++ b/data/templates/npc/monster/22579-WarriorOfLight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22579" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22580-DragonSteedTroopHealer.xml b/data/templates/npc/monster/22580-DragonSteedTroopHealer.xml
index 1691a23ca..bcf9705e5 100644
--- a/data/templates/npc/monster/22580-DragonSteedTroopHealer.xml
+++ b/data/templates/npc/monster/22580-DragonSteedTroopHealer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22580" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22581-DragonSteedTroopJavelinThrower.xml b/data/templates/npc/monster/22581-DragonSteedTroopJavelinThrower.xml
index 358a3ad74..1a934fe24 100644
--- a/data/templates/npc/monster/22581-DragonSteedTroopJavelinThrower.xml
+++ b/data/templates/npc/monster/22581-DragonSteedTroopJavelinThrower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22581" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22582-DragonSteedTroopJavelinThrower.xml b/data/templates/npc/monster/22582-DragonSteedTroopJavelinThrower.xml
index 743dcac0a..29e9eb035 100644
--- a/data/templates/npc/monster/22582-DragonSteedTroopJavelinThrower.xml
+++ b/data/templates/npc/monster/22582-DragonSteedTroopJavelinThrower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22582" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22583-DragonSteedTroopMagicLeader.xml b/data/templates/npc/monster/22583-DragonSteedTroopMagicLeader.xml
index e7648516b..2427e3541 100644
--- a/data/templates/npc/monster/22583-DragonSteedTroopMagicLeader.xml
+++ b/data/templates/npc/monster/22583-DragonSteedTroopMagicLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22583" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22584-DragonSteedTroopMagician.xml b/data/templates/npc/monster/22584-DragonSteedTroopMagician.xml
index cdb3a7bad..672c3359d 100644
--- a/data/templates/npc/monster/22584-DragonSteedTroopMagician.xml
+++ b/data/templates/npc/monster/22584-DragonSteedTroopMagician.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22584" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22585-DragonSteedTroopMagicSoldier.xml b/data/templates/npc/monster/22585-DragonSteedTroopMagicSoldier.xml
index d9ae88520..a79794484 100644
--- a/data/templates/npc/monster/22585-DragonSteedTroopMagicSoldier.xml
+++ b/data/templates/npc/monster/22585-DragonSteedTroopMagicSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22585" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22586-DragonSteedTroopCommander.xml b/data/templates/npc/monster/22586-DragonSteedTroopCommander.xml
index 8267db210..6e3ad1e68 100644
--- a/data/templates/npc/monster/22586-DragonSteedTroopCommander.xml
+++ b/data/templates/npc/monster/22586-DragonSteedTroopCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22586" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22587-DragonSteedTroopCaptain1.xml b/data/templates/npc/monster/22587-DragonSteedTroopCaptain1.xml
index d6b274c06..7f6811ec0 100644
--- a/data/templates/npc/monster/22587-DragonSteedTroopCaptain1.xml
+++ b/data/templates/npc/monster/22587-DragonSteedTroopCaptain1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22587" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22588-WhiteDragonLeader.xml b/data/templates/npc/monster/22588-WhiteDragonLeader.xml
index 4fa99b54c..183581e3d 100644
--- a/data/templates/npc/monster/22588-WhiteDragonLeader.xml
+++ b/data/templates/npc/monster/22588-WhiteDragonLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22588" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22589-DragonSteedTroopInfantry.xml b/data/templates/npc/monster/22589-DragonSteedTroopInfantry.xml
index ce38975c5..10919df31 100644
--- a/data/templates/npc/monster/22589-DragonSteedTroopInfantry.xml
+++ b/data/templates/npc/monster/22589-DragonSteedTroopInfantry.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22589" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22590.xml b/data/templates/npc/monster/22590.xml
index 6cdcb0841..ce90aeb25 100644
--- a/data/templates/npc/monster/22590.xml
+++ b/data/templates/npc/monster/22590.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22590" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22591-DragonSteedTroopMagicLeader.xml b/data/templates/npc/monster/22591-DragonSteedTroopMagicLeader.xml
index a067fba34..dab4c0703 100644
--- a/data/templates/npc/monster/22591-DragonSteedTroopMagicLeader.xml
+++ b/data/templates/npc/monster/22591-DragonSteedTroopMagicLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22591" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22592-DragonSteedTroopMagician.xml b/data/templates/npc/monster/22592-DragonSteedTroopMagician.xml
index 4916c67cc..0700bf90e 100644
--- a/data/templates/npc/monster/22592-DragonSteedTroopMagician.xml
+++ b/data/templates/npc/monster/22592-DragonSteedTroopMagician.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22592" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22593-DragonSteedTroopMagicSoldier.xml b/data/templates/npc/monster/22593-DragonSteedTroopMagicSoldier.xml
index 4c00a6da8..fe65f49c5 100644
--- a/data/templates/npc/monster/22593-DragonSteedTroopMagicSoldier.xml
+++ b/data/templates/npc/monster/22593-DragonSteedTroopMagicSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22593" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22594-DragonSteedTroopCommander.xml b/data/templates/npc/monster/22594-DragonSteedTroopCommander.xml
index ac12732d1..e6009c7ee 100644
--- a/data/templates/npc/monster/22594-DragonSteedTroopCommander.xml
+++ b/data/templates/npc/monster/22594-DragonSteedTroopCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22594" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22595-DragonSteedTroopsNo1BattalionCommander.xml b/data/templates/npc/monster/22595-DragonSteedTroopsNo1BattalionCommander.xml
index 530d44cb2..935e17d48 100644
--- a/data/templates/npc/monster/22595-DragonSteedTroopsNo1BattalionCommander.xml
+++ b/data/templates/npc/monster/22595-DragonSteedTroopsNo1BattalionCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22595" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22596-WhiteDragonLeader.xml b/data/templates/npc/monster/22596-WhiteDragonLeader.xml
index b31ddd807..3ffe2c302 100644
--- a/data/templates/npc/monster/22596-WhiteDragonLeader.xml
+++ b/data/templates/npc/monster/22596-WhiteDragonLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22596" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22597-DragonSteedTroopInfantry.xml b/data/templates/npc/monster/22597-DragonSteedTroopInfantry.xml
index 561e9e171..a51af66ae 100644
--- a/data/templates/npc/monster/22597-DragonSteedTroopInfantry.xml
+++ b/data/templates/npc/monster/22597-DragonSteedTroopInfantry.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22597" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22598-Obelisk.xml b/data/templates/npc/monster/22598-Obelisk.xml
index 67bf6f6e1..7554aff94 100644
--- a/data/templates/npc/monster/22598-Obelisk.xml
+++ b/data/templates/npc/monster/22598-Obelisk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22598" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22599-GreatPowerfulDevice.xml b/data/templates/npc/monster/22599-GreatPowerfulDevice.xml
index 0bf0cb56b..e9fb7a936 100644
--- a/data/templates/npc/monster/22599-GreatPowerfulDevice.xml
+++ b/data/templates/npc/monster/22599-GreatPowerfulDevice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22599" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22600-ThroneOfDestructionPowerfulDevice.xml b/data/templates/npc/monster/22600-ThroneOfDestructionPowerfulDevice.xml
index e743f081c..d09bbd8bf 100644
--- a/data/templates/npc/monster/22600-ThroneOfDestructionPowerfulDevice.xml
+++ b/data/templates/npc/monster/22600-ThroneOfDestructionPowerfulDevice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22600" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22601-HeartProtectionDevice.xml b/data/templates/npc/monster/22601-HeartProtectionDevice.xml
index 8e06a516b..5366c6afb 100644
--- a/data/templates/npc/monster/22601-HeartProtectionDevice.xml
+++ b/data/templates/npc/monster/22601-HeartProtectionDevice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22601" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22602-MutantBird.xml b/data/templates/npc/monster/22602-MutantBird.xml
index d3312e67c..ca4516c1b 100644
--- a/data/templates/npc/monster/22602-MutantBird.xml
+++ b/data/templates/npc/monster/22602-MutantBird.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22602" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22603-MutantBird.xml b/data/templates/npc/monster/22603-MutantBird.xml
index bdc1def92..8f0a79765 100644
--- a/data/templates/npc/monster/22603-MutantBird.xml
+++ b/data/templates/npc/monster/22603-MutantBird.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22603" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22604-DraHawk.xml b/data/templates/npc/monster/22604-DraHawk.xml
index 52b3abb98..a3cd060c4 100644
--- a/data/templates/npc/monster/22604-DraHawk.xml
+++ b/data/templates/npc/monster/22604-DraHawk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22604" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22605-DraHawk.xml b/data/templates/npc/monster/22605-DraHawk.xml
index b98e3f283..904a5cdd4 100644
--- a/data/templates/npc/monster/22605-DraHawk.xml
+++ b/data/templates/npc/monster/22605-DraHawk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22605" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22606-FloatingSkull.xml b/data/templates/npc/monster/22606-FloatingSkull.xml
index 3e7ed312f..704315787 100644
--- a/data/templates/npc/monster/22606-FloatingSkull.xml
+++ b/data/templates/npc/monster/22606-FloatingSkull.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22606" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22607-FloatingSkull.xml b/data/templates/npc/monster/22607-FloatingSkull.xml
index 5aaf1add8..f556cdbf3 100644
--- a/data/templates/npc/monster/22607-FloatingSkull.xml
+++ b/data/templates/npc/monster/22607-FloatingSkull.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22607" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22608-FloatingZombie.xml b/data/templates/npc/monster/22608-FloatingZombie.xml
index fb84141e3..2c81bb0e5 100644
--- a/data/templates/npc/monster/22608-FloatingZombie.xml
+++ b/data/templates/npc/monster/22608-FloatingZombie.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22608" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22609-FloatingZombie.xml b/data/templates/npc/monster/22609-FloatingZombie.xml
index 9f04f1ccd..7407e1326 100644
--- a/data/templates/npc/monster/22609-FloatingZombie.xml
+++ b/data/templates/npc/monster/22609-FloatingZombie.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22609" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22610-MutatedDrakeWing.xml b/data/templates/npc/monster/22610-MutatedDrakeWing.xml
index 733927c4e..a281cc093 100644
--- a/data/templates/npc/monster/22610-MutatedDrakeWing.xml
+++ b/data/templates/npc/monster/22610-MutatedDrakeWing.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22610" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22611-MutatedDrakeWing.xml b/data/templates/npc/monster/22611-MutatedDrakeWing.xml
index 56ec999ff..0924a891c 100644
--- a/data/templates/npc/monster/22611-MutatedDrakeWing.xml
+++ b/data/templates/npc/monster/22611-MutatedDrakeWing.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22611" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22612-Drak.xml b/data/templates/npc/monster/22612-Drak.xml
index 9e05edb6a..c1780a1a1 100644
--- a/data/templates/npc/monster/22612-Drak.xml
+++ b/data/templates/npc/monster/22612-Drak.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22612" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22613-Drak.xml b/data/templates/npc/monster/22613-Drak.xml
index 818de519e..c7e3c2aa3 100644
--- a/data/templates/npc/monster/22613-Drak.xml
+++ b/data/templates/npc/monster/22613-Drak.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22613" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22614-VultureRider.xml b/data/templates/npc/monster/22614-VultureRider.xml
index aeb0a54c4..b7922cd95 100644
--- a/data/templates/npc/monster/22614-VultureRider.xml
+++ b/data/templates/npc/monster/22614-VultureRider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22614" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22615-VultureRider.xml b/data/templates/npc/monster/22615-VultureRider.xml
index 923439330..0b74ed6f8 100644
--- a/data/templates/npc/monster/22615-VultureRider.xml
+++ b/data/templates/npc/monster/22615-VultureRider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22615" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22616-SeedOfPain.xml b/data/templates/npc/monster/22616-SeedOfPain.xml
index 240881f9e..91b9f7c70 100644
--- a/data/templates/npc/monster/22616-SeedOfPain.xml
+++ b/data/templates/npc/monster/22616-SeedOfPain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22616" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22617-SpikedStakato.xml b/data/templates/npc/monster/22617-SpikedStakato.xml
index c003b2945..f0f81486a 100644
--- a/data/templates/npc/monster/22617-SpikedStakato.xml
+++ b/data/templates/npc/monster/22617-SpikedStakato.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22617" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22618-SpikedStakatoWorker.xml b/data/templates/npc/monster/22618-SpikedStakatoWorker.xml
index cad7c8fbf..099b91eac 100644
--- a/data/templates/npc/monster/22618-SpikedStakatoWorker.xml
+++ b/data/templates/npc/monster/22618-SpikedStakatoWorker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22618" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22619-SpikedStakatoGuard.xml b/data/templates/npc/monster/22619-SpikedStakatoGuard.xml
index ba2d3b8c1..811ae7f29 100644
--- a/data/templates/npc/monster/22619-SpikedStakatoGuard.xml
+++ b/data/templates/npc/monster/22619-SpikedStakatoGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22619" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22620-FemaleSpikedStakato.xml b/data/templates/npc/monster/22620-FemaleSpikedStakato.xml
index 7515297ee..a1ba85657 100644
--- a/data/templates/npc/monster/22620-FemaleSpikedStakato.xml
+++ b/data/templates/npc/monster/22620-FemaleSpikedStakato.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22620" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22621-MaleSpikedStakato.xml b/data/templates/npc/monster/22621-MaleSpikedStakato.xml
index cb03487ba..a4ed103fc 100644
--- a/data/templates/npc/monster/22621-MaleSpikedStakato.xml
+++ b/data/templates/npc/monster/22621-MaleSpikedStakato.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22621" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22622-MaleSpikedStakato.xml b/data/templates/npc/monster/22622-MaleSpikedStakato.xml
index b80c20759..1c93db28e 100644
--- a/data/templates/npc/monster/22622-MaleSpikedStakato.xml
+++ b/data/templates/npc/monster/22622-MaleSpikedStakato.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22622" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22623-SpikedStakatoSorcerer.xml b/data/templates/npc/monster/22623-SpikedStakatoSorcerer.xml
index 7406a6afd..4e8566dd5 100644
--- a/data/templates/npc/monster/22623-SpikedStakatoSorcerer.xml
+++ b/data/templates/npc/monster/22623-SpikedStakatoSorcerer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22623" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22624-CannibalisticStakatoFollower.xml b/data/templates/npc/monster/22624-CannibalisticStakatoFollower.xml
index 85797d104..29c78dd17 100644
--- a/data/templates/npc/monster/22624-CannibalisticStakatoFollower.xml
+++ b/data/templates/npc/monster/22624-CannibalisticStakatoFollower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22624" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22625-CannibalisticStakatoLeader.xml b/data/templates/npc/monster/22625-CannibalisticStakatoLeader.xml
index 0cbbc6986..9a115d5cf 100644
--- a/data/templates/npc/monster/22625-CannibalisticStakatoLeader.xml
+++ b/data/templates/npc/monster/22625-CannibalisticStakatoLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22625" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22626-CannibalisticStakatoLeader.xml b/data/templates/npc/monster/22626-CannibalisticStakatoLeader.xml
index efb6f05cd..262af4c82 100644
--- a/data/templates/npc/monster/22626-CannibalisticStakatoLeader.xml
+++ b/data/templates/npc/monster/22626-CannibalisticStakatoLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22626" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22627-SpikedStakatoSoldier.xml b/data/templates/npc/monster/22627-SpikedStakatoSoldier.xml
index 18789237c..8dd7ee791 100644
--- a/data/templates/npc/monster/22627-SpikedStakatoSoldier.xml
+++ b/data/templates/npc/monster/22627-SpikedStakatoSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22627" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22628-SpikedStakatoDrone.xml b/data/templates/npc/monster/22628-SpikedStakatoDrone.xml
index 967f4b1bb..81f345446 100644
--- a/data/templates/npc/monster/22628-SpikedStakatoDrone.xml
+++ b/data/templates/npc/monster/22628-SpikedStakatoDrone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22628" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22629-SpikedStakatoCaptain.xml b/data/templates/npc/monster/22629-SpikedStakatoCaptain.xml
index 9c03f2415..1b2530866 100644
--- a/data/templates/npc/monster/22629-SpikedStakatoCaptain.xml
+++ b/data/templates/npc/monster/22629-SpikedStakatoCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22629" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22630-SpikeStakatoNurse.xml b/data/templates/npc/monster/22630-SpikeStakatoNurse.xml
index e31f29ffc..00b061fbf 100644
--- a/data/templates/npc/monster/22630-SpikeStakatoNurse.xml
+++ b/data/templates/npc/monster/22630-SpikeStakatoNurse.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22630" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22631-SpikeStakatoNurse.xml b/data/templates/npc/monster/22631-SpikeStakatoNurse.xml
index 10f930186..5cade6a08 100644
--- a/data/templates/npc/monster/22631-SpikeStakatoNurse.xml
+++ b/data/templates/npc/monster/22631-SpikeStakatoNurse.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22631" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22632-SpikedStakatoBaby.xml b/data/templates/npc/monster/22632-SpikedStakatoBaby.xml
index e46a17efb..b8f56eaab 100644
--- a/data/templates/npc/monster/22632-SpikedStakatoBaby.xml
+++ b/data/templates/npc/monster/22632-SpikedStakatoBaby.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22632" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22633-SpikedStakatoShaman.xml b/data/templates/npc/monster/22633-SpikedStakatoShaman.xml
index 31183bc42..9dc235e88 100644
--- a/data/templates/npc/monster/22633-SpikedStakatoShaman.xml
+++ b/data/templates/npc/monster/22633-SpikedStakatoShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22633" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22634-ScarletStakatoWorker.xml b/data/templates/npc/monster/22634-ScarletStakatoWorker.xml
index 2d078ca73..bf56a51da 100644
--- a/data/templates/npc/monster/22634-ScarletStakatoWorker.xml
+++ b/data/templates/npc/monster/22634-ScarletStakatoWorker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22634" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22635-ScarletStakatoSoldier.xml b/data/templates/npc/monster/22635-ScarletStakatoSoldier.xml
index a724c4d66..62a33716b 100644
--- a/data/templates/npc/monster/22635-ScarletStakatoSoldier.xml
+++ b/data/templates/npc/monster/22635-ScarletStakatoSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22635" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22636-ScarletStakatoNoble.xml b/data/templates/npc/monster/22636-ScarletStakatoNoble.xml
index 55d64c9ff..0faddd18c 100644
--- a/data/templates/npc/monster/22636-ScarletStakatoNoble.xml
+++ b/data/templates/npc/monster/22636-ScarletStakatoNoble.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22636" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22637-TepraScorpion.xml b/data/templates/npc/monster/22637-TepraScorpion.xml
index d226b99dc..6550d1360 100644
--- a/data/templates/npc/monster/22637-TepraScorpion.xml
+++ b/data/templates/npc/monster/22637-TepraScorpion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22637" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22638-TepraScarab.xml b/data/templates/npc/monster/22638-TepraScarab.xml
index 2db9b6d41..a3dce170f 100644
--- a/data/templates/npc/monster/22638-TepraScarab.xml
+++ b/data/templates/npc/monster/22638-TepraScarab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22638" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22639-AssassinBeetle.xml b/data/templates/npc/monster/22639-AssassinBeetle.xml
index 0fd3dfab0..c0cbbe669 100644
--- a/data/templates/npc/monster/22639-AssassinBeetle.xml
+++ b/data/templates/npc/monster/22639-AssassinBeetle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22639" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22640-MercenaryOfDestruction.xml b/data/templates/npc/monster/22640-MercenaryOfDestruction.xml
index b90d32080..37fb235d9 100644
--- a/data/templates/npc/monster/22640-MercenaryOfDestruction.xml
+++ b/data/templates/npc/monster/22640-MercenaryOfDestruction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22640" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22641-KnightOfDestruction.xml b/data/templates/npc/monster/22641-KnightOfDestruction.xml
index 6172e7769..1e9af6c76 100644
--- a/data/templates/npc/monster/22641-KnightOfDestruction.xml
+++ b/data/templates/npc/monster/22641-KnightOfDestruction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22641" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22642-LavastoneGolem.xml b/data/templates/npc/monster/22642-LavastoneGolem.xml
index 1f32bc16e..bc15e2de4 100644
--- a/data/templates/npc/monster/22642-LavastoneGolem.xml
+++ b/data/templates/npc/monster/22642-LavastoneGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22642" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22643-MagmaGolem.xml b/data/templates/npc/monster/22643-MagmaGolem.xml
index a8e28fc4d..241785161 100644
--- a/data/templates/npc/monster/22643-MagmaGolem.xml
+++ b/data/templates/npc/monster/22643-MagmaGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22643" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22644-ArimanesOfDestruction.xml b/data/templates/npc/monster/22644-ArimanesOfDestruction.xml
index 1351abddc..92b55ac50 100644
--- a/data/templates/npc/monster/22644-ArimanesOfDestruction.xml
+++ b/data/templates/npc/monster/22644-ArimanesOfDestruction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22644" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22645-BalrogOfDestruction.xml b/data/templates/npc/monster/22645-BalrogOfDestruction.xml
index bd8043ca4..a13278c58 100644
--- a/data/templates/npc/monster/22645-BalrogOfDestruction.xml
+++ b/data/templates/npc/monster/22645-BalrogOfDestruction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22645" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22646-AshurasOfDestruction.xml b/data/templates/npc/monster/22646-AshurasOfDestruction.xml
index 81fe32dfa..2ac888ceb 100644
--- a/data/templates/npc/monster/22646-AshurasOfDestruction.xml
+++ b/data/templates/npc/monster/22646-AshurasOfDestruction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22646" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22647-Lavasillisk.xml b/data/templates/npc/monster/22647-Lavasillisk.xml
index d3cc87054..08a779e5d 100644
--- a/data/templates/npc/monster/22647-Lavasillisk.xml
+++ b/data/templates/npc/monster/22647-Lavasillisk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22647" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22648-BlazingIfrit.xml b/data/templates/npc/monster/22648-BlazingIfrit.xml
index 78f067e26..639981084 100644
--- a/data/templates/npc/monster/22648-BlazingIfrit.xml
+++ b/data/templates/npc/monster/22648-BlazingIfrit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22648" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22649-MagmaDrake.xml b/data/templates/npc/monster/22649-MagmaDrake.xml
index 79789d8d4..c86fdcba7 100644
--- a/data/templates/npc/monster/22649-MagmaDrake.xml
+++ b/data/templates/npc/monster/22649-MagmaDrake.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22649" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22650-MucrokianFanatic.xml b/data/templates/npc/monster/22650-MucrokianFanatic.xml
index cdf820ffe..46c1e1a7a 100644
--- a/data/templates/npc/monster/22650-MucrokianFanatic.xml
+++ b/data/templates/npc/monster/22650-MucrokianFanatic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22650" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22651-MucrokianAscetic.xml b/data/templates/npc/monster/22651-MucrokianAscetic.xml
index 1a9941f00..68c92d3ad 100644
--- a/data/templates/npc/monster/22651-MucrokianAscetic.xml
+++ b/data/templates/npc/monster/22651-MucrokianAscetic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22651" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22652-MucrokianSavior.xml b/data/templates/npc/monster/22652-MucrokianSavior.xml
index 609542eb9..b5d8a02ef 100644
--- a/data/templates/npc/monster/22652-MucrokianSavior.xml
+++ b/data/templates/npc/monster/22652-MucrokianSavior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22652" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22653-MucrokianPreacher.xml b/data/templates/npc/monster/22653-MucrokianPreacher.xml
index 2cd337708..3fb740b6c 100644
--- a/data/templates/npc/monster/22653-MucrokianPreacher.xml
+++ b/data/templates/npc/monster/22653-MucrokianPreacher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22653" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22654-ContaminatedMucrokian.xml b/data/templates/npc/monster/22654-ContaminatedMucrokian.xml
index 127e8ecd6..67d36e08a 100644
--- a/data/templates/npc/monster/22654-ContaminatedMucrokian.xml
+++ b/data/templates/npc/monster/22654-ContaminatedMucrokian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22654" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22655-AwakenedMucrokian.xml b/data/templates/npc/monster/22655-AwakenedMucrokian.xml
index df1e2b1c4..2b126ab29 100644
--- a/data/templates/npc/monster/22655-AwakenedMucrokian.xml
+++ b/data/templates/npc/monster/22655-AwakenedMucrokian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22655" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22656-Suppressor.xml b/data/templates/npc/monster/22656-Suppressor.xml
index c206f9019..8a72673f3 100644
--- a/data/templates/npc/monster/22656-Suppressor.xml
+++ b/data/templates/npc/monster/22656-Suppressor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22656" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22657-Exterminator.xml b/data/templates/npc/monster/22657-Exterminator.xml
index a36b7de48..894c67f91 100644
--- a/data/templates/npc/monster/22657-Exterminator.xml
+++ b/data/templates/npc/monster/22657-Exterminator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22657" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22658-SentinelWaterspirit.xml b/data/templates/npc/monster/22658-SentinelWaterspirit.xml
index a398181e4..3ca8478a0 100644
--- a/data/templates/npc/monster/22658-SentinelWaterspirit.xml
+++ b/data/templates/npc/monster/22658-SentinelWaterspirit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22658" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22659-GuardianWaterspirit.xml b/data/templates/npc/monster/22659-GuardianWaterspirit.xml
index cd2161493..7f5130a39 100644
--- a/data/templates/npc/monster/22659-GuardianWaterspirit.xml
+++ b/data/templates/npc/monster/22659-GuardianWaterspirit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22659" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22660-LesserGiant.xml b/data/templates/npc/monster/22660-LesserGiant.xml
index cd6c26aa9..fb27808a2 100644
--- a/data/templates/npc/monster/22660-LesserGiant.xml
+++ b/data/templates/npc/monster/22660-LesserGiant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22660" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22661-LesserGiantSoldier.xml b/data/templates/npc/monster/22661-LesserGiantSoldier.xml
index ebceeb090..ae3231445 100644
--- a/data/templates/npc/monster/22661-LesserGiantSoldier.xml
+++ b/data/templates/npc/monster/22661-LesserGiantSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22661" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22662-LesserGiantShooter.xml b/data/templates/npc/monster/22662-LesserGiantShooter.xml
index 07c893768..2794d08d6 100644
--- a/data/templates/npc/monster/22662-LesserGiantShooter.xml
+++ b/data/templates/npc/monster/22662-LesserGiantShooter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22662" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22663-LesserGiantScout.xml b/data/templates/npc/monster/22663-LesserGiantScout.xml
index 56f160587..47845f970 100644
--- a/data/templates/npc/monster/22663-LesserGiantScout.xml
+++ b/data/templates/npc/monster/22663-LesserGiantScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22663" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22664-LesserGiantMage.xml b/data/templates/npc/monster/22664-LesserGiantMage.xml
index 3378bdd59..bde53217a 100644
--- a/data/templates/npc/monster/22664-LesserGiantMage.xml
+++ b/data/templates/npc/monster/22664-LesserGiantMage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22664" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22665-LesserGiantElder.xml b/data/templates/npc/monster/22665-LesserGiantElder.xml
index 950ea7baa..5045f6374 100644
--- a/data/templates/npc/monster/22665-LesserGiantElder.xml
+++ b/data/templates/npc/monster/22665-LesserGiantElder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22665" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22666-Barif.xml b/data/templates/npc/monster/22666-Barif.xml
index 1b0a49e30..96f2e33e8 100644
--- a/data/templates/npc/monster/22666-Barif.xml
+++ b/data/templates/npc/monster/22666-Barif.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22666" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22667-BarifSPet.xml b/data/templates/npc/monster/22667-BarifSPet.xml
index 2cb49062e..e81db4b67 100644
--- a/data/templates/npc/monster/22667-BarifSPet.xml
+++ b/data/templates/npc/monster/22667-BarifSPet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22667" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22668-Gamlin.xml b/data/templates/npc/monster/22668-Gamlin.xml
index 4147d5042..703b81556 100644
--- a/data/templates/npc/monster/22668-Gamlin.xml
+++ b/data/templates/npc/monster/22668-Gamlin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22668" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22669-Leogul.xml b/data/templates/npc/monster/22669-Leogul.xml
index c8368fe44..11cdf4aba 100644
--- a/data/templates/npc/monster/22669-Leogul.xml
+++ b/data/templates/npc/monster/22669-Leogul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22669" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22670-CursedLord.xml b/data/templates/npc/monster/22670-CursedLord.xml
index 3a7c5d956..14555c76e 100644
--- a/data/templates/npc/monster/22670-CursedLord.xml
+++ b/data/templates/npc/monster/22670-CursedLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22670" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22671-CursedGuardian.xml b/data/templates/npc/monster/22671-CursedGuardian.xml
index 80c5110c1..0f73d9641 100644
--- a/data/templates/npc/monster/22671-CursedGuardian.xml
+++ b/data/templates/npc/monster/22671-CursedGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22671" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22672-CursedSeer.xml b/data/templates/npc/monster/22672-CursedSeer.xml
index 2dd6312eb..a4f04e60c 100644
--- a/data/templates/npc/monster/22672-CursedSeer.xml
+++ b/data/templates/npc/monster/22672-CursedSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22672" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22673-Hirokai.xml b/data/templates/npc/monster/22673-Hirokai.xml
index 02f44d266..ee02d923a 100644
--- a/data/templates/npc/monster/22673-Hirokai.xml
+++ b/data/templates/npc/monster/22673-Hirokai.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22673" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22674-Imagro.xml b/data/templates/npc/monster/22674-Imagro.xml
index 48fa7d8d8..94c2689e2 100644
--- a/data/templates/npc/monster/22674-Imagro.xml
+++ b/data/templates/npc/monster/22674-Imagro.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22674" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22675-Palit.xml b/data/templates/npc/monster/22675-Palit.xml
index f6c3c2906..11e16190e 100644
--- a/data/templates/npc/monster/22675-Palit.xml
+++ b/data/templates/npc/monster/22675-Palit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22675" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22676-Hamlet.xml b/data/templates/npc/monster/22676-Hamlet.xml
index 3a00dc9e4..c45b32544 100644
--- a/data/templates/npc/monster/22676-Hamlet.xml
+++ b/data/templates/npc/monster/22676-Hamlet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22676" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22677-Klennot.xml b/data/templates/npc/monster/22677-Klennot.xml
index bbaf107bf..958620660 100644
--- a/data/templates/npc/monster/22677-Klennot.xml
+++ b/data/templates/npc/monster/22677-Klennot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22677" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22678-GraveRobberSummoner.xml b/data/templates/npc/monster/22678-GraveRobberSummoner.xml
index 3e1c97d88..89628fa03 100644
--- a/data/templates/npc/monster/22678-GraveRobberSummoner.xml
+++ b/data/templates/npc/monster/22678-GraveRobberSummoner.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22678" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22679-GraveRobberMagician.xml b/data/templates/npc/monster/22679-GraveRobberMagician.xml
index 42260b548..ea5666a3c 100644
--- a/data/templates/npc/monster/22679-GraveRobberMagician.xml
+++ b/data/templates/npc/monster/22679-GraveRobberMagician.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22679" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22680-GraveRobberWorker.xml b/data/templates/npc/monster/22680-GraveRobberWorker.xml
index f494e1e6b..96ae33b9b 100644
--- a/data/templates/npc/monster/22680-GraveRobberWorker.xml
+++ b/data/templates/npc/monster/22680-GraveRobberWorker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22680" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22681-GraveRobberWarrior.xml b/data/templates/npc/monster/22681-GraveRobberWarrior.xml
index 8b87a0fde..03f610dfd 100644
--- a/data/templates/npc/monster/22681-GraveRobberWarrior.xml
+++ b/data/templates/npc/monster/22681-GraveRobberWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22681" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22682-GraveRobberWarriorOfLight.xml b/data/templates/npc/monster/22682-GraveRobberWarriorOfLight.xml
index ceabd4b61..a5ed00969 100644
--- a/data/templates/npc/monster/22682-GraveRobberWarriorOfLight.xml
+++ b/data/templates/npc/monster/22682-GraveRobberWarriorOfLight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22682" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22683-ServitorOfDarkness.xml b/data/templates/npc/monster/22683-ServitorOfDarkness.xml
index 4a0c24272..c2bcb8ab9 100644
--- a/data/templates/npc/monster/22683-ServitorOfDarkness.xml
+++ b/data/templates/npc/monster/22683-ServitorOfDarkness.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22683" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22684-ServitorOfDarkness.xml b/data/templates/npc/monster/22684-ServitorOfDarkness.xml
index da61e7ac1..65cf9e74c 100644
--- a/data/templates/npc/monster/22684-ServitorOfDarkness.xml
+++ b/data/templates/npc/monster/22684-ServitorOfDarkness.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22684" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22685-ServitorOfDarkness.xml b/data/templates/npc/monster/22685-ServitorOfDarkness.xml
index ff45bad1c..79446731f 100644
--- a/data/templates/npc/monster/22685-ServitorOfDarkness.xml
+++ b/data/templates/npc/monster/22685-ServitorOfDarkness.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22685" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22686-ServitorOfDarkness.xml b/data/templates/npc/monster/22686-ServitorOfDarkness.xml
index ecd7675dd..135b659f0 100644
--- a/data/templates/npc/monster/22686-ServitorOfDarkness.xml
+++ b/data/templates/npc/monster/22686-ServitorOfDarkness.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22686" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22687-PhantomsOfTheMine.xml b/data/templates/npc/monster/22687-PhantomsOfTheMine.xml
index b24326fb5..2f69df671 100644
--- a/data/templates/npc/monster/22687-PhantomsOfTheMine.xml
+++ b/data/templates/npc/monster/22687-PhantomsOfTheMine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22687" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22688-EvilSpiritsOfTheMine.xml b/data/templates/npc/monster/22688-EvilSpiritsOfTheMine.xml
index abf2c2d90..b5d90eff8 100644
--- a/data/templates/npc/monster/22688-EvilSpiritsOfTheMine.xml
+++ b/data/templates/npc/monster/22688-EvilSpiritsOfTheMine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22688" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22689-MineBug.xml b/data/templates/npc/monster/22689-MineBug.xml
index 6e15be8ec..3187f29b0 100644
--- a/data/templates/npc/monster/22689-MineBug.xml
+++ b/data/templates/npc/monster/22689-MineBug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22689" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22690-EarthwormSDescendant.xml b/data/templates/npc/monster/22690-EarthwormSDescendant.xml
index 368bc3a66..cef037866 100644
--- a/data/templates/npc/monster/22690-EarthwormSDescendant.xml
+++ b/data/templates/npc/monster/22690-EarthwormSDescendant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22690" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22691-RagnaOrc.xml b/data/templates/npc/monster/22691-RagnaOrc.xml
index b846209cf..c17c5c6f5 100644
--- a/data/templates/npc/monster/22691-RagnaOrc.xml
+++ b/data/templates/npc/monster/22691-RagnaOrc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22691" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22692-RagnaOrcWarrior.xml b/data/templates/npc/monster/22692-RagnaOrcWarrior.xml
index 34171c2c2..7b3ffebf9 100644
--- a/data/templates/npc/monster/22692-RagnaOrcWarrior.xml
+++ b/data/templates/npc/monster/22692-RagnaOrcWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22692" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22693-RagnaOrcHero.xml b/data/templates/npc/monster/22693-RagnaOrcHero.xml
index 2ce79f2b8..52044543a 100644
--- a/data/templates/npc/monster/22693-RagnaOrcHero.xml
+++ b/data/templates/npc/monster/22693-RagnaOrcHero.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22693" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22694-RagnaOrcCommander.xml b/data/templates/npc/monster/22694-RagnaOrcCommander.xml
index d1dfc0ce6..51cc70bae 100644
--- a/data/templates/npc/monster/22694-RagnaOrcCommander.xml
+++ b/data/templates/npc/monster/22694-RagnaOrcCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22694" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22695-RagnaOrcHealer.xml b/data/templates/npc/monster/22695-RagnaOrcHealer.xml
index f5208e955..4c20a6210 100644
--- a/data/templates/npc/monster/22695-RagnaOrcHealer.xml
+++ b/data/templates/npc/monster/22695-RagnaOrcHealer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22695" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22696-RagnaOrcShaman.xml b/data/templates/npc/monster/22696-RagnaOrcShaman.xml
index 8c45127d2..8676e3269 100644
--- a/data/templates/npc/monster/22696-RagnaOrcShaman.xml
+++ b/data/templates/npc/monster/22696-RagnaOrcShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22696" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22697-RagnaOrcSeer.xml b/data/templates/npc/monster/22697-RagnaOrcSeer.xml
index ef77bd640..c01d1f5a5 100644
--- a/data/templates/npc/monster/22697-RagnaOrcSeer.xml
+++ b/data/templates/npc/monster/22697-RagnaOrcSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22697" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22698-RagnaOrcArcher.xml b/data/templates/npc/monster/22698-RagnaOrcArcher.xml
index d0cd25ed6..b2f19cdc2 100644
--- a/data/templates/npc/monster/22698-RagnaOrcArcher.xml
+++ b/data/templates/npc/monster/22698-RagnaOrcArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22698" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22699-RagnaOrcSniper.xml b/data/templates/npc/monster/22699-RagnaOrcSniper.xml
index 886f1b7e6..9989c702a 100644
--- a/data/templates/npc/monster/22699-RagnaOrcSniper.xml
+++ b/data/templates/npc/monster/22699-RagnaOrcSniper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22699" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22700-VarangkaSGuardian.xml b/data/templates/npc/monster/22700-VarangkaSGuardian.xml
index 85e6efcd3..36865ad55 100644
--- a/data/templates/npc/monster/22700-VarangkaSGuardian.xml
+++ b/data/templates/npc/monster/22700-VarangkaSGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22700" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22701-VarangkaSDreVanul.xml b/data/templates/npc/monster/22701-VarangkaSDreVanul.xml
index 00f6f4ef6..dca1529f2 100644
--- a/data/templates/npc/monster/22701-VarangkaSDreVanul.xml
+++ b/data/templates/npc/monster/22701-VarangkaSDreVanul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22701" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22702-VarangkaSDestroyer.xml b/data/templates/npc/monster/22702-VarangkaSDestroyer.xml
index aaa57a30f..26848baf7 100644
--- a/data/templates/npc/monster/22702-VarangkaSDestroyer.xml
+++ b/data/templates/npc/monster/22702-VarangkaSDestroyer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22702" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22703-ContaminatedMorekWarrior.xml b/data/templates/npc/monster/22703-ContaminatedMorekWarrior.xml
index 314122f60..c7310e177 100644
--- a/data/templates/npc/monster/22703-ContaminatedMorekWarrior.xml
+++ b/data/templates/npc/monster/22703-ContaminatedMorekWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22703" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22704-ContaminatedBaturWarrior.xml b/data/templates/npc/monster/22704-ContaminatedBaturWarrior.xml
index 2be34fa24..943a472b2 100644
--- a/data/templates/npc/monster/22704-ContaminatedBaturWarrior.xml
+++ b/data/templates/npc/monster/22704-ContaminatedBaturWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22704" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22705-ContaminatedBaturCommander.xml b/data/templates/npc/monster/22705-ContaminatedBaturCommander.xml
index cee0c5ba6..fd72020fa 100644
--- a/data/templates/npc/monster/22705-ContaminatedBaturCommander.xml
+++ b/data/templates/npc/monster/22705-ContaminatedBaturCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22705" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22706-TurkaFollowerSGhost.xml b/data/templates/npc/monster/22706-TurkaFollowerSGhost.xml
index 8c2de82bc..02ff9ad92 100644
--- a/data/templates/npc/monster/22706-TurkaFollowerSGhost.xml
+++ b/data/templates/npc/monster/22706-TurkaFollowerSGhost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22706" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22707-TurkaCommanderSGhost.xml b/data/templates/npc/monster/22707-TurkaCommanderSGhost.xml
index f83c0970d..d8436bd49 100644
--- a/data/templates/npc/monster/22707-TurkaCommanderSGhost.xml
+++ b/data/templates/npc/monster/22707-TurkaCommanderSGhost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22707" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22708-InvaderWarriorOfNightmare.xml b/data/templates/npc/monster/22708-InvaderWarriorOfNightmare.xml
index 495bd2a4e..8babf1f43 100644
--- a/data/templates/npc/monster/22708-InvaderWarriorOfNightmare.xml
+++ b/data/templates/npc/monster/22708-InvaderWarriorOfNightmare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22708" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22709-InvaderHealerOfNightmare.xml b/data/templates/npc/monster/22709-InvaderHealerOfNightmare.xml
index 90dde0dca..ed8a22097 100644
--- a/data/templates/npc/monster/22709-InvaderHealerOfNightmare.xml
+++ b/data/templates/npc/monster/22709-InvaderHealerOfNightmare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22709" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22710-InvaderGuideOfNightmare.xml b/data/templates/npc/monster/22710-InvaderGuideOfNightmare.xml
index b88077b2f..9d8fb41a1 100644
--- a/data/templates/npc/monster/22710-InvaderGuideOfNightmare.xml
+++ b/data/templates/npc/monster/22710-InvaderGuideOfNightmare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22710" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22711-InvaderDestroyerOfNightmare.xml b/data/templates/npc/monster/22711-InvaderDestroyerOfNightmare.xml
index e052bb0d2..704396455 100644
--- a/data/templates/npc/monster/22711-InvaderDestroyerOfNightmare.xml
+++ b/data/templates/npc/monster/22711-InvaderDestroyerOfNightmare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22711" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22712-InvaderAssassinOfNightmare.xml b/data/templates/npc/monster/22712-InvaderAssassinOfNightmare.xml
index 731737154..9f5e6bb19 100644
--- a/data/templates/npc/monster/22712-InvaderAssassinOfNightmare.xml
+++ b/data/templates/npc/monster/22712-InvaderAssassinOfNightmare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22712" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22713-InvaderShamanOfNightmare.xml b/data/templates/npc/monster/22713-InvaderShamanOfNightmare.xml
index 13e600577..af20e1c88 100644
--- a/data/templates/npc/monster/22713-InvaderShamanOfNightmare.xml
+++ b/data/templates/npc/monster/22713-InvaderShamanOfNightmare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22713" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22714-InvaderArcherOfNightmare.xml b/data/templates/npc/monster/22714-InvaderArcherOfNightmare.xml
index 5b641726d..f47984d5b 100644
--- a/data/templates/npc/monster/22714-InvaderArcherOfNightmare.xml
+++ b/data/templates/npc/monster/22714-InvaderArcherOfNightmare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22714" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22715-InvaderSoldierOfNightmare.xml b/data/templates/npc/monster/22715-InvaderSoldierOfNightmare.xml
index c3c73c9d8..c48c97d49 100644
--- a/data/templates/npc/monster/22715-InvaderSoldierOfNightmare.xml
+++ b/data/templates/npc/monster/22715-InvaderSoldierOfNightmare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22715" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22716-InvaderSoldierOfNightmare.xml b/data/templates/npc/monster/22716-InvaderSoldierOfNightmare.xml
index 94dee2ce6..6d116f5f9 100644
--- a/data/templates/npc/monster/22716-InvaderSoldierOfNightmare.xml
+++ b/data/templates/npc/monster/22716-InvaderSoldierOfNightmare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22716" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22717-InvaderDiscipleOfNightmare.xml b/data/templates/npc/monster/22717-InvaderDiscipleOfNightmare.xml
index 6af7759db..4aae6555b 100644
--- a/data/templates/npc/monster/22717-InvaderDiscipleOfNightmare.xml
+++ b/data/templates/npc/monster/22717-InvaderDiscipleOfNightmare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22717" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22718-InvaderEliteSoldierOfNightmare.xml b/data/templates/npc/monster/22718-InvaderEliteSoldierOfNightmare.xml
index 0d6b19db2..651e3664a 100644
--- a/data/templates/npc/monster/22718-InvaderEliteSoldierOfNightmare.xml
+++ b/data/templates/npc/monster/22718-InvaderEliteSoldierOfNightmare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22718" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22719-NihilInvaderWarrior.xml b/data/templates/npc/monster/22719-NihilInvaderWarrior.xml
index 456eb7c34..90a39da97 100644
--- a/data/templates/npc/monster/22719-NihilInvaderWarrior.xml
+++ b/data/templates/npc/monster/22719-NihilInvaderWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22719" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22720-NihilInvaderHealer.xml b/data/templates/npc/monster/22720-NihilInvaderHealer.xml
index f00a2814d..5a8e751dc 100644
--- a/data/templates/npc/monster/22720-NihilInvaderHealer.xml
+++ b/data/templates/npc/monster/22720-NihilInvaderHealer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22720" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22721-NihilInvaderGuide.xml b/data/templates/npc/monster/22721-NihilInvaderGuide.xml
index 2f8fb35da..e78e95efc 100644
--- a/data/templates/npc/monster/22721-NihilInvaderGuide.xml
+++ b/data/templates/npc/monster/22721-NihilInvaderGuide.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22721" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22722-NihilInvaderDestroyer.xml b/data/templates/npc/monster/22722-NihilInvaderDestroyer.xml
index 5130b774a..4fc36e6c0 100644
--- a/data/templates/npc/monster/22722-NihilInvaderDestroyer.xml
+++ b/data/templates/npc/monster/22722-NihilInvaderDestroyer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22722" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22723-NihilInvaderAssassin.xml b/data/templates/npc/monster/22723-NihilInvaderAssassin.xml
index 9647b593a..a578e5532 100644
--- a/data/templates/npc/monster/22723-NihilInvaderAssassin.xml
+++ b/data/templates/npc/monster/22723-NihilInvaderAssassin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22723" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22724-NihilInvaderShaman.xml b/data/templates/npc/monster/22724-NihilInvaderShaman.xml
index 97b696eb5..81d5dc3d2 100644
--- a/data/templates/npc/monster/22724-NihilInvaderShaman.xml
+++ b/data/templates/npc/monster/22724-NihilInvaderShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22724" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22725-NihilInvaderArcher.xml b/data/templates/npc/monster/22725-NihilInvaderArcher.xml
index 5f74c779e..561b82458 100644
--- a/data/templates/npc/monster/22725-NihilInvaderArcher.xml
+++ b/data/templates/npc/monster/22725-NihilInvaderArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22725" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22726-NihilInvaderSoldier.xml b/data/templates/npc/monster/22726-NihilInvaderSoldier.xml
index 6dce9b526..cb966dd10 100644
--- a/data/templates/npc/monster/22726-NihilInvaderSoldier.xml
+++ b/data/templates/npc/monster/22726-NihilInvaderSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22726" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22727-NihilInvaderSoldier.xml b/data/templates/npc/monster/22727-NihilInvaderSoldier.xml
index 6afd33ffc..810c0db57 100644
--- a/data/templates/npc/monster/22727-NihilInvaderSoldier.xml
+++ b/data/templates/npc/monster/22727-NihilInvaderSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22727" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22728-NihilInvaderDisciple.xml b/data/templates/npc/monster/22728-NihilInvaderDisciple.xml
index 72f4aa35a..cc1a0e3d7 100644
--- a/data/templates/npc/monster/22728-NihilInvaderDisciple.xml
+++ b/data/templates/npc/monster/22728-NihilInvaderDisciple.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22728" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22729-NihilInvaderEliteSoldier.xml b/data/templates/npc/monster/22729-NihilInvaderEliteSoldier.xml
index 3cff6cde7..e04c474a9 100644
--- a/data/templates/npc/monster/22729-NihilInvaderEliteSoldier.xml
+++ b/data/templates/npc/monster/22729-NihilInvaderEliteSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22729" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22730-MutantWarrior.xml b/data/templates/npc/monster/22730-MutantWarrior.xml
index f870f7f1f..8f8a8eaa3 100644
--- a/data/templates/npc/monster/22730-MutantWarrior.xml
+++ b/data/templates/npc/monster/22730-MutantWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22730" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22731-MutantHealer.xml b/data/templates/npc/monster/22731-MutantHealer.xml
index 90524d1a4..3f87b5be4 100644
--- a/data/templates/npc/monster/22731-MutantHealer.xml
+++ b/data/templates/npc/monster/22731-MutantHealer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22731" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22732-MutantGuide.xml b/data/templates/npc/monster/22732-MutantGuide.xml
index 0476ab4ec..ceeac0667 100644
--- a/data/templates/npc/monster/22732-MutantGuide.xml
+++ b/data/templates/npc/monster/22732-MutantGuide.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22732" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22733-MutantDestroyer.xml b/data/templates/npc/monster/22733-MutantDestroyer.xml
index 18c6c4678..881f9dc34 100644
--- a/data/templates/npc/monster/22733-MutantDestroyer.xml
+++ b/data/templates/npc/monster/22733-MutantDestroyer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22733" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22734-MutantAssassin.xml b/data/templates/npc/monster/22734-MutantAssassin.xml
index ab7f811e5..959f4ab86 100644
--- a/data/templates/npc/monster/22734-MutantAssassin.xml
+++ b/data/templates/npc/monster/22734-MutantAssassin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22734" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22735-MutantShaman.xml b/data/templates/npc/monster/22735-MutantShaman.xml
index c21a1c7a3..69770c167 100644
--- a/data/templates/npc/monster/22735-MutantShaman.xml
+++ b/data/templates/npc/monster/22735-MutantShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22735" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22736-MutantOverlord.xml b/data/templates/npc/monster/22736-MutantOverlord.xml
index abdf198a2..b04e02018 100644
--- a/data/templates/npc/monster/22736-MutantOverlord.xml
+++ b/data/templates/npc/monster/22736-MutantOverlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22736" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22737-MutantSoldier.xml b/data/templates/npc/monster/22737-MutantSoldier.xml
index 3d758601b..2e6fe9e45 100644
--- a/data/templates/npc/monster/22737-MutantSoldier.xml
+++ b/data/templates/npc/monster/22737-MutantSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22737" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22738-MutantSoldier.xml b/data/templates/npc/monster/22738-MutantSoldier.xml
index 0edc0b7de..a83cf0104 100644
--- a/data/templates/npc/monster/22738-MutantSoldier.xml
+++ b/data/templates/npc/monster/22738-MutantSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22738" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22739-MutantDisciple.xml b/data/templates/npc/monster/22739-MutantDisciple.xml
index 695f44e72..7e3fa1c65 100644
--- a/data/templates/npc/monster/22739-MutantDisciple.xml
+++ b/data/templates/npc/monster/22739-MutantDisciple.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22739" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22740-MutantEliteSoldier.xml b/data/templates/npc/monster/22740-MutantEliteSoldier.xml
index 6a343bc53..e8242b663 100644
--- a/data/templates/npc/monster/22740-MutantEliteSoldier.xml
+++ b/data/templates/npc/monster/22740-MutantEliteSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22740" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22741-GraveRobberWarrior.xml b/data/templates/npc/monster/22741-GraveRobberWarrior.xml
index c1cb3a55e..7391748a9 100644
--- a/data/templates/npc/monster/22741-GraveRobberWarrior.xml
+++ b/data/templates/npc/monster/22741-GraveRobberWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22741" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22742-Ornithomimus.xml b/data/templates/npc/monster/22742-Ornithomimus.xml
index b5e74c74e..9ccb3a4fe 100644
--- a/data/templates/npc/monster/22742-Ornithomimus.xml
+++ b/data/templates/npc/monster/22742-Ornithomimus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22742" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22743-Deinonychus.xml b/data/templates/npc/monster/22743-Deinonychus.xml
index afeb9939b..401ebf2ac 100644
--- a/data/templates/npc/monster/22743-Deinonychus.xml
+++ b/data/templates/npc/monster/22743-Deinonychus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22743" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22744-Ornithomimus.xml b/data/templates/npc/monster/22744-Ornithomimus.xml
index b473341a5..6ffa57392 100644
--- a/data/templates/npc/monster/22744-Ornithomimus.xml
+++ b/data/templates/npc/monster/22744-Ornithomimus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22744" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22745-Deinonychus.xml b/data/templates/npc/monster/22745-Deinonychus.xml
index 3f4b9c934..420530fdf 100644
--- a/data/templates/npc/monster/22745-Deinonychus.xml
+++ b/data/templates/npc/monster/22745-Deinonychus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22745" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22746-Bgurent.xml b/data/templates/npc/monster/22746-Bgurent.xml
index b498a2379..31d218f92 100644
--- a/data/templates/npc/monster/22746-Bgurent.xml
+++ b/data/templates/npc/monster/22746-Bgurent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22746" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22747-Brakian.xml b/data/templates/npc/monster/22747-Brakian.xml
index bfb71492e..331f043e7 100644
--- a/data/templates/npc/monster/22747-Brakian.xml
+++ b/data/templates/npc/monster/22747-Brakian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22747" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22748-Groikan.xml b/data/templates/npc/monster/22748-Groikan.xml
index 07b53b843..18c6612c9 100644
--- a/data/templates/npc/monster/22748-Groikan.xml
+++ b/data/templates/npc/monster/22748-Groikan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22748" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22749-Treykan.xml b/data/templates/npc/monster/22749-Treykan.xml
index 2c8682823..3f6f88456 100644
--- a/data/templates/npc/monster/22749-Treykan.xml
+++ b/data/templates/npc/monster/22749-Treykan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22749" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22750-EliteBgurent.xml b/data/templates/npc/monster/22750-EliteBgurent.xml
index f1d031747..bef023847 100644
--- a/data/templates/npc/monster/22750-EliteBgurent.xml
+++ b/data/templates/npc/monster/22750-EliteBgurent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22750" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22751-EliteBrakian.xml b/data/templates/npc/monster/22751-EliteBrakian.xml
index 750f5a428..50d99b821 100644
--- a/data/templates/npc/monster/22751-EliteBrakian.xml
+++ b/data/templates/npc/monster/22751-EliteBrakian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22751" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22752-EliteGroikan.xml b/data/templates/npc/monster/22752-EliteGroikan.xml
index bd9cd71e9..ff7fb8774 100644
--- a/data/templates/npc/monster/22752-EliteGroikan.xml
+++ b/data/templates/npc/monster/22752-EliteGroikan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22752" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22753-EliteTreykan.xml b/data/templates/npc/monster/22753-EliteTreykan.xml
index 02525f14a..b17e82f25 100644
--- a/data/templates/npc/monster/22753-EliteTreykan.xml
+++ b/data/templates/npc/monster/22753-EliteTreykan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22753" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22754-Turtlelian.xml b/data/templates/npc/monster/22754-Turtlelian.xml
index 872472b7f..287e27067 100644
--- a/data/templates/npc/monster/22754-Turtlelian.xml
+++ b/data/templates/npc/monster/22754-Turtlelian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22754" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22755-Krajian.xml b/data/templates/npc/monster/22755-Krajian.xml
index 1979291a0..3e2a966e4 100644
--- a/data/templates/npc/monster/22755-Krajian.xml
+++ b/data/templates/npc/monster/22755-Krajian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22755" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22756-Tardyon.xml b/data/templates/npc/monster/22756-Tardyon.xml
index 65679e51c..426ba1f09 100644
--- a/data/templates/npc/monster/22756-Tardyon.xml
+++ b/data/templates/npc/monster/22756-Tardyon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22756" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22757-EliteTurtlelian.xml b/data/templates/npc/monster/22757-EliteTurtlelian.xml
index 8458170aa..f1821208c 100644
--- a/data/templates/npc/monster/22757-EliteTurtlelian.xml
+++ b/data/templates/npc/monster/22757-EliteTurtlelian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22757" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22758-EliteKrajian.xml b/data/templates/npc/monster/22758-EliteKrajian.xml
index 0753f08b2..6bd31578c 100644
--- a/data/templates/npc/monster/22758-EliteKrajian.xml
+++ b/data/templates/npc/monster/22758-EliteKrajian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22758" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22759-EliteTardyon.xml b/data/templates/npc/monster/22759-EliteTardyon.xml
index fc38b8341..73ae3a7cb 100644
--- a/data/templates/npc/monster/22759-EliteTardyon.xml
+++ b/data/templates/npc/monster/22759-EliteTardyon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22759" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22760-Kanibi.xml b/data/templates/npc/monster/22760-Kanibi.xml
index 1cef88510..148fcd694 100644
--- a/data/templates/npc/monster/22760-Kanibi.xml
+++ b/data/templates/npc/monster/22760-Kanibi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22760" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22761-Kiriona.xml b/data/templates/npc/monster/22761-Kiriona.xml
index 240ee96d4..bb527db24 100644
--- a/data/templates/npc/monster/22761-Kiriona.xml
+++ b/data/templates/npc/monster/22761-Kiriona.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22761" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22762-Kaiona.xml b/data/templates/npc/monster/22762-Kaiona.xml
index 3911ab481..3a66feac5 100644
--- a/data/templates/npc/monster/22762-Kaiona.xml
+++ b/data/templates/npc/monster/22762-Kaiona.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22762" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22763-EliteKanibi.xml b/data/templates/npc/monster/22763-EliteKanibi.xml
index 334a1c90e..1e19b9b82 100644
--- a/data/templates/npc/monster/22763-EliteKanibi.xml
+++ b/data/templates/npc/monster/22763-EliteKanibi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22763" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22764-EliteKiriona.xml b/data/templates/npc/monster/22764-EliteKiriona.xml
index 251f9595b..c3705015a 100644
--- a/data/templates/npc/monster/22764-EliteKiriona.xml
+++ b/data/templates/npc/monster/22764-EliteKiriona.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22764" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22765-EliteKaiona.xml b/data/templates/npc/monster/22765-EliteKaiona.xml
index 1cfd31974..1b94a2c22 100644
--- a/data/templates/npc/monster/22765-EliteKaiona.xml
+++ b/data/templates/npc/monster/22765-EliteKaiona.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22765" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22768-TantaLizardmanScout.xml b/data/templates/npc/monster/22768-TantaLizardmanScout.xml
index ffb09b3fe..11b09eec1 100644
--- a/data/templates/npc/monster/22768-TantaLizardmanScout.xml
+++ b/data/templates/npc/monster/22768-TantaLizardmanScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22768" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22769-TantaLizardmanWarrior.xml b/data/templates/npc/monster/22769-TantaLizardmanWarrior.xml
index 43853d6a1..0cf0086bc 100644
--- a/data/templates/npc/monster/22769-TantaLizardmanWarrior.xml
+++ b/data/templates/npc/monster/22769-TantaLizardmanWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22769" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22770-TantaLizardmanSoldier.xml b/data/templates/npc/monster/22770-TantaLizardmanSoldier.xml
index 30cb6e6d5..ceeda6fbc 100644
--- a/data/templates/npc/monster/22770-TantaLizardmanSoldier.xml
+++ b/data/templates/npc/monster/22770-TantaLizardmanSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22770" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22771-TantaLizardmanBerserker.xml b/data/templates/npc/monster/22771-TantaLizardmanBerserker.xml
index bdc747194..12dcc4355 100644
--- a/data/templates/npc/monster/22771-TantaLizardmanBerserker.xml
+++ b/data/templates/npc/monster/22771-TantaLizardmanBerserker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22771" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22772-TantaLizardmanArcher.xml b/data/templates/npc/monster/22772-TantaLizardmanArcher.xml
index bf991a1c4..2279954b8 100644
--- a/data/templates/npc/monster/22772-TantaLizardmanArcher.xml
+++ b/data/templates/npc/monster/22772-TantaLizardmanArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22772" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22773-TantaLizardmanMagician.xml b/data/templates/npc/monster/22773-TantaLizardmanMagician.xml
index 01f7bf63b..09f8937c9 100644
--- a/data/templates/npc/monster/22773-TantaLizardmanMagician.xml
+++ b/data/templates/npc/monster/22773-TantaLizardmanMagician.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22773" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22774-TantaLizardmanSummoner.xml b/data/templates/npc/monster/22774-TantaLizardmanSummoner.xml
index abc10f0bf..30e58c5d6 100644
--- a/data/templates/npc/monster/22774-TantaLizardmanSummoner.xml
+++ b/data/templates/npc/monster/22774-TantaLizardmanSummoner.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22774" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22775-SelMahumDrillSergeant.xml b/data/templates/npc/monster/22775-SelMahumDrillSergeant.xml
index 4229cd490..ba93db851 100644
--- a/data/templates/npc/monster/22775-SelMahumDrillSergeant.xml
+++ b/data/templates/npc/monster/22775-SelMahumDrillSergeant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22775" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22776-SelMahumTrainingOfficer.xml b/data/templates/npc/monster/22776-SelMahumTrainingOfficer.xml
index 65358e0ff..e7a074bd0 100644
--- a/data/templates/npc/monster/22776-SelMahumTrainingOfficer.xml
+++ b/data/templates/npc/monster/22776-SelMahumTrainingOfficer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22776" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22777-SelMahumDrillSergeant.xml b/data/templates/npc/monster/22777-SelMahumDrillSergeant.xml
index 95a065691..1ccb25e37 100644
--- a/data/templates/npc/monster/22777-SelMahumDrillSergeant.xml
+++ b/data/templates/npc/monster/22777-SelMahumDrillSergeant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22777" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22778-SelMahumDrillSergeant.xml b/data/templates/npc/monster/22778-SelMahumDrillSergeant.xml
index 10c7153f6..005d9eef0 100644
--- a/data/templates/npc/monster/22778-SelMahumDrillSergeant.xml
+++ b/data/templates/npc/monster/22778-SelMahumDrillSergeant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22778" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22779-SelMahumEscortGuard.xml b/data/templates/npc/monster/22779-SelMahumEscortGuard.xml
index 57a85cf37..741a91aad 100644
--- a/data/templates/npc/monster/22779-SelMahumEscortGuard.xml
+++ b/data/templates/npc/monster/22779-SelMahumEscortGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22779" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22780-SelMahumRecruit.xml b/data/templates/npc/monster/22780-SelMahumRecruit.xml
index 2f7c6b165..fc2d30e2a 100644
--- a/data/templates/npc/monster/22780-SelMahumRecruit.xml
+++ b/data/templates/npc/monster/22780-SelMahumRecruit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22780" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22781-SelMahumSoldier.xml b/data/templates/npc/monster/22781-SelMahumSoldier.xml
index 77c50601b..d374e6b9e 100644
--- a/data/templates/npc/monster/22781-SelMahumSoldier.xml
+++ b/data/templates/npc/monster/22781-SelMahumSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22781" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22782-SelMahumRecruit.xml b/data/templates/npc/monster/22782-SelMahumRecruit.xml
index c3ede5581..701744e3b 100644
--- a/data/templates/npc/monster/22782-SelMahumRecruit.xml
+++ b/data/templates/npc/monster/22782-SelMahumRecruit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22782" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22783-SelMahumSoldier.xml b/data/templates/npc/monster/22783-SelMahumSoldier.xml
index 67336d45c..492b23421 100644
--- a/data/templates/npc/monster/22783-SelMahumSoldier.xml
+++ b/data/templates/npc/monster/22783-SelMahumSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22783" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22784-SelMahumRecruit.xml b/data/templates/npc/monster/22784-SelMahumRecruit.xml
index 7b357ccd0..63f64ae34 100644
--- a/data/templates/npc/monster/22784-SelMahumRecruit.xml
+++ b/data/templates/npc/monster/22784-SelMahumRecruit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22784" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22785-SelMahumSoldier.xml b/data/templates/npc/monster/22785-SelMahumSoldier.xml
index d975dc5af..666871766 100644
--- a/data/templates/npc/monster/22785-SelMahumSoldier.xml
+++ b/data/templates/npc/monster/22785-SelMahumSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22785" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22786-SelMahumSquadLeader.xml b/data/templates/npc/monster/22786-SelMahumSquadLeader.xml
index 58a164cfe..c00800d68 100644
--- a/data/templates/npc/monster/22786-SelMahumSquadLeader.xml
+++ b/data/templates/npc/monster/22786-SelMahumSquadLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22786" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22787-SelMahumSquadLeader.xml b/data/templates/npc/monster/22787-SelMahumSquadLeader.xml
index 5948ab754..327092b2c 100644
--- a/data/templates/npc/monster/22787-SelMahumSquadLeader.xml
+++ b/data/templates/npc/monster/22787-SelMahumSquadLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22787" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22788-SelMahumSquadLeader.xml b/data/templates/npc/monster/22788-SelMahumSquadLeader.xml
index c6e228e7e..fffe323e1 100644
--- a/data/templates/npc/monster/22788-SelMahumSquadLeader.xml
+++ b/data/templates/npc/monster/22788-SelMahumSquadLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22788" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22789-GuideSolina.xml b/data/templates/npc/monster/22789-GuideSolina.xml
index 702d6a776..b94778521 100644
--- a/data/templates/npc/monster/22789-GuideSolina.xml
+++ b/data/templates/npc/monster/22789-GuideSolina.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22789" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22790-SeekerSolina.xml b/data/templates/npc/monster/22790-SeekerSolina.xml
index 433547bd4..0d542155f 100644
--- a/data/templates/npc/monster/22790-SeekerSolina.xml
+++ b/data/templates/npc/monster/22790-SeekerSolina.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22790" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22791-SaviorSolina.xml b/data/templates/npc/monster/22791-SaviorSolina.xml
index 10a07d765..d1f722d57 100644
--- a/data/templates/npc/monster/22791-SaviorSolina.xml
+++ b/data/templates/npc/monster/22791-SaviorSolina.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22791" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22792-DiscipleSolina.xml b/data/templates/npc/monster/22792-DiscipleSolina.xml
index 36335098c..84e639707 100644
--- a/data/templates/npc/monster/22792-DiscipleSolina.xml
+++ b/data/templates/npc/monster/22792-DiscipleSolina.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22792" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22793-AsceticSolina.xml b/data/templates/npc/monster/22793-AsceticSolina.xml
index 441ad9d06..73c6371fd 100644
--- a/data/templates/npc/monster/22793-AsceticSolina.xml
+++ b/data/templates/npc/monster/22793-AsceticSolina.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22793" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22794-DivinityJudge.xml b/data/templates/npc/monster/22794-DivinityJudge.xml
index 812b84ad6..a460d8854 100644
--- a/data/templates/npc/monster/22794-DivinityJudge.xml
+++ b/data/templates/npc/monster/22794-DivinityJudge.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22794" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22795-DivinityManager.xml b/data/templates/npc/monster/22795-DivinityManager.xml
index 81fdb1f5e..a4d9ed8f2 100644
--- a/data/templates/npc/monster/22795-DivinityManager.xml
+++ b/data/templates/npc/monster/22795-DivinityManager.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22795" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22796-DivinitySupervisor.xml b/data/templates/npc/monster/22796-DivinitySupervisor.xml
index 2e8b0bcfa..b0e455d03 100644
--- a/data/templates/npc/monster/22796-DivinitySupervisor.xml
+++ b/data/templates/npc/monster/22796-DivinitySupervisor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22796" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22797-DivinityWorshipper.xml b/data/templates/npc/monster/22797-DivinityWorshipper.xml
index effc394b3..8ace3ac46 100644
--- a/data/templates/npc/monster/22797-DivinityWorshipper.xml
+++ b/data/templates/npc/monster/22797-DivinityWorshipper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22797" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22798-DivinityProtector.xml b/data/templates/npc/monster/22798-DivinityProtector.xml
index 1129bbd1a..6d7f27963 100644
--- a/data/templates/npc/monster/22798-DivinityProtector.xml
+++ b/data/templates/npc/monster/22798-DivinityProtector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22798" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22799-DivinityFighter.xml b/data/templates/npc/monster/22799-DivinityFighter.xml
index 682781646..e183aa32e 100644
--- a/data/templates/npc/monster/22799-DivinityFighter.xml
+++ b/data/templates/npc/monster/22799-DivinityFighter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22799" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22800-DivinityMagus.xml b/data/templates/npc/monster/22800-DivinityMagus.xml
index 0b03932eb..9917516cd 100644
--- a/data/templates/npc/monster/22800-DivinityMagus.xml
+++ b/data/templates/npc/monster/22800-DivinityMagus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22800" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22801-CruelPincerGolem.xml b/data/templates/npc/monster/22801-CruelPincerGolem.xml
index e2aa4224b..7c7a5a569 100644
--- a/data/templates/npc/monster/22801-CruelPincerGolem.xml
+++ b/data/templates/npc/monster/22801-CruelPincerGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22801" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22802-CruelPincerGolem.xml b/data/templates/npc/monster/22802-CruelPincerGolem.xml
index 66cb1976a..96ee28a76 100644
--- a/data/templates/npc/monster/22802-CruelPincerGolem.xml
+++ b/data/templates/npc/monster/22802-CruelPincerGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22802" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22803-CruelPincerGolem.xml b/data/templates/npc/monster/22803-CruelPincerGolem.xml
index f19b09cbc..4fe80915f 100644
--- a/data/templates/npc/monster/22803-CruelPincerGolem.xml
+++ b/data/templates/npc/monster/22803-CruelPincerGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22803" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22804-DrillGolemOfTerror.xml b/data/templates/npc/monster/22804-DrillGolemOfTerror.xml
index 37d936293..87756c27d 100644
--- a/data/templates/npc/monster/22804-DrillGolemOfTerror.xml
+++ b/data/templates/npc/monster/22804-DrillGolemOfTerror.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22804" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22805-DrillGolemOfTerror.xml b/data/templates/npc/monster/22805-DrillGolemOfTerror.xml
index 70f70a444..6a46fac63 100644
--- a/data/templates/npc/monster/22805-DrillGolemOfTerror.xml
+++ b/data/templates/npc/monster/22805-DrillGolemOfTerror.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22805" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22806-DrillGolemOfTerror.xml b/data/templates/npc/monster/22806-DrillGolemOfTerror.xml
index d44ebdbe2..4ec93ac77 100644
--- a/data/templates/npc/monster/22806-DrillGolemOfTerror.xml
+++ b/data/templates/npc/monster/22806-DrillGolemOfTerror.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22806" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22807-ScoutTypeGolemNo28.xml b/data/templates/npc/monster/22807-ScoutTypeGolemNo28.xml
index 231c275e8..2f0481c62 100644
--- a/data/templates/npc/monster/22807-ScoutTypeGolemNo28.xml
+++ b/data/templates/npc/monster/22807-ScoutTypeGolemNo28.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22807" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22808-ScoutTypeGolemNo2.xml b/data/templates/npc/monster/22808-ScoutTypeGolemNo2.xml
index 7d5bea1d4..4e606e168 100644
--- a/data/templates/npc/monster/22808-ScoutTypeGolemNo2.xml
+++ b/data/templates/npc/monster/22808-ScoutTypeGolemNo2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22808" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22809-GuardGolem.xml b/data/templates/npc/monster/22809-GuardGolem.xml
index cb111e885..8b9cff138 100644
--- a/data/templates/npc/monster/22809-GuardGolem.xml
+++ b/data/templates/npc/monster/22809-GuardGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22809" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22810-MicroScoutGolem.xml b/data/templates/npc/monster/22810-MicroScoutGolem.xml
index 4ee67f563..2e0e998c4 100644
--- a/data/templates/npc/monster/22810-MicroScoutGolem.xml
+++ b/data/templates/npc/monster/22810-MicroScoutGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22810" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22811-GreatChaosGolem.xml b/data/templates/npc/monster/22811-GreatChaosGolem.xml
index fee57fd70..c0a29b6a5 100644
--- a/data/templates/npc/monster/22811-GreatChaosGolem.xml
+++ b/data/templates/npc/monster/22811-GreatChaosGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22811" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/22812-BoomGolem.xml b/data/templates/npc/monster/22812-BoomGolem.xml
index 0130e41f6..cb791935b 100644
--- a/data/templates/npc/monster/22812-BoomGolem.xml
+++ b/data/templates/npc/monster/22812-BoomGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="22812" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25002-GuardOfKutus.xml b/data/templates/npc/monster/25002-GuardOfKutus.xml
index 2c828c26c..d8ae9f504 100644
--- a/data/templates/npc/monster/25002-GuardOfKutus.xml
+++ b/data/templates/npc/monster/25002-GuardOfKutus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25002" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25003-PawnOfKutus.xml b/data/templates/npc/monster/25003-PawnOfKutus.xml
index 8267287ad..efbc1c7b4 100644
--- a/data/templates/npc/monster/25003-PawnOfKutus.xml
+++ b/data/templates/npc/monster/25003-PawnOfKutus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25003" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25005-TurekMercenaryArcher.xml b/data/templates/npc/monster/25005-TurekMercenaryArcher.xml
index 8311dec0a..18c52eab1 100644
--- a/data/templates/npc/monster/25005-TurekMercenaryArcher.xml
+++ b/data/templates/npc/monster/25005-TurekMercenaryArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25005" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25006-TurekMercenaryWarrior.xml b/data/templates/npc/monster/25006-TurekMercenaryWarrior.xml
index bbe735099..3336946e1 100644
--- a/data/templates/npc/monster/25006-TurekMercenaryWarrior.xml
+++ b/data/templates/npc/monster/25006-TurekMercenaryWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25006" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25008-CletuSRetainer.xml b/data/templates/npc/monster/25008-CletuSRetainer.xml
index e4653aeb6..e5b63e893 100644
--- a/data/templates/npc/monster/25008-CletuSRetainer.xml
+++ b/data/templates/npc/monster/25008-CletuSRetainer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25008" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25009-CletuSPawn.xml b/data/templates/npc/monster/25009-CletuSPawn.xml
index 53c2a31fa..49367cde1 100644
--- a/data/templates/npc/monster/25009-CletuSPawn.xml
+++ b/data/templates/npc/monster/25009-CletuSPawn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25009" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25011-GuardOfThieles.xml b/data/templates/npc/monster/25011-GuardOfThieles.xml
index f994cafae..6a819dca5 100644
--- a/data/templates/npc/monster/25011-GuardOfThieles.xml
+++ b/data/templates/npc/monster/25011-GuardOfThieles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25011" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25012-FollowerOfThieles.xml b/data/templates/npc/monster/25012-FollowerOfThieles.xml
index 79ab9518a..b8b43a664 100644
--- a/data/templates/npc/monster/25012-FollowerOfThieles.xml
+++ b/data/templates/npc/monster/25012-FollowerOfThieles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25012" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25014-GhostOfPeasant.xml b/data/templates/npc/monster/25014-GhostOfPeasant.xml
index 9bccbfcdf..4cb0fbfaf 100644
--- a/data/templates/npc/monster/25014-GhostOfPeasant.xml
+++ b/data/templates/npc/monster/25014-GhostOfPeasant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25014" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25015-GhostOfPeasant.xml b/data/templates/npc/monster/25015-GhostOfPeasant.xml
index d32cba1f5..1a9bf5737 100644
--- a/data/templates/npc/monster/25015-GhostOfPeasant.xml
+++ b/data/templates/npc/monster/25015-GhostOfPeasant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25015" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25017-EscortOfThe3rdGuardian.xml b/data/templates/npc/monster/25017-EscortOfThe3rdGuardian.xml
index 84102dfbe..74fc0da03 100644
--- a/data/templates/npc/monster/25017-EscortOfThe3rdGuardian.xml
+++ b/data/templates/npc/monster/25017-EscortOfThe3rdGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25017" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25018-SupportOfThe3rdGuardian.xml b/data/templates/npc/monster/25018-SupportOfThe3rdGuardian.xml
index ae2867809..a3bf14f86 100644
--- a/data/templates/npc/monster/25018-SupportOfThe3rdGuardian.xml
+++ b/data/templates/npc/monster/25018-SupportOfThe3rdGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25018" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25021-PastuSSilhouette.xml b/data/templates/npc/monster/25021-PastuSSilhouette.xml
index b99940be6..45b4a0852 100644
--- a/data/templates/npc/monster/25021-PastuSSilhouette.xml
+++ b/data/templates/npc/monster/25021-PastuSSilhouette.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25021" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25022-PastuSShadow.xml b/data/templates/npc/monster/25022-PastuSShadow.xml
index 6d0357431..59bc24d3b 100644
--- a/data/templates/npc/monster/25022-PastuSShadow.xml
+++ b/data/templates/npc/monster/25022-PastuSShadow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25022" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25024-JerunaSGuardCaptain.xml b/data/templates/npc/monster/25024-JerunaSGuardCaptain.xml
index 879e793a9..245975e14 100644
--- a/data/templates/npc/monster/25024-JerunaSGuardCaptain.xml
+++ b/data/templates/npc/monster/25024-JerunaSGuardCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25024" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25025-JerunaSGuard.xml b/data/templates/npc/monster/25025-JerunaSGuard.xml
index 1ca9f89c6..3af3a2bb5 100644
--- a/data/templates/npc/monster/25025-JerunaSGuard.xml
+++ b/data/templates/npc/monster/25025-JerunaSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25025" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25027-KatuVanMarksman.xml b/data/templates/npc/monster/25027-KatuVanMarksman.xml
index 7d5d8fa8a..bd9fa38d7 100644
--- a/data/templates/npc/monster/25027-KatuVanMarksman.xml
+++ b/data/templates/npc/monster/25027-KatuVanMarksman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25027" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25028-KatuVanRaider.xml b/data/templates/npc/monster/25028-KatuVanRaider.xml
index a9fc8fef2..b7c0e2ab6 100644
--- a/data/templates/npc/monster/25028-KatuVanRaider.xml
+++ b/data/templates/npc/monster/25028-KatuVanRaider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25028" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25030-AtraibanSTopDisciple.xml b/data/templates/npc/monster/25030-AtraibanSTopDisciple.xml
index ca45e04a0..c91adee54 100644
--- a/data/templates/npc/monster/25030-AtraibanSTopDisciple.xml
+++ b/data/templates/npc/monster/25030-AtraibanSTopDisciple.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25030" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25031-AtraibanSDisciple.xml b/data/templates/npc/monster/25031-AtraibanSDisciple.xml
index d84b8072b..e3f52f5b0 100644
--- a/data/templates/npc/monster/25031-AtraibanSDisciple.xml
+++ b/data/templates/npc/monster/25031-AtraibanSDisciple.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25031" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25033-MillenuGuardShaman.xml b/data/templates/npc/monster/25033-MillenuGuardShaman.xml
index d2feb3199..20cdbe1b4 100644
--- a/data/templates/npc/monster/25033-MillenuGuardShaman.xml
+++ b/data/templates/npc/monster/25033-MillenuGuardShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25033" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25034-MellenuGuardWarrior.xml b/data/templates/npc/monster/25034-MellenuGuardWarrior.xml
index 70564f2bb..fdc36b093 100644
--- a/data/templates/npc/monster/25034-MellenuGuardWarrior.xml
+++ b/data/templates/npc/monster/25034-MellenuGuardWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25034" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25036-CabrioCaptor.xml b/data/templates/npc/monster/25036-CabrioCaptor.xml
index e48e90d1e..f5ae47663 100644
--- a/data/templates/npc/monster/25036-CabrioCaptor.xml
+++ b/data/templates/npc/monster/25036-CabrioCaptor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25036" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25037-CabrioBlader.xml b/data/templates/npc/monster/25037-CabrioBlader.xml
index 8c021fff2..3b7fa1b9e 100644
--- a/data/templates/npc/monster/25037-CabrioBlader.xml
+++ b/data/templates/npc/monster/25037-CabrioBlader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25037" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25039-TirakSGuard.xml b/data/templates/npc/monster/25039-TirakSGuard.xml
index 5e52c73e5..50af03cb6 100644
--- a/data/templates/npc/monster/25039-TirakSGuard.xml
+++ b/data/templates/npc/monster/25039-TirakSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25039" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25040-TirakSKnight.xml b/data/templates/npc/monster/25040-TirakSKnight.xml
index 07f119b17..ce6098df8 100644
--- a/data/templates/npc/monster/25040-TirakSKnight.xml
+++ b/data/templates/npc/monster/25040-TirakSKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25040" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25042-RemmelSArcher.xml b/data/templates/npc/monster/25042-RemmelSArcher.xml
index 62f3d96d5..09a1fe84f 100644
--- a/data/templates/npc/monster/25042-RemmelSArcher.xml
+++ b/data/templates/npc/monster/25042-RemmelSArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25042" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25043-RemmelSGuard.xml b/data/templates/npc/monster/25043-RemmelSGuard.xml
index 97f3119b7..82a562ba6 100644
--- a/data/templates/npc/monster/25043-RemmelSGuard.xml
+++ b/data/templates/npc/monster/25043-RemmelSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25043" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25045-DarkMageSOfBarion.xml b/data/templates/npc/monster/25045-DarkMageSOfBarion.xml
index 6520169de..1f298e60b 100644
--- a/data/templates/npc/monster/25045-DarkMageSOfBarion.xml
+++ b/data/templates/npc/monster/25045-DarkMageSOfBarion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25045" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25046-BarionSGrunt.xml b/data/templates/npc/monster/25046-BarionSGrunt.xml
index c20179e8b..4d5e0a894 100644
--- a/data/templates/npc/monster/25046-BarionSGrunt.xml
+++ b/data/templates/npc/monster/25046-BarionSGrunt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25046" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25048-KarteSChiefKnight.xml b/data/templates/npc/monster/25048-KarteSChiefKnight.xml
index acce74791..86a24fc53 100644
--- a/data/templates/npc/monster/25048-KarteSChiefKnight.xml
+++ b/data/templates/npc/monster/25048-KarteSChiefKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25048" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25049-KarteSRoyalGuard.xml b/data/templates/npc/monster/25049-KarteSRoyalGuard.xml
index d4c8fd7a7..dc22eb4e0 100644
--- a/data/templates/npc/monster/25049-KarteSRoyalGuard.xml
+++ b/data/templates/npc/monster/25049-KarteSRoyalGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25049" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25052-PriestessOfRahha.xml b/data/templates/npc/monster/25052-PriestessOfRahha.xml
index 2b91d329d..77b850336 100644
--- a/data/templates/npc/monster/25052-PriestessOfRahha.xml
+++ b/data/templates/npc/monster/25052-PriestessOfRahha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25052" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25053-FanaticsOfRahha.xml b/data/templates/npc/monster/25053-FanaticsOfRahha.xml
index 0fbfcecf0..534afc841 100644
--- a/data/templates/npc/monster/25053-FanaticsOfRahha.xml
+++ b/data/templates/npc/monster/25053-FanaticsOfRahha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25053" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25055-Taliadon.xml b/data/templates/npc/monster/25055-Taliadon.xml
index 05d7f2753..54e139f83 100644
--- a/data/templates/npc/monster/25055-Taliadon.xml
+++ b/data/templates/npc/monster/25055-Taliadon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25055" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25056-Vemsk.xml b/data/templates/npc/monster/25056-Vemsk.xml
index ea2b422df..609be2500 100644
--- a/data/templates/npc/monster/25056-Vemsk.xml
+++ b/data/templates/npc/monster/25056-Vemsk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25056" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25058-BiconneSShooter.xml b/data/templates/npc/monster/25058-BiconneSShooter.xml
index 6c6ad87d7..f9d89b942 100644
--- a/data/templates/npc/monster/25058-BiconneSShooter.xml
+++ b/data/templates/npc/monster/25058-BiconneSShooter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25058" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25059-BiconneSWarrior.xml b/data/templates/npc/monster/25059-BiconneSWarrior.xml
index c990ca72c..3c9d648b6 100644
--- a/data/templates/npc/monster/25059-BiconneSWarrior.xml
+++ b/data/templates/npc/monster/25059-BiconneSWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25059" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25061-KaelSBead.xml b/data/templates/npc/monster/25061-KaelSBead.xml
index e8ec8ab27..8cdd592dd 100644
--- a/data/templates/npc/monster/25061-KaelSBead.xml
+++ b/data/templates/npc/monster/25061-KaelSBead.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25061" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25062-KaelSEscort.xml b/data/templates/npc/monster/25062-KaelSEscort.xml
index 922f6e535..249c934cb 100644
--- a/data/templates/npc/monster/25062-KaelSEscort.xml
+++ b/data/templates/npc/monster/25062-KaelSEscort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25062" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25065-TerukSEscort.xml b/data/templates/npc/monster/25065-TerukSEscort.xml
index a5f4cf8cf..371ebd9c4 100644
--- a/data/templates/npc/monster/25065-TerukSEscort.xml
+++ b/data/templates/npc/monster/25065-TerukSEscort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25065" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25066-TerukSKnight.xml b/data/templates/npc/monster/25066-TerukSKnight.xml
index 40657df15..d32853188 100644
--- a/data/templates/npc/monster/25066-TerukSKnight.xml
+++ b/data/templates/npc/monster/25066-TerukSKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25066" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25068-ShakaSShooter.xml b/data/templates/npc/monster/25068-ShakaSShooter.xml
index b0623c47e..56f799314 100644
--- a/data/templates/npc/monster/25068-ShakaSShooter.xml
+++ b/data/templates/npc/monster/25068-ShakaSShooter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25068" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25069-ShakaSFollower.xml b/data/templates/npc/monster/25069-ShakaSFollower.xml
index a50fed81e..a323a313c 100644
--- a/data/templates/npc/monster/25069-ShakaSFollower.xml
+++ b/data/templates/npc/monster/25069-ShakaSFollower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25069" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25071-RuellSWind.xml b/data/templates/npc/monster/25071-RuellSWind.xml
index 81066b51d..ab21fbe84 100644
--- a/data/templates/npc/monster/25071-RuellSWind.xml
+++ b/data/templates/npc/monster/25071-RuellSWind.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25071" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25072-RuellSUnicorn.xml b/data/templates/npc/monster/25072-RuellSUnicorn.xml
index df2f91d5b..511ee3716 100644
--- a/data/templates/npc/monster/25072-RuellSUnicorn.xml
+++ b/data/templates/npc/monster/25072-RuellSUnicorn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25072" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25074-RudeltoSBanshee.xml b/data/templates/npc/monster/25074-RudeltoSBanshee.xml
index f74d0b83b..e8d8d9905 100644
--- a/data/templates/npc/monster/25074-RudeltoSBanshee.xml
+++ b/data/templates/npc/monster/25074-RudeltoSBanshee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25074" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25075-RudeltoSDreVanul.xml b/data/templates/npc/monster/25075-RudeltoSDreVanul.xml
index e7961dfd7..c35f70fbe 100644
--- a/data/templates/npc/monster/25075-RudeltoSDreVanul.xml
+++ b/data/templates/npc/monster/25075-RudeltoSDreVanul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25075" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25077-CaptainDogun.xml b/data/templates/npc/monster/25077-CaptainDogun.xml
index 8a8312dca..c58371e3d 100644
--- a/data/templates/npc/monster/25077-CaptainDogun.xml
+++ b/data/templates/npc/monster/25077-CaptainDogun.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25077" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25078-PrincessGuard.xml b/data/templates/npc/monster/25078-PrincessGuard.xml
index 086297059..f1d0f5c5e 100644
--- a/data/templates/npc/monster/25078-PrincessGuard.xml
+++ b/data/templates/npc/monster/25078-PrincessGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25078" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25080-Mercenary.xml b/data/templates/npc/monster/25080-Mercenary.xml
index d04ab4157..4060c3b5f 100644
--- a/data/templates/npc/monster/25080-Mercenary.xml
+++ b/data/templates/npc/monster/25080-Mercenary.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25080" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25081-CatSEyeBandit.xml b/data/templates/npc/monster/25081-CatSEyeBandit.xml
index 6c83ece4f..6b285e7a7 100644
--- a/data/templates/npc/monster/25081-CatSEyeBandit.xml
+++ b/data/templates/npc/monster/25081-CatSEyeBandit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25081" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25083-CatGang.xml b/data/templates/npc/monster/25083-CatGang.xml
index 0e2fcfec2..a3be43f63 100644
--- a/data/templates/npc/monster/25083-CatGang.xml
+++ b/data/templates/npc/monster/25083-CatGang.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25083" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25084-CatGang.xml b/data/templates/npc/monster/25084-CatGang.xml
index b0da4e210..190f82733 100644
--- a/data/templates/npc/monster/25084-CatGang.xml
+++ b/data/templates/npc/monster/25084-CatGang.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25084" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25086-TimakOrcRanger.xml b/data/templates/npc/monster/25086-TimakOrcRanger.xml
index ceb9422c1..ebb982497 100644
--- a/data/templates/npc/monster/25086-TimakOrcRanger.xml
+++ b/data/templates/npc/monster/25086-TimakOrcRanger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25086" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25087-TimakOrcRanger.xml b/data/templates/npc/monster/25087-TimakOrcRanger.xml
index d7f969bff..51d363b60 100644
--- a/data/templates/npc/monster/25087-TimakOrcRanger.xml
+++ b/data/templates/npc/monster/25087-TimakOrcRanger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25087" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25090-SoullessWolf.xml b/data/templates/npc/monster/25090-SoullessWolf.xml
index 090a1b4f0..898dbacb9 100644
--- a/data/templates/npc/monster/25090-SoullessWolf.xml
+++ b/data/templates/npc/monster/25090-SoullessWolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25090" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25091-SoullessBear.xml b/data/templates/npc/monster/25091-SoullessBear.xml
index 770145e9f..fc4d7b45b 100644
--- a/data/templates/npc/monster/25091-SoullessBear.xml
+++ b/data/templates/npc/monster/25091-SoullessBear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25091" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25093-KorimChiefGuardKaywon.xml b/data/templates/npc/monster/25093-KorimChiefGuardKaywon.xml
index 361a442cf..1ed606cad 100644
--- a/data/templates/npc/monster/25093-KorimChiefGuardKaywon.xml
+++ b/data/templates/npc/monster/25093-KorimChiefGuardKaywon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25093" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25094-KorimGuards.xml b/data/templates/npc/monster/25094-KorimGuards.xml
index 5f5bf6de8..5a15ed3d1 100644
--- a/data/templates/npc/monster/25094-KorimGuards.xml
+++ b/data/templates/npc/monster/25094-KorimGuards.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25094" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25096-RenoaSElpy.xml b/data/templates/npc/monster/25096-RenoaSElpy.xml
index 0fa25f1c6..885cd8f06 100644
--- a/data/templates/npc/monster/25096-RenoaSElpy.xml
+++ b/data/templates/npc/monster/25096-RenoaSElpy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25096" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25097-RenoaSHog.xml b/data/templates/npc/monster/25097-RenoaSHog.xml
index 52ef45da8..36932bc03 100644
--- a/data/templates/npc/monster/25097-RenoaSHog.xml
+++ b/data/templates/npc/monster/25097-RenoaSHog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25097" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25100-SpiritOfSeaOfSpores.xml b/data/templates/npc/monster/25100-SpiritOfSeaOfSpores.xml
index cf3ad89c7..ede877d78 100644
--- a/data/templates/npc/monster/25100-SpiritOfSeaOfSpores.xml
+++ b/data/templates/npc/monster/25100-SpiritOfSeaOfSpores.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25100" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25101-FighterOfSeaOfSpores.xml b/data/templates/npc/monster/25101-FighterOfSeaOfSpores.xml
index b75141833..997332d19 100644
--- a/data/templates/npc/monster/25101-FighterOfSeaOfSpores.xml
+++ b/data/templates/npc/monster/25101-FighterOfSeaOfSpores.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25101" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25104-IsirrSGuard.xml b/data/templates/npc/monster/25104-IsirrSGuard.xml
index d37eab11b..765941d07 100644
--- a/data/templates/npc/monster/25104-IsirrSGuard.xml
+++ b/data/templates/npc/monster/25104-IsirrSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25104" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25105-IsirrSGuards.xml b/data/templates/npc/monster/25105-IsirrSGuards.xml
index dcc76dd88..9ed3284c5 100644
--- a/data/templates/npc/monster/25105-IsirrSGuards.xml
+++ b/data/templates/npc/monster/25105-IsirrSGuards.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25105" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25107-LidiaSArcher.xml b/data/templates/npc/monster/25107-LidiaSArcher.xml
index 1a5e7c82b..772f91be7 100644
--- a/data/templates/npc/monster/25107-LidiaSArcher.xml
+++ b/data/templates/npc/monster/25107-LidiaSArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25107" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25108-LidiaSFighter.xml b/data/templates/npc/monster/25108-LidiaSFighter.xml
index bdac942ce..8aad3e68c 100644
--- a/data/templates/npc/monster/25108-LidiaSFighter.xml
+++ b/data/templates/npc/monster/25108-LidiaSFighter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25108" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25110-CloeSServitor.xml b/data/templates/npc/monster/25110-CloeSServitor.xml
index 55245562b..e6942bd17 100644
--- a/data/templates/npc/monster/25110-CloeSServitor.xml
+++ b/data/templates/npc/monster/25110-CloeSServitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25110" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25111-CloeSServitor.xml b/data/templates/npc/monster/25111-CloeSServitor.xml
index 00a2019a7..31b3f87f0 100644
--- a/data/templates/npc/monster/25111-CloeSServitor.xml
+++ b/data/templates/npc/monster/25111-CloeSServitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25111" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25113-MeanaSMaid.xml b/data/templates/npc/monster/25113-MeanaSMaid.xml
index 3c98e2ca0..199592319 100644
--- a/data/templates/npc/monster/25113-MeanaSMaid.xml
+++ b/data/templates/npc/monster/25113-MeanaSMaid.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25113" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25114-MeanaSGuardDoll.xml b/data/templates/npc/monster/25114-MeanaSGuardDoll.xml
index a13337624..1ccdbbc59 100644
--- a/data/templates/npc/monster/25114-MeanaSGuardDoll.xml
+++ b/data/templates/npc/monster/25114-MeanaSGuardDoll.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25114" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25116-IcarusSample2.xml b/data/templates/npc/monster/25116-IcarusSample2.xml
index 4a7f4747d..3d835ba90 100644
--- a/data/templates/npc/monster/25116-IcarusSample2.xml
+++ b/data/templates/npc/monster/25116-IcarusSample2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25116" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25117-IcarusSample3.xml b/data/templates/npc/monster/25117-IcarusSample3.xml
index 5fa8d2e51..77b3f5937 100644
--- a/data/templates/npc/monster/25117-IcarusSample3.xml
+++ b/data/templates/npc/monster/25117-IcarusSample3.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25117" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25120-BerunSOfficer.xml b/data/templates/npc/monster/25120-BerunSOfficer.xml
index 4fffeef03..9e2516d1d 100644
--- a/data/templates/npc/monster/25120-BerunSOfficer.xml
+++ b/data/templates/npc/monster/25120-BerunSOfficer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25120" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25121-BerunSPrattler.xml b/data/templates/npc/monster/25121-BerunSPrattler.xml
index 716c663ea..7e3d88677 100644
--- a/data/templates/npc/monster/25121-BerunSPrattler.xml
+++ b/data/templates/npc/monster/25121-BerunSPrattler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25121" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25123-LeoSServant.xml b/data/templates/npc/monster/25123-LeoSServant.xml
index 66571ab03..f1ca6e3ad 100644
--- a/data/templates/npc/monster/25123-LeoSServant.xml
+++ b/data/templates/npc/monster/25123-LeoSServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25123" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25124-LeoSSteward.xml b/data/templates/npc/monster/25124-LeoSSteward.xml
index e8f241f5b..613115150 100644
--- a/data/templates/npc/monster/25124-LeoSSteward.xml
+++ b/data/templates/npc/monster/25124-LeoSSteward.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25124" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25129-VukuShaman.xml b/data/templates/npc/monster/25129-VukuShaman.xml
index 9a940862e..e0d451eda 100644
--- a/data/templates/npc/monster/25129-VukuShaman.xml
+++ b/data/templates/npc/monster/25129-VukuShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25129" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25130-GharmashSPetTrimden.xml b/data/templates/npc/monster/25130-GharmashSPetTrimden.xml
index 7461d264a..d0a7a1da2 100644
--- a/data/templates/npc/monster/25130-GharmashSPetTrimden.xml
+++ b/data/templates/npc/monster/25130-GharmashSPetTrimden.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25130" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25132-GatoSMarksman.xml b/data/templates/npc/monster/25132-GatoSMarksman.xml
index 3d9a7fbb2..84a6c6a3a 100644
--- a/data/templates/npc/monster/25132-GatoSMarksman.xml
+++ b/data/templates/npc/monster/25132-GatoSMarksman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25132" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25133-GatoSTroopLeader.xml b/data/templates/npc/monster/25133-GatoSTroopLeader.xml
index 4b5e8b905..f31a31911 100644
--- a/data/templates/npc/monster/25133-GatoSTroopLeader.xml
+++ b/data/templates/npc/monster/25133-GatoSTroopLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25133" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25135-TalkinSSeer.xml b/data/templates/npc/monster/25135-TalkinSSeer.xml
index fd268c028..eb5d4264a 100644
--- a/data/templates/npc/monster/25135-TalkinSSeer.xml
+++ b/data/templates/npc/monster/25135-TalkinSSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25135" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25136-TalkinSBodyguard.xml b/data/templates/npc/monster/25136-TalkinSBodyguard.xml
index 772ff6c84..f10fdd441 100644
--- a/data/templates/npc/monster/25136-TalkinSBodyguard.xml
+++ b/data/templates/npc/monster/25136-TalkinSBodyguard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25136" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25138-SoulDrinker.xml b/data/templates/npc/monster/25138-SoulDrinker.xml
index 6c51c4d54..ab2299b4d 100644
--- a/data/templates/npc/monster/25138-SoulDrinker.xml
+++ b/data/templates/npc/monster/25138-SoulDrinker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25138" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25139-SephiaSSalve.xml b/data/templates/npc/monster/25139-SephiaSSalve.xml
index f1efa1566..b222c6167 100644
--- a/data/templates/npc/monster/25139-SephiaSSalve.xml
+++ b/data/templates/npc/monster/25139-SephiaSSalve.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25139" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25141-HekatonCottus.xml b/data/templates/npc/monster/25141-HekatonCottus.xml
index 20b9d34d7..a88dd3e8e 100644
--- a/data/templates/npc/monster/25141-HekatonCottus.xml
+++ b/data/templates/npc/monster/25141-HekatonCottus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25141" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25142-HekatonChires.xml b/data/templates/npc/monster/25142-HekatonChires.xml
index da84dc0a3..f6addf1f8 100644
--- a/data/templates/npc/monster/25142-HekatonChires.xml
+++ b/data/templates/npc/monster/25142-HekatonChires.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25142" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25144-ShurielSOracle.xml b/data/templates/npc/monster/25144-ShurielSOracle.xml
index 08e82b071..04dac9e52 100644
--- a/data/templates/npc/monster/25144-ShurielSOracle.xml
+++ b/data/templates/npc/monster/25144-ShurielSOracle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25144" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25145-ShurielSPaladin.xml b/data/templates/npc/monster/25145-ShurielSPaladin.xml
index 038b4dd0f..48246a3f3 100644
--- a/data/templates/npc/monster/25145-ShurielSPaladin.xml
+++ b/data/templates/npc/monster/25145-ShurielSPaladin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25145" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25147-AssassinOfBifrons.xml b/data/templates/npc/monster/25147-AssassinOfBifrons.xml
index 6a36fc0d5..a271af24e 100644
--- a/data/templates/npc/monster/25147-AssassinOfBifrons.xml
+++ b/data/templates/npc/monster/25147-AssassinOfBifrons.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25147" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25148-ButcherOfBifrons.xml b/data/templates/npc/monster/25148-ButcherOfBifrons.xml
index 3e56d8358..67b895ea8 100644
--- a/data/templates/npc/monster/25148-ButcherOfBifrons.xml
+++ b/data/templates/npc/monster/25148-ButcherOfBifrons.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25148" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25150-EvilSpiritArcher.xml b/data/templates/npc/monster/25150-EvilSpiritArcher.xml
index 98941aed6..91e156867 100644
--- a/data/templates/npc/monster/25150-EvilSpiritArcher.xml
+++ b/data/templates/npc/monster/25150-EvilSpiritArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25150" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25151-EvilSpiritWarrior.xml b/data/templates/npc/monster/25151-EvilSpiritWarrior.xml
index 6fb546e4d..14a84da36 100644
--- a/data/templates/npc/monster/25151-EvilSpiritWarrior.xml
+++ b/data/templates/npc/monster/25151-EvilSpiritWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25151" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25153-ClawsOfShadar.xml b/data/templates/npc/monster/25153-ClawsOfShadar.xml
index 9c2cc63de..78efdfa41 100644
--- a/data/templates/npc/monster/25153-ClawsOfShadar.xml
+++ b/data/templates/npc/monster/25153-ClawsOfShadar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25153" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25154-WhipOfShadar.xml b/data/templates/npc/monster/25154-WhipOfShadar.xml
index 9c8c33a83..2eaceec6e 100644
--- a/data/templates/npc/monster/25154-WhipOfShadar.xml
+++ b/data/templates/npc/monster/25154-WhipOfShadar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25154" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25156-FanaticShaman.xml b/data/templates/npc/monster/25156-FanaticShaman.xml
index 8d52a44e3..696e2dafd 100644
--- a/data/templates/npc/monster/25156-FanaticShaman.xml
+++ b/data/templates/npc/monster/25156-FanaticShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25156" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25157-FanaticSoldier.xml b/data/templates/npc/monster/25157-FanaticSoldier.xml
index 30dc755bc..b36f9ef21 100644
--- a/data/templates/npc/monster/25157-FanaticSoldier.xml
+++ b/data/templates/npc/monster/25157-FanaticSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25157" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25160-RapiniTheUnicorn.xml b/data/templates/npc/monster/25160-RapiniTheUnicorn.xml
index 0d6fed7c9..cd4e2c1a8 100644
--- a/data/templates/npc/monster/25160-RapiniTheUnicorn.xml
+++ b/data/templates/npc/monster/25160-RapiniTheUnicorn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25160" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25161-RirifTheUnicorn.xml b/data/templates/npc/monster/25161-RirifTheUnicorn.xml
index 8c832049f..101e0841b 100644
--- a/data/templates/npc/monster/25161-RirifTheUnicorn.xml
+++ b/data/templates/npc/monster/25161-RirifTheUnicorn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25161" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25167-IkuntaiSServitor.xml b/data/templates/npc/monster/25167-IkuntaiSServitor.xml
index 79e4d9a2e..9f4d833c6 100644
--- a/data/templates/npc/monster/25167-IkuntaiSServitor.xml
+++ b/data/templates/npc/monster/25167-IkuntaiSServitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25167" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25168-PawnOfIkuntai.xml b/data/templates/npc/monster/25168-PawnOfIkuntai.xml
index 16d1ab93d..ff01d779c 100644
--- a/data/templates/npc/monster/25168-PawnOfIkuntai.xml
+++ b/data/templates/npc/monster/25168-PawnOfIkuntai.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25168" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25171-HellionSArchers.xml b/data/templates/npc/monster/25171-HellionSArchers.xml
index db2b4a064..6b83e59e2 100644
--- a/data/templates/npc/monster/25171-HellionSArchers.xml
+++ b/data/templates/npc/monster/25171-HellionSArchers.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25171" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25172-HellionSGuards.xml b/data/templates/npc/monster/25172-HellionSGuards.xml
index cfd67832a..80c292371 100644
--- a/data/templates/npc/monster/25172-HellionSGuards.xml
+++ b/data/templates/npc/monster/25172-HellionSGuards.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25172" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25174-KarutaSFollower.xml b/data/templates/npc/monster/25174-KarutaSFollower.xml
index 25ca8e62a..fe37aacd4 100644
--- a/data/templates/npc/monster/25174-KarutaSFollower.xml
+++ b/data/templates/npc/monster/25174-KarutaSFollower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25174" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25175-KarutaSInferiors.xml b/data/templates/npc/monster/25175-KarutaSInferiors.xml
index 7370f48c4..3607c8347 100644
--- a/data/templates/npc/monster/25175-KarutaSInferiors.xml
+++ b/data/templates/npc/monster/25175-KarutaSInferiors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25175" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25177-GuardianKnightOfBlackLily.xml b/data/templates/npc/monster/25177-GuardianKnightOfBlackLily.xml
index 944e60ba6..69ae17a23 100644
--- a/data/templates/npc/monster/25177-GuardianKnightOfBlackLily.xml
+++ b/data/templates/npc/monster/25177-GuardianKnightOfBlackLily.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25177" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25178-ServitorOfBlackLily.xml b/data/templates/npc/monster/25178-ServitorOfBlackLily.xml
index 0cef8fbf2..4ccfefd63 100644
--- a/data/templates/npc/monster/25178-ServitorOfBlackLily.xml
+++ b/data/templates/npc/monster/25178-ServitorOfBlackLily.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25178" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25180-KarumSGuard.xml b/data/templates/npc/monster/25180-KarumSGuard.xml
index b28c8b04d..a5b2ec8da 100644
--- a/data/templates/npc/monster/25180-KarumSGuard.xml
+++ b/data/templates/npc/monster/25180-KarumSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25180" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25181-KarumSWarrior.xml b/data/templates/npc/monster/25181-KarumSWarrior.xml
index f1d3a88df..f825039e3 100644
--- a/data/templates/npc/monster/25181-KarumSWarrior.xml
+++ b/data/templates/npc/monster/25181-KarumSWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25181" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25183-KurikupsWife.xml b/data/templates/npc/monster/25183-KurikupsWife.xml
index a17b9a6e2..cf82b3499 100644
--- a/data/templates/npc/monster/25183-KurikupsWife.xml
+++ b/data/templates/npc/monster/25183-KurikupsWife.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25183" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25184-DevilBladerOfChaos.xml b/data/templates/npc/monster/25184-DevilBladerOfChaos.xml
index 08b04c502..a65135e96 100644
--- a/data/templates/npc/monster/25184-DevilBladerOfChaos.xml
+++ b/data/templates/npc/monster/25184-DevilBladerOfChaos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25184" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25186-HellenaSMarksman.xml b/data/templates/npc/monster/25186-HellenaSMarksman.xml
index 0ce51e888..cec214cee 100644
--- a/data/templates/npc/monster/25186-HellenaSMarksman.xml
+++ b/data/templates/npc/monster/25186-HellenaSMarksman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25186" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25187-HelenaSSoldier.xml b/data/templates/npc/monster/25187-HelenaSSoldier.xml
index b0a178ca4..c112ba6d3 100644
--- a/data/templates/npc/monster/25187-HelenaSSoldier.xml
+++ b/data/templates/npc/monster/25187-HelenaSSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25187" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25190-MumuSWizard.xml b/data/templates/npc/monster/25190-MumuSWizard.xml
index 17bd376e0..4bf2b3928 100644
--- a/data/templates/npc/monster/25190-MumuSWizard.xml
+++ b/data/templates/npc/monster/25190-MumuSWizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25190" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25191-MumuSWarrior.xml b/data/templates/npc/monster/25191-MumuSWarrior.xml
index f25fcec7f..95a6b16a6 100644
--- a/data/templates/npc/monster/25191-MumuSWarrior.xml
+++ b/data/templates/npc/monster/25191-MumuSWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25191" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25193-PanathenSKnight.xml b/data/templates/npc/monster/25193-PanathenSKnight.xml
index 255849ed9..7279036fa 100644
--- a/data/templates/npc/monster/25193-PanathenSKnight.xml
+++ b/data/templates/npc/monster/25193-PanathenSKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25193" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25194-PanathenSProtectors.xml b/data/templates/npc/monster/25194-PanathenSProtectors.xml
index f98fe9793..57519b9f6 100644
--- a/data/templates/npc/monster/25194-PanathenSProtectors.xml
+++ b/data/templates/npc/monster/25194-PanathenSProtectors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25194" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25200-FamilyOfSheshark.xml b/data/templates/npc/monster/25200-FamilyOfSheshark.xml
index 696488d5a..b96c755c4 100644
--- a/data/templates/npc/monster/25200-FamilyOfSheshark.xml
+++ b/data/templates/npc/monster/25200-FamilyOfSheshark.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25200" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25201-GuardOfSheshark.xml b/data/templates/npc/monster/25201-GuardOfSheshark.xml
index 573557523..0b4d77683 100644
--- a/data/templates/npc/monster/25201-GuardOfSheshark.xml
+++ b/data/templates/npc/monster/25201-GuardOfSheshark.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25201" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25203-ParhitPadishaSobekk.xml b/data/templates/npc/monster/25203-ParhitPadishaSobekk.xml
index 5e8e978e5..1cbc147d1 100644
--- a/data/templates/npc/monster/25203-ParhitPadishaSobekk.xml
+++ b/data/templates/npc/monster/25203-ParhitPadishaSobekk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25203" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25204-KrokianPadishaSobekk.xml b/data/templates/npc/monster/25204-KrokianPadishaSobekk.xml
index f1aab38c8..a1365d9cc 100644
--- a/data/templates/npc/monster/25204-KrokianPadishaSobekk.xml
+++ b/data/templates/npc/monster/25204-KrokianPadishaSobekk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25204" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25206-AshakielSBlade.xml b/data/templates/npc/monster/25206-AshakielSBlade.xml
index 746c3a294..2ba69278d 100644
--- a/data/templates/npc/monster/25206-AshakielSBlade.xml
+++ b/data/templates/npc/monster/25206-AshakielSBlade.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25206" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25207-AshakielSRod.xml b/data/templates/npc/monster/25207-AshakielSRod.xml
index 35a24818b..404cbdce1 100644
--- a/data/templates/npc/monster/25207-AshakielSRod.xml
+++ b/data/templates/npc/monster/25207-AshakielSRod.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25207" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25209-AtekaSShaman.xml b/data/templates/npc/monster/25209-AtekaSShaman.xml
index 04e999320..99f129b6b 100644
--- a/data/templates/npc/monster/25209-AtekaSShaman.xml
+++ b/data/templates/npc/monster/25209-AtekaSShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25209" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25210-AtekaSGrunt.xml b/data/templates/npc/monster/25210-AtekaSGrunt.xml
index 80b25cd70..a14d2df12 100644
--- a/data/templates/npc/monster/25210-AtekaSGrunt.xml
+++ b/data/templates/npc/monster/25210-AtekaSGrunt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25210" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25212-SebekSPriest.xml b/data/templates/npc/monster/25212-SebekSPriest.xml
index c7fddf795..e28a5fed0 100644
--- a/data/templates/npc/monster/25212-SebekSPriest.xml
+++ b/data/templates/npc/monster/25212-SebekSPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25212" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25213-SebekSFanatic.xml b/data/templates/npc/monster/25213-SebekSFanatic.xml
index cff5e0f67..5e4e11503 100644
--- a/data/templates/npc/monster/25213-SebekSFanatic.xml
+++ b/data/templates/npc/monster/25213-SebekSFanatic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25213" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25215-SikaSWizard.xml b/data/templates/npc/monster/25215-SikaSWizard.xml
index a8ff24879..2f996d2ae 100644
--- a/data/templates/npc/monster/25215-SikaSWizard.xml
+++ b/data/templates/npc/monster/25215-SikaSWizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25215" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25216-SikaSFighter.xml b/data/templates/npc/monster/25216-SikaSFighter.xml
index 6b3dbbbdc..c5917356c 100644
--- a/data/templates/npc/monster/25216-SikaSFighter.xml
+++ b/data/templates/npc/monster/25216-SikaSFighter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25216" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25218-ClaraSMarksman.xml b/data/templates/npc/monster/25218-ClaraSMarksman.xml
index c1954629e..00853ed74 100644
--- a/data/templates/npc/monster/25218-ClaraSMarksman.xml
+++ b/data/templates/npc/monster/25218-ClaraSMarksman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25218" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25219-ClaraSPawn.xml b/data/templates/npc/monster/25219-ClaraSPawn.xml
index c6cdc6ef2..e264b0587 100644
--- a/data/templates/npc/monster/25219-ClaraSPawn.xml
+++ b/data/templates/npc/monster/25219-ClaraSPawn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25219" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25221-DeathMageKrician.xml b/data/templates/npc/monster/25221-DeathMageKrician.xml
index ccae5dc7c..1af84e175 100644
--- a/data/templates/npc/monster/25221-DeathMageKrician.xml
+++ b/data/templates/npc/monster/25221-DeathMageKrician.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25221" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25222-DeathFighterHarik.xml b/data/templates/npc/monster/25222-DeathFighterHarik.xml
index c0d19c1ba..f9b29e42c 100644
--- a/data/templates/npc/monster/25222-DeathFighterHarik.xml
+++ b/data/templates/npc/monster/25222-DeathFighterHarik.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25222" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25224-SoulSlasher.xml b/data/templates/npc/monster/25224-SoulSlasher.xml
index 4620f7970..e58d5c7e8 100644
--- a/data/templates/npc/monster/25224-SoulSlasher.xml
+++ b/data/templates/npc/monster/25224-SoulSlasher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25224" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25225-SoulStrainer.xml b/data/templates/npc/monster/25225-SoulStrainer.xml
index 554918483..25397229d 100644
--- a/data/templates/npc/monster/25225-SoulStrainer.xml
+++ b/data/templates/npc/monster/25225-SoulStrainer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25225" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25227-KastorSSeer.xml b/data/templates/npc/monster/25227-KastorSSeer.xml
index 773e62fcd..b2a35e898 100644
--- a/data/templates/npc/monster/25227-KastorSSeer.xml
+++ b/data/templates/npc/monster/25227-KastorSSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25227" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25228-KastorSPrefect.xml b/data/templates/npc/monster/25228-KastorSPrefect.xml
index 05e34acb4..3389782c0 100644
--- a/data/templates/npc/monster/25228-KastorSPrefect.xml
+++ b/data/templates/npc/monster/25228-KastorSPrefect.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25228" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25231-RagothSGuard.xml b/data/templates/npc/monster/25231-RagothSGuard.xml
index 4e5f3f6ab..7d0e77c01 100644
--- a/data/templates/npc/monster/25231-RagothSGuard.xml
+++ b/data/templates/npc/monster/25231-RagothSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25231" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25232-RagothSHerald.xml b/data/templates/npc/monster/25232-RagothSHerald.xml
index 2ce17f410..fe9eef915 100644
--- a/data/templates/npc/monster/25232-RagothSHerald.xml
+++ b/data/templates/npc/monster/25232-RagothSHerald.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25232" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25236-KandraSHealer.xml b/data/templates/npc/monster/25236-KandraSHealer.xml
index 0b0009138..b135abc6b 100644
--- a/data/templates/npc/monster/25236-KandraSHealer.xml
+++ b/data/templates/npc/monster/25236-KandraSHealer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25236" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25237-KandraSGuard.xml b/data/templates/npc/monster/25237-KandraSGuard.xml
index 2b33e7c81..c132c6219 100644
--- a/data/templates/npc/monster/25237-KandraSGuard.xml
+++ b/data/templates/npc/monster/25237-KandraSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25237" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25239-MonstrousBeastOfAbyssBrukunt.xml b/data/templates/npc/monster/25239-MonstrousBeastOfAbyssBrukunt.xml
index 6aa2fb22a..be4493af7 100644
--- a/data/templates/npc/monster/25239-MonstrousBeastOfAbyssBrukunt.xml
+++ b/data/templates/npc/monster/25239-MonstrousBeastOfAbyssBrukunt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25239" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25240-WildBeastOfAbyssBrukunt.xml b/data/templates/npc/monster/25240-WildBeastOfAbyssBrukunt.xml
index 6d79d476f..fae2135d8 100644
--- a/data/templates/npc/monster/25240-WildBeastOfAbyssBrukunt.xml
+++ b/data/templates/npc/monster/25240-WildBeastOfAbyssBrukunt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25240" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25242-TamashSAdvisor.xml b/data/templates/npc/monster/25242-TamashSAdvisor.xml
index caea25dcc..0c54bfec4 100644
--- a/data/templates/npc/monster/25242-TamashSAdvisor.xml
+++ b/data/templates/npc/monster/25242-TamashSAdvisor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25242" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25243-TamashSServant.xml b/data/templates/npc/monster/25243-TamashSServant.xml
index 15365b132..bc9ff7e58 100644
--- a/data/templates/npc/monster/25243-TamashSServant.xml
+++ b/data/templates/npc/monster/25243-TamashSServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25243" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25246-GlakiSHenchman.xml b/data/templates/npc/monster/25246-GlakiSHenchman.xml
index 0a5b29ec9..aa97d639b 100644
--- a/data/templates/npc/monster/25246-GlakiSHenchman.xml
+++ b/data/templates/npc/monster/25246-GlakiSHenchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25246" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25247-GlakiSServant.xml b/data/templates/npc/monster/25247-GlakiSServant.xml
index 72d4b3e65..18d71496b 100644
--- a/data/templates/npc/monster/25247-GlakiSServant.xml
+++ b/data/templates/npc/monster/25247-GlakiSServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25247" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25250-ManEatingPlantOfPalatanos.xml b/data/templates/npc/monster/25250-ManEatingPlantOfPalatanos.xml
index 78ff002c5..4a0f302d3 100644
--- a/data/templates/npc/monster/25250-ManEatingPlantOfPalatanos.xml
+++ b/data/templates/npc/monster/25250-ManEatingPlantOfPalatanos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25250" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25251-SaplingOfPalatanos.xml b/data/templates/npc/monster/25251-SaplingOfPalatanos.xml
index d080982be..e9b053dca 100644
--- a/data/templates/npc/monster/25251-SaplingOfPalatanos.xml
+++ b/data/templates/npc/monster/25251-SaplingOfPalatanos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25251" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25253-HandmaidenOfThemis.xml b/data/templates/npc/monster/25253-HandmaidenOfThemis.xml
index cdf128fac..5bcf32bf3 100644
--- a/data/templates/npc/monster/25253-HandmaidenOfThemis.xml
+++ b/data/templates/npc/monster/25253-HandmaidenOfThemis.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25253" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25254-ThemisSSentinel.xml b/data/templates/npc/monster/25254-ThemisSSentinel.xml
index 663a8d460..fbd27d6c6 100644
--- a/data/templates/npc/monster/25254-ThemisSSentinel.xml
+++ b/data/templates/npc/monster/25254-ThemisSSentinel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25254" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25257-ArakSArcher.xml b/data/templates/npc/monster/25257-ArakSArcher.xml
index b6c457e9c..6ec34562e 100644
--- a/data/templates/npc/monster/25257-ArakSArcher.xml
+++ b/data/templates/npc/monster/25257-ArakSArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25257" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25258-ArakSFootman.xml b/data/templates/npc/monster/25258-ArakSFootman.xml
index 9260480b8..76745ae33 100644
--- a/data/templates/npc/monster/25258-ArakSFootman.xml
+++ b/data/templates/npc/monster/25258-ArakSFootman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25258" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25261-TotemGuardArcher.xml b/data/templates/npc/monster/25261-TotemGuardArcher.xml
index 5885a2ddc..602896532 100644
--- a/data/templates/npc/monster/25261-TotemGuardArcher.xml
+++ b/data/templates/npc/monster/25261-TotemGuardArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25261" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25262-TotemGuard.xml b/data/templates/npc/monster/25262-TotemGuard.xml
index 1ff051228..11f1910af 100644
--- a/data/templates/npc/monster/25262-TotemGuard.xml
+++ b/data/templates/npc/monster/25262-TotemGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25262" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25264-KeloneSAssassin.xml b/data/templates/npc/monster/25264-KeloneSAssassin.xml
index 75d55b57e..b9561fb6e 100644
--- a/data/templates/npc/monster/25264-KeloneSAssassin.xml
+++ b/data/templates/npc/monster/25264-KeloneSAssassin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25264" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25265-KeloneSSecretKnight.xml b/data/templates/npc/monster/25265-KeloneSSecretKnight.xml
index a77da6fb3..09017856f 100644
--- a/data/templates/npc/monster/25265-KeloneSSecretKnight.xml
+++ b/data/templates/npc/monster/25265-KeloneSSecretKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25265" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25267-DecarbiaSRoyalGuard.xml b/data/templates/npc/monster/25267-DecarbiaSRoyalGuard.xml
index 0cb274bbd..e472873c6 100644
--- a/data/templates/npc/monster/25267-DecarbiaSRoyalGuard.xml
+++ b/data/templates/npc/monster/25267-DecarbiaSRoyalGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25267" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25268-DecarbiaSEscort.xml b/data/templates/npc/monster/25268-DecarbiaSEscort.xml
index f351ad09b..9bfaa4514 100644
--- a/data/templates/npc/monster/25268-DecarbiaSEscort.xml
+++ b/data/templates/npc/monster/25268-DecarbiaSEscort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25268" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25270-BehemothJaveliner.xml b/data/templates/npc/monster/25270-BehemothJaveliner.xml
index 7499c67c6..0e568a225 100644
--- a/data/templates/npc/monster/25270-BehemothJaveliner.xml
+++ b/data/templates/npc/monster/25270-BehemothJaveliner.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25270" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25271-BehemothFlare.xml b/data/templates/npc/monster/25271-BehemothFlare.xml
index 21824777a..78eddfbf6 100644
--- a/data/templates/npc/monster/25271-BehemothFlare.xml
+++ b/data/templates/npc/monster/25271-BehemothFlare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25271" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25274-Carnabarun.xml b/data/templates/npc/monster/25274-Carnabarun.xml
index ac0a16d4b..81d5caa33 100644
--- a/data/templates/npc/monster/25274-Carnabarun.xml
+++ b/data/templates/npc/monster/25274-Carnabarun.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25274" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25275-Carnassiud.xml b/data/templates/npc/monster/25275-Carnassiud.xml
index c508f5924..722672265 100644
--- a/data/templates/npc/monster/25275-Carnassiud.xml
+++ b/data/templates/npc/monster/25275-Carnassiud.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25275" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25278-DeadSoulOfStigma.xml b/data/templates/npc/monster/25278-DeadSoulOfStigma.xml
index 2f8914d8e..0a3898fcf 100644
--- a/data/templates/npc/monster/25278-DeadSoulOfStigma.xml
+++ b/data/templates/npc/monster/25278-DeadSoulOfStigma.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25278" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25279-EvilSpiritOfStigma.xml b/data/templates/npc/monster/25279-EvilSpiritOfStigma.xml
index f033f05bd..55ed9c5b2 100644
--- a/data/templates/npc/monster/25279-EvilSpiritOfStigma.xml
+++ b/data/templates/npc/monster/25279-EvilSpiritOfStigma.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25279" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25284-LilithSAgent.xml b/data/templates/npc/monster/25284-LilithSAgent.xml
index e62f8c942..200931a8e 100644
--- a/data/templates/npc/monster/25284-LilithSAgent.xml
+++ b/data/templates/npc/monster/25284-LilithSAgent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25284" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25285-LilithSEscort.xml b/data/templates/npc/monster/25285-LilithSEscort.xml
index 031a713c3..03c61b6e2 100644
--- a/data/templates/npc/monster/25285-LilithSEscort.xml
+++ b/data/templates/npc/monster/25285-LilithSEscort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25285" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25287-AnakimSGuardian.xml b/data/templates/npc/monster/25287-AnakimSGuardian.xml
index 5945b9ee6..4937c2e75 100644
--- a/data/templates/npc/monster/25287-AnakimSGuardian.xml
+++ b/data/templates/npc/monster/25287-AnakimSGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25287" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25288-AnakimSRoyalGuard.xml b/data/templates/npc/monster/25288-AnakimSRoyalGuard.xml
index c793b575a..1ff360c28 100644
--- a/data/templates/npc/monster/25288-AnakimSRoyalGuard.xml
+++ b/data/templates/npc/monster/25288-AnakimSRoyalGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25288" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25289-AnakimSExecutor.xml b/data/templates/npc/monster/25289-AnakimSExecutor.xml
index df642629b..de75390fc 100644
--- a/data/templates/npc/monster/25289-AnakimSExecutor.xml
+++ b/data/templates/npc/monster/25289-AnakimSExecutor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25289" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25291-FamilyOfDaimon.xml b/data/templates/npc/monster/25291-FamilyOfDaimon.xml
index 034c10cd2..d8f3f03b4 100644
--- a/data/templates/npc/monster/25291-FamilyOfDaimon.xml
+++ b/data/templates/npc/monster/25291-FamilyOfDaimon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25291" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25292-FamilyOfDaimon.xml b/data/templates/npc/monster/25292-FamilyOfDaimon.xml
index a85480c15..ae8e79597 100644
--- a/data/templates/npc/monster/25292-FamilyOfDaimon.xml
+++ b/data/templates/npc/monster/25292-FamilyOfDaimon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25292" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25294-FighterOfHestia.xml b/data/templates/npc/monster/25294-FighterOfHestia.xml
index 168255cce..0c2561d05 100644
--- a/data/templates/npc/monster/25294-FighterOfHestia.xml
+++ b/data/templates/npc/monster/25294-FighterOfHestia.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25294" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25295-FollowerOfHestia.xml b/data/templates/npc/monster/25295-FollowerOfHestia.xml
index cc96aa37e..fc7a24820 100644
--- a/data/templates/npc/monster/25295-FollowerOfHestia.xml
+++ b/data/templates/npc/monster/25295-FollowerOfHestia.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25295" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25297-IcicleGiant.xml b/data/templates/npc/monster/25297-IcicleGiant.xml
index a41d3160b..ef03ef33e 100644
--- a/data/templates/npc/monster/25297-IcicleGiant.xml
+++ b/data/templates/npc/monster/25297-IcicleGiant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25297" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25298-IcicleGiant.xml b/data/templates/npc/monster/25298-IcicleGiant.xml
index 17c64170d..59a7c81a6 100644
--- a/data/templates/npc/monster/25298-IcicleGiant.xml
+++ b/data/templates/npc/monster/25298-IcicleGiant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25298" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25300-ScoutOfHekaton.xml b/data/templates/npc/monster/25300-ScoutOfHekaton.xml
index 84966671b..4bf86be4c 100644
--- a/data/templates/npc/monster/25300-ScoutOfHekaton.xml
+++ b/data/templates/npc/monster/25300-ScoutOfHekaton.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25300" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25301-ServantOfHekaton.xml b/data/templates/npc/monster/25301-ServantOfHekaton.xml
index 828177c6c..462c41b01 100644
--- a/data/templates/npc/monster/25301-ServantOfHekaton.xml
+++ b/data/templates/npc/monster/25301-ServantOfHekaton.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25301" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25303-TayrSAide.xml b/data/templates/npc/monster/25303-TayrSAide.xml
index 14e695248..ac19c3ece 100644
--- a/data/templates/npc/monster/25303-TayrSAide.xml
+++ b/data/templates/npc/monster/25303-TayrSAide.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25303" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25304-TayrSGuard.xml b/data/templates/npc/monster/25304-TayrSGuard.xml
index 035bcaa47..4d68150dd 100644
--- a/data/templates/npc/monster/25304-TayrSGuard.xml
+++ b/data/templates/npc/monster/25304-TayrSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25304" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25307-FamilyOfNastron.xml b/data/templates/npc/monster/25307-FamilyOfNastron.xml
index 6ee2e502c..1ab2ecedc 100644
--- a/data/templates/npc/monster/25307-FamilyOfNastron.xml
+++ b/data/templates/npc/monster/25307-FamilyOfNastron.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25307" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25308-FamilyOfNastron.xml b/data/templates/npc/monster/25308-FamilyOfNastron.xml
index bd5e74f33..b4ff740c1 100644
--- a/data/templates/npc/monster/25308-FamilyOfNastron.xml
+++ b/data/templates/npc/monster/25308-FamilyOfNastron.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25308" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25310-ShadithSRoyalGuardCaptain.xml b/data/templates/npc/monster/25310-ShadithSRoyalGuardCaptain.xml
index 6b2e6a064..063e4351d 100644
--- a/data/templates/npc/monster/25310-ShadithSRoyalGuardCaptain.xml
+++ b/data/templates/npc/monster/25310-ShadithSRoyalGuardCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25310" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25311-ShadithSSentinel.xml b/data/templates/npc/monster/25311-ShadithSSentinel.xml
index 940f51d6d..2b4ed0bf1 100644
--- a/data/templates/npc/monster/25311-ShadithSSentinel.xml
+++ b/data/templates/npc/monster/25311-ShadithSSentinel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25311" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25313-MosAide.xml b/data/templates/npc/monster/25313-MosAide.xml
index 1fadb043b..816839221 100644
--- a/data/templates/npc/monster/25313-MosAide.xml
+++ b/data/templates/npc/monster/25313-MosAide.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25313" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25314-MosGuard.xml b/data/templates/npc/monster/25314-MosGuard.xml
index 784bc250e..739fa4751 100644
--- a/data/templates/npc/monster/25314-MosGuard.xml
+++ b/data/templates/npc/monster/25314-MosGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25314" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25317-FamilyOfAshutar.xml b/data/templates/npc/monster/25317-FamilyOfAshutar.xml
index 83c0cc97c..c837c62d4 100644
--- a/data/templates/npc/monster/25317-FamilyOfAshutar.xml
+++ b/data/templates/npc/monster/25317-FamilyOfAshutar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25317" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25318-FamilyOfAshutar.xml b/data/templates/npc/monster/25318-FamilyOfAshutar.xml
index 0afa40c40..4c68f5dc4 100644
--- a/data/templates/npc/monster/25318-FamilyOfAshutar.xml
+++ b/data/templates/npc/monster/25318-FamilyOfAshutar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25318" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25320-SentinelOfEmber.xml b/data/templates/npc/monster/25320-SentinelOfEmber.xml
index 59f56fb67..7fdcd090e 100644
--- a/data/templates/npc/monster/25320-SentinelOfEmber.xml
+++ b/data/templates/npc/monster/25320-SentinelOfEmber.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25320" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25321-MessengerOfEmber.xml b/data/templates/npc/monster/25321-MessengerOfEmber.xml
index c1ce28d79..b06f6f2dd 100644
--- a/data/templates/npc/monster/25321-MessengerOfEmber.xml
+++ b/data/templates/npc/monster/25321-MessengerOfEmber.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25321" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25323-FalstonSDisciple.xml b/data/templates/npc/monster/25323-FalstonSDisciple.xml
index 26a290d28..ccc450a8e 100644
--- a/data/templates/npc/monster/25323-FalstonSDisciple.xml
+++ b/data/templates/npc/monster/25323-FalstonSDisciple.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25323" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25324-ServantOfFalston.xml b/data/templates/npc/monster/25324-ServantOfFalston.xml
index 94d844e69..4d0f16194 100644
--- a/data/templates/npc/monster/25324-ServantOfFalston.xml
+++ b/data/templates/npc/monster/25324-ServantOfFalston.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25324" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25326-BarakielSDisciple.xml b/data/templates/npc/monster/25326-BarakielSDisciple.xml
index 80a731cd7..f26a6d3e4 100644
--- a/data/templates/npc/monster/25326-BarakielSDisciple.xml
+++ b/data/templates/npc/monster/25326-BarakielSDisciple.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25326" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25327-BarakielSAcolyte.xml b/data/templates/npc/monster/25327-BarakielSAcolyte.xml
index 58cd2b666..82b64d9e7 100644
--- a/data/templates/npc/monster/25327-BarakielSAcolyte.xml
+++ b/data/templates/npc/monster/25327-BarakielSAcolyte.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25327" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25329-Violet.xml b/data/templates/npc/monster/25329-Violet.xml
index e32e01363..954cca048 100644
--- a/data/templates/npc/monster/25329-Violet.xml
+++ b/data/templates/npc/monster/25329-Violet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25329" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25330-Kurstin.xml b/data/templates/npc/monster/25330-Kurstin.xml
index b060a0a82..b3d58e106 100644
--- a/data/templates/npc/monster/25330-Kurstin.xml
+++ b/data/templates/npc/monster/25330-Kurstin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25330" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25331-Mina.xml b/data/templates/npc/monster/25331-Mina.xml
index e4f9aef8e..02809d079 100644
--- a/data/templates/npc/monster/25331-Mina.xml
+++ b/data/templates/npc/monster/25331-Mina.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25331" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25332-Dorian.xml b/data/templates/npc/monster/25332-Dorian.xml
index 4c0afe89f..6cc403a8f 100644
--- a/data/templates/npc/monster/25332-Dorian.xml
+++ b/data/templates/npc/monster/25332-Dorian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25332" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25340-KnightOfShadow.xml b/data/templates/npc/monster/25340-KnightOfShadow.xml
index faa9d5a6e..ca3c62829 100644
--- a/data/templates/npc/monster/25340-KnightOfShadow.xml
+++ b/data/templates/npc/monster/25340-KnightOfShadow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25340" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25341-KnightOfShadow.xml b/data/templates/npc/monster/25341-KnightOfShadow.xml
index 4485091e6..ba64b3bfc 100644
--- a/data/templates/npc/monster/25341-KnightOfShadow.xml
+++ b/data/templates/npc/monster/25341-KnightOfShadow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25341" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25343-KnightOfShadow.xml b/data/templates/npc/monster/25343-KnightOfShadow.xml
index cbf666eb8..4249e53d8 100644
--- a/data/templates/npc/monster/25343-KnightOfShadow.xml
+++ b/data/templates/npc/monster/25343-KnightOfShadow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25343" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25344-KnightOfShadow.xml b/data/templates/npc/monster/25344-KnightOfShadow.xml
index ae3a02eec..161337d64 100644
--- a/data/templates/npc/monster/25344-KnightOfShadow.xml
+++ b/data/templates/npc/monster/25344-KnightOfShadow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25344" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25345-KnightOfShadow.xml b/data/templates/npc/monster/25345-KnightOfShadow.xml
index 0b2c426ec..d6232062a 100644
--- a/data/templates/npc/monster/25345-KnightOfShadow.xml
+++ b/data/templates/npc/monster/25345-KnightOfShadow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25345" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25347-KnightOfShadow.xml b/data/templates/npc/monster/25347-KnightOfShadow.xml
index 065d85acd..8a6f4c82d 100644
--- a/data/templates/npc/monster/25347-KnightOfShadow.xml
+++ b/data/templates/npc/monster/25347-KnightOfShadow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25347" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25348-KnightOfShadow.xml b/data/templates/npc/monster/25348-KnightOfShadow.xml
index 8b4e616aa..7181ed37c 100644
--- a/data/templates/npc/monster/25348-KnightOfShadow.xml
+++ b/data/templates/npc/monster/25348-KnightOfShadow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25348" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25350-KnightOfShadow.xml b/data/templates/npc/monster/25350-KnightOfShadow.xml
index 3f0b50d2e..193ee1c3a 100644
--- a/data/templates/npc/monster/25350-KnightOfShadow.xml
+++ b/data/templates/npc/monster/25350-KnightOfShadow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25350" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25351-KnightOfShadow.xml b/data/templates/npc/monster/25351-KnightOfShadow.xml
index 50360165c..83daaa12b 100644
--- a/data/templates/npc/monster/25351-KnightOfShadow.xml
+++ b/data/templates/npc/monster/25351-KnightOfShadow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25351" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25353-GiantWastelandBasilisk.xml b/data/templates/npc/monster/25353-GiantWastelandBasilisk.xml
index 0443be147..ee2871ba3 100644
--- a/data/templates/npc/monster/25353-GiantWastelandBasilisk.xml
+++ b/data/templates/npc/monster/25353-GiantWastelandBasilisk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25353" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25355-SiroccoSGargoyle.xml b/data/templates/npc/monster/25355-SiroccoSGargoyle.xml
index 9ce4d019a..42c882c9a 100644
--- a/data/templates/npc/monster/25355-SiroccoSGargoyle.xml
+++ b/data/templates/npc/monster/25355-SiroccoSGargoyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25355" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25356-SiroccoSGuards.xml b/data/templates/npc/monster/25356-SiroccoSGuards.xml
index 88a8b0339..dd4769d49 100644
--- a/data/templates/npc/monster/25356-SiroccoSGuards.xml
+++ b/data/templates/npc/monster/25356-SiroccoSGuards.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25356" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25358-SukarWereratGuard.xml b/data/templates/npc/monster/25358-SukarWereratGuard.xml
index 62b578d84..751691e06 100644
--- a/data/templates/npc/monster/25358-SukarWereratGuard.xml
+++ b/data/templates/npc/monster/25358-SukarWereratGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25358" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25359-SukarWereratPriest.xml b/data/templates/npc/monster/25359-SukarWereratPriest.xml
index 9dfe8d63b..598ef85ae 100644
--- a/data/templates/npc/monster/25359-SukarWereratPriest.xml
+++ b/data/templates/npc/monster/25359-SukarWereratPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25359" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25361-YellowHornet.xml b/data/templates/npc/monster/25361-YellowHornet.xml
index 5110acb1e..497741f9d 100644
--- a/data/templates/npc/monster/25361-YellowHornet.xml
+++ b/data/templates/npc/monster/25361-YellowHornet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25361" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25363-SharukSTracker.xml b/data/templates/npc/monster/25363-SharukSTracker.xml
index d1c54b31e..36eb4afaa 100644
--- a/data/templates/npc/monster/25363-SharukSTracker.xml
+++ b/data/templates/npc/monster/25363-SharukSTracker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25363" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25364-SharukSMarksman.xml b/data/templates/npc/monster/25364-SharukSMarksman.xml
index 05e99a62c..9843fdc13 100644
--- a/data/templates/npc/monster/25364-SharukSMarksman.xml
+++ b/data/templates/npc/monster/25364-SharukSMarksman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25364" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25367-KuroborosFollower.xml b/data/templates/npc/monster/25367-KuroborosFollower.xml
index 140f09d7a..8b63dba2d 100644
--- a/data/templates/npc/monster/25367-KuroborosFollower.xml
+++ b/data/templates/npc/monster/25367-KuroborosFollower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25367" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25368-KuroborosDiscipline.xml b/data/templates/npc/monster/25368-KuroborosDiscipline.xml
index 49c485c39..ffd91d047 100644
--- a/data/templates/npc/monster/25368-KuroborosDiscipline.xml
+++ b/data/templates/npc/monster/25368-KuroborosDiscipline.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25368" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25370-CorpseScavenger.xml b/data/templates/npc/monster/25370-CorpseScavenger.xml
index e564973e9..10195726a 100644
--- a/data/templates/npc/monster/25370-CorpseScavenger.xml
+++ b/data/templates/npc/monster/25370-CorpseScavenger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25370" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25371-AnimaScavenger.xml b/data/templates/npc/monster/25371-AnimaScavenger.xml
index 913a517f6..af9ad6ca0 100644
--- a/data/templates/npc/monster/25371-AnimaScavenger.xml
+++ b/data/templates/npc/monster/25371-AnimaScavenger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25371" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25374-AbyssFlyer.xml b/data/templates/npc/monster/25374-AbyssFlyer.xml
index 94377e6ca..74a0a0d5a 100644
--- a/data/templates/npc/monster/25374-AbyssFlyer.xml
+++ b/data/templates/npc/monster/25374-AbyssFlyer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25374" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25376-WarriorZombieOfFarakelsus.xml b/data/templates/npc/monster/25376-WarriorZombieOfFarakelsus.xml
index 020c342a2..a9fd0e949 100644
--- a/data/templates/npc/monster/25376-WarriorZombieOfFarakelsus.xml
+++ b/data/templates/npc/monster/25376-WarriorZombieOfFarakelsus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25376" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25377-PriestZombieOfFarakelsus.xml b/data/templates/npc/monster/25377-PriestZombieOfFarakelsus.xml
index ebb7a59ca..5406ebd09 100644
--- a/data/templates/npc/monster/25377-PriestZombieOfFarakelsus.xml
+++ b/data/templates/npc/monster/25377-PriestZombieOfFarakelsus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25377" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25379-DementiaBeast.xml b/data/templates/npc/monster/25379-DementiaBeast.xml
index cf6b6d473..651074dd5 100644
--- a/data/templates/npc/monster/25379-DementiaBeast.xml
+++ b/data/templates/npc/monster/25379-DementiaBeast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25379" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25381-NightmareFlyer.xml b/data/templates/npc/monster/25381-NightmareFlyer.xml
index c64458223..dfe4ba933 100644
--- a/data/templates/npc/monster/25381-NightmareFlyer.xml
+++ b/data/templates/npc/monster/25381-NightmareFlyer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25381" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25382-HostileFlyer.xml b/data/templates/npc/monster/25382-HostileFlyer.xml
index 040298f1d..668f5f4be 100644
--- a/data/templates/npc/monster/25382-HostileFlyer.xml
+++ b/data/templates/npc/monster/25382-HostileFlyer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25382" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25384-ServantOfCalibus.xml b/data/templates/npc/monster/25384-ServantOfCalibus.xml
index 4e42b19ee..05369d636 100644
--- a/data/templates/npc/monster/25384-ServantOfCalibus.xml
+++ b/data/templates/npc/monster/25384-ServantOfCalibus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25384" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25386-GhostOfTheExecutionGrounds.xml b/data/templates/npc/monster/25386-GhostOfTheExecutionGrounds.xml
index 6c823f40c..c411f6c4e 100644
--- a/data/templates/npc/monster/25386-GhostOfTheExecutionGrounds.xml
+++ b/data/templates/npc/monster/25386-GhostOfTheExecutionGrounds.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25386" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25387-MalignantSpiritOfTheExecutionGrounds.xml b/data/templates/npc/monster/25387-MalignantSpiritOfTheExecutionGrounds.xml
index b19731444..b826389d4 100644
--- a/data/templates/npc/monster/25387-MalignantSpiritOfTheExecutionGrounds.xml
+++ b/data/templates/npc/monster/25387-MalignantSpiritOfTheExecutionGrounds.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25387" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25389-RedEyeArcher.xml b/data/templates/npc/monster/25389-RedEyeArcher.xml
index ce9ad9896..23d9763ae 100644
--- a/data/templates/npc/monster/25389-RedEyeArcher.xml
+++ b/data/templates/npc/monster/25389-RedEyeArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25389" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25390-RedEyeGuards.xml b/data/templates/npc/monster/25390-RedEyeGuards.xml
index 15d2a503d..e94a1a00c 100644
--- a/data/templates/npc/monster/25390-RedEyeGuards.xml
+++ b/data/templates/npc/monster/25390-RedEyeGuards.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25390" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25393-MarshStakatoNoble.xml b/data/templates/npc/monster/25393-MarshStakatoNoble.xml
index 776d36dd9..ce06b2b66 100644
--- a/data/templates/npc/monster/25393-MarshStakatoNoble.xml
+++ b/data/templates/npc/monster/25393-MarshStakatoNoble.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25393" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25396-KusionSuscepter.xml b/data/templates/npc/monster/25396-KusionSuscepter.xml
index 07e24a63a..fd77bffcc 100644
--- a/data/templates/npc/monster/25396-KusionSuscepter.xml
+++ b/data/templates/npc/monster/25396-KusionSuscepter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25396" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25397-GustosSuscepter.xml b/data/templates/npc/monster/25397-GustosSuscepter.xml
index 5fb92b566..1be359ef9 100644
--- a/data/templates/npc/monster/25397-GustosSuscepter.xml
+++ b/data/templates/npc/monster/25397-GustosSuscepter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25397" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25399-ApprenticeOfWatchman.xml b/data/templates/npc/monster/25399-ApprenticeOfWatchman.xml
index cf81676d3..2fe14533a 100644
--- a/data/templates/npc/monster/25399-ApprenticeOfWatchman.xml
+++ b/data/templates/npc/monster/25399-ApprenticeOfWatchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25399" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25400-PageOfWatchman.xml b/data/templates/npc/monster/25400-PageOfWatchman.xml
index 0051ead28..a23eb0dbf 100644
--- a/data/templates/npc/monster/25400-PageOfWatchman.xml
+++ b/data/templates/npc/monster/25400-PageOfWatchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25400" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25402-RetainerOfSkyla.xml b/data/templates/npc/monster/25402-RetainerOfSkyla.xml
index 3d0f17077..a5a8c15ae 100644
--- a/data/templates/npc/monster/25402-RetainerOfSkyla.xml
+++ b/data/templates/npc/monster/25402-RetainerOfSkyla.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25402" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25403-FollowerOfSkyla.xml b/data/templates/npc/monster/25403-FollowerOfSkyla.xml
index d32e4ddd6..1bd440290 100644
--- a/data/templates/npc/monster/25403-FollowerOfSkyla.xml
+++ b/data/templates/npc/monster/25403-FollowerOfSkyla.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25403" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25405-KylonSPirate.xml b/data/templates/npc/monster/25405-KylonSPirate.xml
index f1ef702cb..5a323a883 100644
--- a/data/templates/npc/monster/25405-KylonSPirate.xml
+++ b/data/templates/npc/monster/25405-KylonSPirate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25405" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25406-KylonSMate.xml b/data/templates/npc/monster/25406-KylonSMate.xml
index 3ba8d078d..e485ce7b3 100644
--- a/data/templates/npc/monster/25406-KylonSMate.xml
+++ b/data/templates/npc/monster/25406-KylonSMate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25406" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25408-IshkaSEliteOfficer.xml b/data/templates/npc/monster/25408-IshkaSEliteOfficer.xml
index 048b29c4c..13fa438b2 100644
--- a/data/templates/npc/monster/25408-IshkaSEliteOfficer.xml
+++ b/data/templates/npc/monster/25408-IshkaSEliteOfficer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25408" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25409-IshkaSEliteSoldier.xml b/data/templates/npc/monster/25409-IshkaSEliteSoldier.xml
index 4ef8ad4e2..860dc2f1b 100644
--- a/data/templates/npc/monster/25409-IshkaSEliteSoldier.xml
+++ b/data/templates/npc/monster/25409-IshkaSEliteSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25409" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25411-RoadScavengerHenchman.xml b/data/templates/npc/monster/25411-RoadScavengerHenchman.xml
index 0e7449d25..191569d67 100644
--- a/data/templates/npc/monster/25411-RoadScavengerHenchman.xml
+++ b/data/templates/npc/monster/25411-RoadScavengerHenchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25411" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25413-NecrosentinelArcher.xml b/data/templates/npc/monster/25413-NecrosentinelArcher.xml
index 1e8842c1d..b92f81c72 100644
--- a/data/templates/npc/monster/25413-NecrosentinelArcher.xml
+++ b/data/templates/npc/monster/25413-NecrosentinelArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25413" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25414-NecrosentinelSoldier.xml b/data/templates/npc/monster/25414-NecrosentinelSoldier.xml
index a040efa73..6dc352fb8 100644
--- a/data/templates/npc/monster/25414-NecrosentinelSoldier.xml
+++ b/data/templates/npc/monster/25414-NecrosentinelSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25414" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25416-NakondasSlave.xml b/data/templates/npc/monster/25416-NakondasSlave.xml
index b39f2ab2c..bfe7441c7 100644
--- a/data/templates/npc/monster/25416-NakondasSlave.xml
+++ b/data/templates/npc/monster/25416-NakondasSlave.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25416" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25417-NakondasChain.xml b/data/templates/npc/monster/25417-NakondasChain.xml
index c450aacf4..5cc5bc035 100644
--- a/data/templates/npc/monster/25417-NakondasChain.xml
+++ b/data/templates/npc/monster/25417-NakondasChain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25417" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25419-DreadPanther.xml b/data/templates/npc/monster/25419-DreadPanther.xml
index 9dda2f607..866e38d29 100644
--- a/data/templates/npc/monster/25419-DreadPanther.xml
+++ b/data/templates/npc/monster/25419-DreadPanther.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25419" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25421-TrisalimEscort.xml b/data/templates/npc/monster/25421-TrisalimEscort.xml
index 310617cbf..bc3005860 100644
--- a/data/templates/npc/monster/25421-TrisalimEscort.xml
+++ b/data/templates/npc/monster/25421-TrisalimEscort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25421" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25422-PageOfRottingTree.xml b/data/templates/npc/monster/25422-PageOfRottingTree.xml
index 6a30c67c9..8c803c12a 100644
--- a/data/templates/npc/monster/25422-PageOfRottingTree.xml
+++ b/data/templates/npc/monster/25422-PageOfRottingTree.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25422" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25424-TiminielSRoyalGuards.xml b/data/templates/npc/monster/25424-TiminielSRoyalGuards.xml
index e6c4c1e87..915e793af 100644
--- a/data/templates/npc/monster/25424-TiminielSRoyalGuards.xml
+++ b/data/templates/npc/monster/25424-TiminielSRoyalGuards.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25424" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25425-TiminielSRoyalGuardCaptain.xml b/data/templates/npc/monster/25425-TiminielSRoyalGuardCaptain.xml
index 85f08ad96..73b71f88e 100644
--- a/data/templates/npc/monster/25425-TiminielSRoyalGuardCaptain.xml
+++ b/data/templates/npc/monster/25425-TiminielSRoyalGuardCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25425" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25427-FrekiSVampireBat.xml b/data/templates/npc/monster/25427-FrekiSVampireBat.xml
index b270bdd4a..d6c824542 100644
--- a/data/templates/npc/monster/25427-FrekiSVampireBat.xml
+++ b/data/templates/npc/monster/25427-FrekiSVampireBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25427" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25428-FrekiSWildBear.xml b/data/templates/npc/monster/25428-FrekiSWildBear.xml
index 75fabcdb2..5ea3b4ba0 100644
--- a/data/templates/npc/monster/25428-FrekiSWildBear.xml
+++ b/data/templates/npc/monster/25428-FrekiSWildBear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25428" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25430-TalosCohort.xml b/data/templates/npc/monster/25430-TalosCohort.xml
index 5a569932c..7e13e2248 100644
--- a/data/templates/npc/monster/25430-TalosCohort.xml
+++ b/data/templates/npc/monster/25430-TalosCohort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25430" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25432-ElementalOfFlame.xml b/data/templates/npc/monster/25432-ElementalOfFlame.xml
index 513454a8a..67770532e 100644
--- a/data/templates/npc/monster/25432-ElementalOfFlame.xml
+++ b/data/templates/npc/monster/25432-ElementalOfFlame.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25432" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25433-ElementalOfSpark.xml b/data/templates/npc/monster/25433-ElementalOfSpark.xml
index b409d78f5..25e1097d1 100644
--- a/data/templates/npc/monster/25433-ElementalOfSpark.xml
+++ b/data/templates/npc/monster/25433-ElementalOfSpark.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25433" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25435-BardaSBandit.xml b/data/templates/npc/monster/25435-BardaSBandit.xml
index 96dfab93b..0b746d0d4 100644
--- a/data/templates/npc/monster/25435-BardaSBandit.xml
+++ b/data/templates/npc/monster/25435-BardaSBandit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25435" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25436-BardaSShaman.xml b/data/templates/npc/monster/25436-BardaSShaman.xml
index 633ed3877..16092f393 100644
--- a/data/templates/npc/monster/25436-BardaSShaman.xml
+++ b/data/templates/npc/monster/25436-BardaSShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25436" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25439-KelbarSInferior.xml b/data/templates/npc/monster/25439-KelbarSInferior.xml
index 77fe13845..daec1965d 100644
--- a/data/templates/npc/monster/25439-KelbarSInferior.xml
+++ b/data/templates/npc/monster/25439-KelbarSInferior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25439" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25440-KelbarSWizard.xml b/data/templates/npc/monster/25440-KelbarSWizard.xml
index c8c3e4254..fbf7e6353 100644
--- a/data/templates/npc/monster/25440-KelbarSWizard.xml
+++ b/data/templates/npc/monster/25440-KelbarSWizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25440" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25442-EvilCreatureOfForest.xml b/data/templates/npc/monster/25442-EvilCreatureOfForest.xml
index 7bcfa9f7d..336181190 100644
--- a/data/templates/npc/monster/25442-EvilCreatureOfForest.xml
+++ b/data/templates/npc/monster/25442-EvilCreatureOfForest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25442" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25443-AngerOfForest.xml b/data/templates/npc/monster/25443-AngerOfForest.xml
index a4d3b35c6..f81bbb79c 100644
--- a/data/templates/npc/monster/25443-AngerOfForest.xml
+++ b/data/templates/npc/monster/25443-AngerOfForest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25443" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25445-EnmityGhosts.xml b/data/templates/npc/monster/25445-EnmityGhosts.xml
index 5a3c941eb..3d6bdf80e 100644
--- a/data/templates/npc/monster/25445-EnmityGhosts.xml
+++ b/data/templates/npc/monster/25445-EnmityGhosts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25445" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25446-ShooterOfEnmity.xml b/data/templates/npc/monster/25446-ShooterOfEnmity.xml
index f130557fd..04d9f2a37 100644
--- a/data/templates/npc/monster/25446-ShooterOfEnmity.xml
+++ b/data/templates/npc/monster/25446-ShooterOfEnmity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25446" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25448-ImmortalSavior.xml b/data/templates/npc/monster/25448-ImmortalSavior.xml
index 6d76e18ac..7e834045f 100644
--- a/data/templates/npc/monster/25448-ImmortalSavior.xml
+++ b/data/templates/npc/monster/25448-ImmortalSavior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25448" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25449-ImmortalGuide.xml b/data/templates/npc/monster/25449-ImmortalGuide.xml
index 0884ac225..b988a0d17 100644
--- a/data/templates/npc/monster/25449-ImmortalGuide.xml
+++ b/data/templates/npc/monster/25449-ImmortalGuide.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25449" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25451-GalaxiaSGuards.xml b/data/templates/npc/monster/25451-GalaxiaSGuards.xml
index b77547c8f..ecd8f1d8c 100644
--- a/data/templates/npc/monster/25451-GalaxiaSGuards.xml
+++ b/data/templates/npc/monster/25451-GalaxiaSGuards.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25451" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25452-MessengerOfAngel.xml b/data/templates/npc/monster/25452-MessengerOfAngel.xml
index 35766cd15..4d05bdde9 100644
--- a/data/templates/npc/monster/25452-MessengerOfAngel.xml
+++ b/data/templates/npc/monster/25452-MessengerOfAngel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25452" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25454-WyvernOfMarsh.xml b/data/templates/npc/monster/25454-WyvernOfMarsh.xml
index 445eec77a..b33647fb8 100644
--- a/data/templates/npc/monster/25454-WyvernOfMarsh.xml
+++ b/data/templates/npc/monster/25454-WyvernOfMarsh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25454" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25455-SuccubusOfMarsh.xml b/data/templates/npc/monster/25455-SuccubusOfMarsh.xml
index 6213c50e6..14b9789f4 100644
--- a/data/templates/npc/monster/25455-SuccubusOfMarsh.xml
+++ b/data/templates/npc/monster/25455-SuccubusOfMarsh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25455" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25457-ShardsOfOblivion.xml b/data/templates/npc/monster/25457-ShardsOfOblivion.xml
index a745666c9..b47904d2b 100644
--- a/data/templates/npc/monster/25457-ShardsOfOblivion.xml
+++ b/data/templates/npc/monster/25457-ShardsOfOblivion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25457" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25458-ShadowOfOblivion.xml b/data/templates/npc/monster/25458-ShadowOfOblivion.xml
index 56195e3f9..0b192b170 100644
--- a/data/templates/npc/monster/25458-ShadowOfOblivion.xml
+++ b/data/templates/npc/monster/25458-ShadowOfOblivion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25458" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25459-ShardsOfOblivion.xml b/data/templates/npc/monster/25459-ShardsOfOblivion.xml
index 61db2ba7a..4ac279c92 100644
--- a/data/templates/npc/monster/25459-ShardsOfOblivion.xml
+++ b/data/templates/npc/monster/25459-ShardsOfOblivion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25459" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25461-EreveSKnight.xml b/data/templates/npc/monster/25461-EreveSKnight.xml
index 5f02ac4f2..608fe22c9 100644
--- a/data/templates/npc/monster/25461-EreveSKnight.xml
+++ b/data/templates/npc/monster/25461-EreveSKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25461" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25462-EreveSSquire.xml b/data/templates/npc/monster/25462-EreveSSquire.xml
index 241bb3632..8587871dc 100644
--- a/data/templates/npc/monster/25462-EreveSSquire.xml
+++ b/data/templates/npc/monster/25462-EreveSSquire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25462" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25464-GarangkyGuardCaptain.xml b/data/templates/npc/monster/25464-GarangkyGuardCaptain.xml
index 0b0c15299..adc2907c9 100644
--- a/data/templates/npc/monster/25464-GarangkyGuardCaptain.xml
+++ b/data/templates/npc/monster/25464-GarangkyGuardCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25464" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25465-GarangkyGuardShaman.xml b/data/templates/npc/monster/25465-GarangkyGuardShaman.xml
index 71c06f3d4..56fffacf4 100644
--- a/data/templates/npc/monster/25465-GarangkyGuardShaman.xml
+++ b/data/templates/npc/monster/25465-GarangkyGuardShaman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25465" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25466-GarangkyGuard.xml b/data/templates/npc/monster/25466-GarangkyGuard.xml
index d4c6a739a..fc1eb3207 100644
--- a/data/templates/npc/monster/25466-GarangkyGuard.xml
+++ b/data/templates/npc/monster/25466-GarangkyGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25466" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25468-CursedLife.xml b/data/templates/npc/monster/25468-CursedLife.xml
index 9aba068af..8a4e48e79 100644
--- a/data/templates/npc/monster/25468-CursedLife.xml
+++ b/data/templates/npc/monster/25468-CursedLife.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25468" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25469-CursedSoul.xml b/data/templates/npc/monster/25469-CursedSoul.xml
index 4f249e0a0..ac28efc30 100644
--- a/data/templates/npc/monster/25469-CursedSoul.xml
+++ b/data/templates/npc/monster/25469-CursedSoul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25469" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25471-UtenusSWizard.xml b/data/templates/npc/monster/25471-UtenusSWizard.xml
index 22abf9469..71c433fbf 100644
--- a/data/templates/npc/monster/25471-UtenusSWizard.xml
+++ b/data/templates/npc/monster/25471-UtenusSWizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25471" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25472-UtenusSGuard.xml b/data/templates/npc/monster/25472-UtenusSGuard.xml
index d19ce56ea..a090e28d9 100644
--- a/data/templates/npc/monster/25472-UtenusSGuard.xml
+++ b/data/templates/npc/monster/25472-UtenusSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25472" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25474-KimSGang.xml b/data/templates/npc/monster/25474-KimSGang.xml
index cdafd2baa..bbadbd819 100644
--- a/data/templates/npc/monster/25474-KimSGang.xml
+++ b/data/templates/npc/monster/25474-KimSGang.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25474" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25476-KabedSSoldier.xml b/data/templates/npc/monster/25476-KabedSSoldier.xml
index 1c43890ab..6c7be6848 100644
--- a/data/templates/npc/monster/25476-KabedSSoldier.xml
+++ b/data/templates/npc/monster/25476-KabedSSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25476" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25477-KabedSArcher.xml b/data/templates/npc/monster/25477-KabedSArcher.xml
index 747d244e8..1c353d0e4 100644
--- a/data/templates/npc/monster/25477-KabedSArcher.xml
+++ b/data/templates/npc/monster/25477-KabedSArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25477" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25479-HisilromeSServitor.xml b/data/templates/npc/monster/25479-HisilromeSServitor.xml
index c40aa22bd..003655b33 100644
--- a/data/templates/npc/monster/25479-HisilromeSServitor.xml
+++ b/data/templates/npc/monster/25479-HisilromeSServitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25479" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25480-HisilromeSPage.xml b/data/templates/npc/monster/25480-HisilromeSPage.xml
index 20f2593f8..a046cfd2d 100644
--- a/data/templates/npc/monster/25480-HisilromeSPage.xml
+++ b/data/templates/npc/monster/25480-HisilromeSPage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25480" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25482-ShadowOfKenishee.xml b/data/templates/npc/monster/25482-ShadowOfKenishee.xml
index 70f149b8a..c22621164 100644
--- a/data/templates/npc/monster/25482-ShadowOfKenishee.xml
+++ b/data/templates/npc/monster/25482-ShadowOfKenishee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25482" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25483-PhantomOfKenishee.xml b/data/templates/npc/monster/25483-PhantomOfKenishee.xml
index 4a443a2ad..700c4da30 100644
--- a/data/templates/npc/monster/25483-PhantomOfKenishee.xml
+++ b/data/templates/npc/monster/25483-PhantomOfKenishee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25483" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25485-TillionSInferior.xml b/data/templates/npc/monster/25485-TillionSInferior.xml
index 55b64e367..2747e8cc9 100644
--- a/data/templates/npc/monster/25485-TillionSInferior.xml
+++ b/data/templates/npc/monster/25485-TillionSInferior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25485" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25486-TillionSBat.xml b/data/templates/npc/monster/25486-TillionSBat.xml
index 58da6887e..ea3a4890c 100644
--- a/data/templates/npc/monster/25486-TillionSBat.xml
+++ b/data/templates/npc/monster/25486-TillionSBat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25486" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25488-SpiritOfGildor.xml b/data/templates/npc/monster/25488-SpiritOfGildor.xml
index fe114666f..02eadd119 100644
--- a/data/templates/npc/monster/25488-SpiritOfGildor.xml
+++ b/data/templates/npc/monster/25488-SpiritOfGildor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25488" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25489-GuardianOfGildor.xml b/data/templates/npc/monster/25489-GuardianOfGildor.xml
index a847213b8..1e4e419bf 100644
--- a/data/templates/npc/monster/25489-GuardianOfGildor.xml
+++ b/data/templates/npc/monster/25489-GuardianOfGildor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25489" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25491-GuardOfGwindorr.xml b/data/templates/npc/monster/25491-GuardOfGwindorr.xml
index 96b578f73..705b45b0b 100644
--- a/data/templates/npc/monster/25491-GuardOfGwindorr.xml
+++ b/data/templates/npc/monster/25491-GuardOfGwindorr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25491" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25492-FollowerOfGwindorr.xml b/data/templates/npc/monster/25492-FollowerOfGwindorr.xml
index 737d42de5..6c078385d 100644
--- a/data/templates/npc/monster/25492-FollowerOfGwindorr.xml
+++ b/data/templates/npc/monster/25492-FollowerOfGwindorr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25492" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25494-SpiritOfNiniel.xml b/data/templates/npc/monster/25494-SpiritOfNiniel.xml
index 224294268..5e514b949 100644
--- a/data/templates/npc/monster/25494-SpiritOfNiniel.xml
+++ b/data/templates/npc/monster/25494-SpiritOfNiniel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25494" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25495-SpiritOfNiniel.xml b/data/templates/npc/monster/25495-SpiritOfNiniel.xml
index 016f52685..dd4a9aaf5 100644
--- a/data/templates/npc/monster/25495-SpiritOfNiniel.xml
+++ b/data/templates/npc/monster/25495-SpiritOfNiniel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25495" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25497-FafurionSEnvoy.xml b/data/templates/npc/monster/25497-FafurionSEnvoy.xml
index 90a2fc889..ba1f91f89 100644
--- a/data/templates/npc/monster/25497-FafurionSEnvoy.xml
+++ b/data/templates/npc/monster/25497-FafurionSEnvoy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25497" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25499-AlligatorOfIstary.xml b/data/templates/npc/monster/25499-AlligatorOfIstary.xml
index 9d935c4f0..09272f980 100644
--- a/data/templates/npc/monster/25499-AlligatorOfIstary.xml
+++ b/data/templates/npc/monster/25499-AlligatorOfIstary.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25499" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25500-AlligatorOfIstary.xml b/data/templates/npc/monster/25500-AlligatorOfIstary.xml
index 9c83cb0b7..42646be42 100644
--- a/data/templates/npc/monster/25500-AlligatorOfIstary.xml
+++ b/data/templates/npc/monster/25500-AlligatorOfIstary.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25500" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25502-AkataSThug.xml b/data/templates/npc/monster/25502-AkataSThug.xml
index 74ecdb7b4..9e020ebc9 100644
--- a/data/templates/npc/monster/25502-AkataSThug.xml
+++ b/data/templates/npc/monster/25502-AkataSThug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25502" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25503-AkataSLackey.xml b/data/templates/npc/monster/25503-AkataSLackey.xml
index 56ce234ac..383be77ec 100644
--- a/data/templates/npc/monster/25503-AkataSLackey.xml
+++ b/data/templates/npc/monster/25503-AkataSLackey.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25503" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25505-NellisFollower.xml b/data/templates/npc/monster/25505-NellisFollower.xml
index 6478452f3..a9290e74f 100644
--- a/data/templates/npc/monster/25505-NellisFollower.xml
+++ b/data/templates/npc/monster/25505-NellisFollower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25505" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25507-RayitoSHenchman.xml b/data/templates/npc/monster/25507-RayitoSHenchman.xml
index e7211ab2b..27d342412 100644
--- a/data/templates/npc/monster/25507-RayitoSHenchman.xml
+++ b/data/templates/npc/monster/25507-RayitoSHenchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25507" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25508-RayitoSHenchman.xml b/data/templates/npc/monster/25508-RayitoSHenchman.xml
index 813b14330..279e2773d 100644
--- a/data/templates/npc/monster/25508-RayitoSHenchman.xml
+++ b/data/templates/npc/monster/25508-RayitoSHenchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25508" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25510-VarangkaSDescendant.xml b/data/templates/npc/monster/25510-VarangkaSDescendant.xml
index ca8853242..9f7802f4b 100644
--- a/data/templates/npc/monster/25510-VarangkaSDescendant.xml
+++ b/data/templates/npc/monster/25510-VarangkaSDescendant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25510" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25511-VarangkaSPage.xml b/data/templates/npc/monster/25511-VarangkaSPage.xml
index f0c0fe3b9..93d143e9a 100644
--- a/data/templates/npc/monster/25511-VarangkaSPage.xml
+++ b/data/templates/npc/monster/25511-VarangkaSPage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25511" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25515-SpikedStakato.xml b/data/templates/npc/monster/25515-SpikedStakato.xml
index 2913d740c..0ec98d9e6 100644
--- a/data/templates/npc/monster/25515-SpikedStakato.xml
+++ b/data/templates/npc/monster/25515-SpikedStakato.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25515" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25516-SpikedStakato.xml b/data/templates/npc/monster/25516-SpikedStakato.xml
index 92a4d31b2..a1f28e159 100644
--- a/data/templates/npc/monster/25516-SpikedStakato.xml
+++ b/data/templates/npc/monster/25516-SpikedStakato.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25516" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25525-FlameSpirit.xml b/data/templates/npc/monster/25525-FlameSpirit.xml
index 990a3d57c..64727f491 100644
--- a/data/templates/npc/monster/25525-FlameSpirit.xml
+++ b/data/templates/npc/monster/25525-FlameSpirit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25525" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25526-ChargedSpirit.xml b/data/templates/npc/monster/25526-ChargedSpirit.xml
index a8040ba49..b99644cf6 100644
--- a/data/templates/npc/monster/25526-ChargedSpirit.xml
+++ b/data/templates/npc/monster/25526-ChargedSpirit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25526" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25533-KechiSHenchman.xml b/data/templates/npc/monster/25533-KechiSHenchman.xml
index 6dc88efa7..3ebc22763 100644
--- a/data/templates/npc/monster/25533-KechiSHenchman.xml
+++ b/data/templates/npc/monster/25533-KechiSHenchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25533" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25535-Tears.xml b/data/templates/npc/monster/25535-Tears.xml
index 45017efa6..0999f7b67 100644
--- a/data/templates/npc/monster/25535-Tears.xml
+++ b/data/templates/npc/monster/25535-Tears.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25535" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25537-Enmity.xml b/data/templates/npc/monster/25537-Enmity.xml
index bb78403a1..b2e8465fd 100644
--- a/data/templates/npc/monster/25537-Enmity.xml
+++ b/data/templates/npc/monster/25537-Enmity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25537" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25538-Vengeance.xml b/data/templates/npc/monster/25538-Vengeance.xml
index a43db4765..17a62d9f9 100644
--- a/data/templates/npc/monster/25538-Vengeance.xml
+++ b/data/templates/npc/monster/25538-Vengeance.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25538" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25541-Fiend.xml b/data/templates/npc/monster/25541-Fiend.xml
index 820694dbc..41e743e4b 100644
--- a/data/templates/npc/monster/25541-Fiend.xml
+++ b/data/templates/npc/monster/25541-Fiend.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25541" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25543-Eidolon.xml b/data/templates/npc/monster/25543-Eidolon.xml
index 806060764..5b2b2ee81 100644
--- a/data/templates/npc/monster/25543-Eidolon.xml
+++ b/data/templates/npc/monster/25543-Eidolon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25543" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25545-TullySBanshee.xml b/data/templates/npc/monster/25545-TullySBanshee.xml
index 2e3b48e16..abc339a2a 100644
--- a/data/templates/npc/monster/25545-TullySBanshee.xml
+++ b/data/templates/npc/monster/25545-TullySBanshee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25545" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25547-RhiannaSEscort.xml b/data/templates/npc/monster/25547-RhiannaSEscort.xml
index 3f3002d9b..bd93672a0 100644
--- a/data/templates/npc/monster/25547-RhiannaSEscort.xml
+++ b/data/templates/npc/monster/25547-RhiannaSEscort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25547" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25548-RhiannaSHealer.xml b/data/templates/npc/monster/25548-RhiannaSHealer.xml
index 69400ab23..1e25e4cfd 100644
--- a/data/templates/npc/monster/25548-RhiannaSHealer.xml
+++ b/data/templates/npc/monster/25548-RhiannaSHealer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25548" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25550-TeslaSApprentice.xml b/data/templates/npc/monster/25550-TeslaSApprentice.xml
index 85ef9070c..5d74b82d7 100644
--- a/data/templates/npc/monster/25550-TeslaSApprentice.xml
+++ b/data/templates/npc/monster/25550-TeslaSApprentice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25550" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25551-TeslaSHerald.xml b/data/templates/npc/monster/25551-TeslaSHerald.xml
index 89eb52f92..012ebd704 100644
--- a/data/templates/npc/monster/25551-TeslaSHerald.xml
+++ b/data/templates/npc/monster/25551-TeslaSHerald.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25551" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25555-BrutusRightHand.xml b/data/templates/npc/monster/25555-BrutusRightHand.xml
index 16ea832a7..de1c07dd1 100644
--- a/data/templates/npc/monster/25555-BrutusRightHand.xml
+++ b/data/templates/npc/monster/25555-BrutusRightHand.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25555" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25556-BrutusLeftHand.xml b/data/templates/npc/monster/25556-BrutusLeftHand.xml
index 922bd36ca..ae889bc78 100644
--- a/data/templates/npc/monster/25556-BrutusLeftHand.xml
+++ b/data/templates/npc/monster/25556-BrutusLeftHand.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25556" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25558-KarankawaSRoot.xml b/data/templates/npc/monster/25558-KarankawaSRoot.xml
index 987a2b893..2f6a541c2 100644
--- a/data/templates/npc/monster/25558-KarankawaSRoot.xml
+++ b/data/templates/npc/monster/25558-KarankawaSRoot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25558" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25559-KarankawaSBlossom.xml b/data/templates/npc/monster/25559-KarankawaSBlossom.xml
index f206d5f64..73a276458 100644
--- a/data/templates/npc/monster/25559-KarankawaSBlossom.xml
+++ b/data/templates/npc/monster/25559-KarankawaSBlossom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25559" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25561-SargonAttendant.xml b/data/templates/npc/monster/25561-SargonAttendant.xml
index 4432c229d..e28421fd8 100644
--- a/data/templates/npc/monster/25561-SargonAttendant.xml
+++ b/data/templates/npc/monster/25561-SargonAttendant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25561" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25562-SargonSSquire.xml b/data/templates/npc/monster/25562-SargonSSquire.xml
index 926bbb54b..281f376fd 100644
--- a/data/templates/npc/monster/25562-SargonSSquire.xml
+++ b/data/templates/npc/monster/25562-SargonSSquire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25562" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25564-AtrielleSFollower.xml b/data/templates/npc/monster/25564-AtrielleSFollower.xml
index 4d201a3fe..6188c04f5 100644
--- a/data/templates/npc/monster/25564-AtrielleSFollower.xml
+++ b/data/templates/npc/monster/25564-AtrielleSFollower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25564" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25565-AtrielleSMinion.xml b/data/templates/npc/monster/25565-AtrielleSMinion.xml
index bb8667166..438aaa648 100644
--- a/data/templates/npc/monster/25565-AtrielleSMinion.xml
+++ b/data/templates/npc/monster/25565-AtrielleSMinion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25565" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25567-NagenSCohort.xml b/data/templates/npc/monster/25567-NagenSCohort.xml
index 3f242ec85..d22e2f1cb 100644
--- a/data/templates/npc/monster/25567-NagenSCohort.xml
+++ b/data/templates/npc/monster/25567-NagenSCohort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25567" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25568-NagenSFriend.xml b/data/templates/npc/monster/25568-NagenSFriend.xml
index 71e61def9..66d53f5a9 100644
--- a/data/templates/npc/monster/25568-NagenSFriend.xml
+++ b/data/templates/npc/monster/25568-NagenSFriend.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25568" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25570-JaxSVanguard.xml b/data/templates/npc/monster/25570-JaxSVanguard.xml
index 0a05b8e5b..5a99272d7 100644
--- a/data/templates/npc/monster/25570-JaxSVanguard.xml
+++ b/data/templates/npc/monster/25570-JaxSVanguard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25570" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25571-JaxSRaider.xml b/data/templates/npc/monster/25571-JaxSRaider.xml
index 02cb69f47..9487e256b 100644
--- a/data/templates/npc/monster/25571-JaxSRaider.xml
+++ b/data/templates/npc/monster/25571-JaxSRaider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25571" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25573-HagerSHenchman.xml b/data/templates/npc/monster/25573-HagerSHenchman.xml
index a4c3837f8..7a60c8cfa 100644
--- a/data/templates/npc/monster/25573-HagerSHenchman.xml
+++ b/data/templates/npc/monster/25573-HagerSHenchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25573" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25574-HagerSBodyguard.xml b/data/templates/npc/monster/25574-HagerSBodyguard.xml
index cfdb9d8e4..48e43a168 100644
--- a/data/templates/npc/monster/25574-HagerSBodyguard.xml
+++ b/data/templates/npc/monster/25574-HagerSBodyguard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25574" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25576-RangoSIris.xml b/data/templates/npc/monster/25576-RangoSIris.xml
index bc07b5764..dd404e8d3 100644
--- a/data/templates/npc/monster/25576-RangoSIris.xml
+++ b/data/templates/npc/monster/25576-RangoSIris.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25576" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25577-RangoSLens.xml b/data/templates/npc/monster/25577-RangoSLens.xml
index bb40dcee0..54e22f1b4 100644
--- a/data/templates/npc/monster/25577-RangoSLens.xml
+++ b/data/templates/npc/monster/25577-RangoSLens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25577" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25580-HelsingSGuard.xml b/data/templates/npc/monster/25580-HelsingSGuard.xml
index b704143aa..1f92154f9 100644
--- a/data/templates/npc/monster/25580-HelsingSGuard.xml
+++ b/data/templates/npc/monster/25580-HelsingSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25580" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25581-HelsingSAssassin.xml b/data/templates/npc/monster/25581-HelsingSAssassin.xml
index d22d4b6c5..f1f1bc2f6 100644
--- a/data/templates/npc/monster/25581-HelsingSAssassin.xml
+++ b/data/templates/npc/monster/25581-HelsingSAssassin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25581" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25583-GillienSDaughter.xml b/data/templates/npc/monster/25583-GillienSDaughter.xml
index ee7bc5c26..a307e95e3 100644
--- a/data/templates/npc/monster/25583-GillienSDaughter.xml
+++ b/data/templates/npc/monster/25583-GillienSDaughter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25583" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25584-GillienSAttendant.xml b/data/templates/npc/monster/25584-GillienSAttendant.xml
index 344ab1f75..f40f5978a 100644
--- a/data/templates/npc/monster/25584-GillienSAttendant.xml
+++ b/data/templates/npc/monster/25584-GillienSAttendant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25584" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25586-MediciSSister.xml b/data/templates/npc/monster/25586-MediciSSister.xml
index a6d43d2ad..bf659003c 100644
--- a/data/templates/npc/monster/25586-MediciSSister.xml
+++ b/data/templates/npc/monster/25586-MediciSSister.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25586" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25587-MediciSBrother.xml b/data/templates/npc/monster/25587-MediciSBrother.xml
index 69c042cb2..21f7d3f63 100644
--- a/data/templates/npc/monster/25587-MediciSBrother.xml
+++ b/data/templates/npc/monster/25587-MediciSBrother.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25587" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25590-BrandSChamberlain.xml b/data/templates/npc/monster/25590-BrandSChamberlain.xml
index acab4bc51..e4bca0b0c 100644
--- a/data/templates/npc/monster/25590-BrandSChamberlain.xml
+++ b/data/templates/npc/monster/25590-BrandSChamberlain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25590" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25591-BrandSServant.xml b/data/templates/npc/monster/25591-BrandSServant.xml
index 7521340c7..59ce455e7 100644
--- a/data/templates/npc/monster/25591-BrandSServant.xml
+++ b/data/templates/npc/monster/25591-BrandSServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25591" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25594-GergSFollower.xml b/data/templates/npc/monster/25594-GergSFollower.xml
index 6f9f9e7aa..7d7ee14a4 100644
--- a/data/templates/npc/monster/25594-GergSFollower.xml
+++ b/data/templates/npc/monster/25594-GergSFollower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25594" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25595-GergSHenchman.xml b/data/templates/npc/monster/25595-GergSHenchman.xml
index bf49794b5..0861a4bf5 100644
--- a/data/templates/npc/monster/25595-GergSHenchman.xml
+++ b/data/templates/npc/monster/25595-GergSHenchman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25595" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25596-OcularServitor.xml b/data/templates/npc/monster/25596-OcularServitor.xml
index 34d784134..6d731aea3 100644
--- a/data/templates/npc/monster/25596-OcularServitor.xml
+++ b/data/templates/npc/monster/25596-OcularServitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25596" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25597-Heurel.xml b/data/templates/npc/monster/25597-Heurel.xml
index 47da059be..f3fad304d 100644
--- a/data/templates/npc/monster/25597-Heurel.xml
+++ b/data/templates/npc/monster/25597-Heurel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25597" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25598-Gegei.xml b/data/templates/npc/monster/25598-Gegei.xml
index 6c71e1e84..891b89547 100644
--- a/data/templates/npc/monster/25598-Gegei.xml
+++ b/data/templates/npc/monster/25598-Gegei.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25598" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25599-Iglas.xml b/data/templates/npc/monster/25599-Iglas.xml
index 9e57825f2..20e189449 100644
--- a/data/templates/npc/monster/25599-Iglas.xml
+++ b/data/templates/npc/monster/25599-Iglas.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25599" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25600-Temenir.xml b/data/templates/npc/monster/25600-Temenir.xml
index be4435b4c..70b95b6d1 100644
--- a/data/templates/npc/monster/25600-Temenir.xml
+++ b/data/templates/npc/monster/25600-Temenir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25600" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25601-Draksius.xml b/data/templates/npc/monster/25601-Draksius.xml
index ef6473145..2b36e0bcb 100644
--- a/data/templates/npc/monster/25601-Draksius.xml
+++ b/data/templates/npc/monster/25601-Draksius.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25601" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25602-Kiretcenah.xml b/data/templates/npc/monster/25602-Kiretcenah.xml
index 27f2c53de..f4b00ff2a 100644
--- a/data/templates/npc/monster/25602-Kiretcenah.xml
+++ b/data/templates/npc/monster/25602-Kiretcenah.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25602" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25604-MutatedElpy.xml b/data/templates/npc/monster/25604-MutatedElpy.xml
index b3119e112..a2cb83083 100644
--- a/data/templates/npc/monster/25604-MutatedElpy.xml
+++ b/data/templates/npc/monster/25604-MutatedElpy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25604" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25605-NaiaSpore.xml b/data/templates/npc/monster/25605-NaiaSpore.xml
index 5907db7a3..7ba27fd6a 100644
--- a/data/templates/npc/monster/25605-NaiaSpore.xml
+++ b/data/templates/npc/monster/25605-NaiaSpore.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25605" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25606-NaiaSpore.xml b/data/templates/npc/monster/25606-NaiaSpore.xml
index 85bc7ec41..971153d6a 100644
--- a/data/templates/npc/monster/25606-NaiaSpore.xml
+++ b/data/templates/npc/monster/25606-NaiaSpore.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25606" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25607-NaiaSpore.xml b/data/templates/npc/monster/25607-NaiaSpore.xml
index af0838c6f..000cd1389 100644
--- a/data/templates/npc/monster/25607-NaiaSpore.xml
+++ b/data/templates/npc/monster/25607-NaiaSpore.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25607" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25608-NaiaSpore.xml b/data/templates/npc/monster/25608-NaiaSpore.xml
index 2a8d84a25..86b8828af 100644
--- a/data/templates/npc/monster/25608-NaiaSpore.xml
+++ b/data/templates/npc/monster/25608-NaiaSpore.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25608" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25613-NaiaSpore.xml b/data/templates/npc/monster/25613-NaiaSpore.xml
index f038909d4..bca5a5b87 100644
--- a/data/templates/npc/monster/25613-NaiaSpore.xml
+++ b/data/templates/npc/monster/25613-NaiaSpore.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25613" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25614-FloatingGhost.xml b/data/templates/npc/monster/25614-FloatingGhost.xml
index 4166d0f46..083bd64d0 100644
--- a/data/templates/npc/monster/25614-FloatingGhost.xml
+++ b/data/templates/npc/monster/25614-FloatingGhost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25614" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25615-FloatingGhost.xml b/data/templates/npc/monster/25615-FloatingGhost.xml
index 9904a01db..1cb2635bd 100644
--- a/data/templates/npc/monster/25615-FloatingGhost.xml
+++ b/data/templates/npc/monster/25615-FloatingGhost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25615" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25627-MutantBird.xml b/data/templates/npc/monster/25627-MutantBird.xml
index e15b20871..038ad343b 100644
--- a/data/templates/npc/monster/25627-MutantBird.xml
+++ b/data/templates/npc/monster/25627-MutantBird.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25627" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25628-DraHawk.xml b/data/templates/npc/monster/25628-DraHawk.xml
index 450c15916..e85894f5e 100644
--- a/data/templates/npc/monster/25628-DraHawk.xml
+++ b/data/templates/npc/monster/25628-DraHawk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25628" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25629-FloatingSkull.xml b/data/templates/npc/monster/25629-FloatingSkull.xml
index 750da012f..62b816933 100644
--- a/data/templates/npc/monster/25629-FloatingSkull.xml
+++ b/data/templates/npc/monster/25629-FloatingSkull.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25629" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25630-FloatingZombie.xml b/data/templates/npc/monster/25630-FloatingZombie.xml
index a34d9746a..4ea438a0b 100644
--- a/data/templates/npc/monster/25630-FloatingZombie.xml
+++ b/data/templates/npc/monster/25630-FloatingZombie.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25630" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25631-DrakeWing.xml b/data/templates/npc/monster/25631-DrakeWing.xml
index 8a8c2d1cc..826974c25 100644
--- a/data/templates/npc/monster/25631-DrakeWing.xml
+++ b/data/templates/npc/monster/25631-DrakeWing.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25631" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25632-Drak.xml b/data/templates/npc/monster/25632-Drak.xml
index a92292fab..cbfd68e26 100644
--- a/data/templates/npc/monster/25632-Drak.xml
+++ b/data/templates/npc/monster/25632-Drak.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25632" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25633-EliteRider.xml b/data/templates/npc/monster/25633-EliteRider.xml
index 9502c65ac..b53316275 100644
--- a/data/templates/npc/monster/25633-EliteRider.xml
+++ b/data/templates/npc/monster/25633-EliteRider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25633" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25634-Cohemenes.xml b/data/templates/npc/monster/25634-Cohemenes.xml
index 94aa9dd7a..9d4d94fc1 100644
--- a/data/templates/npc/monster/25634-Cohemenes.xml
+++ b/data/templates/npc/monster/25634-Cohemenes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25634" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25635-Argekunte.xml b/data/templates/npc/monster/25635-Argekunte.xml
index 4e2476709..0bf632c2d 100644
--- a/data/templates/npc/monster/25635-Argekunte.xml
+++ b/data/templates/npc/monster/25635-Argekunte.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25635" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25636-RavenousSoulDevourer.xml b/data/templates/npc/monster/25636-RavenousSoulDevourer.xml
index 46ff1c6ef..e755680f4 100644
--- a/data/templates/npc/monster/25636-RavenousSoulDevourer.xml
+++ b/data/templates/npc/monster/25636-RavenousSoulDevourer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25636" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25637-Karpencharr.xml b/data/templates/npc/monster/25637-Karpencharr.xml
index 9fe006896..cd3df4b7a 100644
--- a/data/templates/npc/monster/25637-Karpencharr.xml
+++ b/data/templates/npc/monster/25637-Karpencharr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25637" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25638-Romerohiv.xml b/data/templates/npc/monster/25638-Romerohiv.xml
index 8c7e7f539..6e0962a51 100644
--- a/data/templates/npc/monster/25638-Romerohiv.xml
+++ b/data/templates/npc/monster/25638-Romerohiv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25638" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25639-Hitchkarshiek.xml b/data/templates/npc/monster/25639-Hitchkarshiek.xml
index 87cdf8d44..4efad373d 100644
--- a/data/templates/npc/monster/25639-Hitchkarshiek.xml
+++ b/data/templates/npc/monster/25639-Hitchkarshiek.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25639" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25640-Freedkyilla.xml b/data/templates/npc/monster/25640-Freedkyilla.xml
index 55d67a55b..e49e6a78f 100644
--- a/data/templates/npc/monster/25640-Freedkyilla.xml
+++ b/data/templates/npc/monster/25640-Freedkyilla.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25640" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25641-YehanCravenizad.xml b/data/templates/npc/monster/25641-YehanCravenizad.xml
index 9288a4f55..081264896 100644
--- a/data/templates/npc/monster/25641-YehanCravenizad.xml
+++ b/data/templates/npc/monster/25641-YehanCravenizad.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25641" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25642-YehanJaxsibhan.xml b/data/templates/npc/monster/25642-YehanJaxsibhan.xml
index dc24c4509..cc285fe1e 100644
--- a/data/templates/npc/monster/25642-YehanJaxsibhan.xml
+++ b/data/templates/npc/monster/25642-YehanJaxsibhan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25642" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25656-KanadisFanatic.xml b/data/templates/npc/monster/25656-KanadisFanatic.xml
index 98fbdee84..2c870040b 100644
--- a/data/templates/npc/monster/25656-KanadisFanatic.xml
+++ b/data/templates/npc/monster/25656-KanadisFanatic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25656" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25657-KanadisFanatic.xml b/data/templates/npc/monster/25657-KanadisFanatic.xml
index 6e50418f2..b95f9c33a 100644
--- a/data/templates/npc/monster/25657-KanadisFanatic.xml
+++ b/data/templates/npc/monster/25657-KanadisFanatic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25657" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25658-KanadisFanatic.xml b/data/templates/npc/monster/25658-KanadisFanatic.xml
index 576785659..fadd94222 100644
--- a/data/templates/npc/monster/25658-KanadisFanatic.xml
+++ b/data/templates/npc/monster/25658-KanadisFanatic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25658" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25662-KanadisFollower.xml b/data/templates/npc/monster/25662-KanadisFollower.xml
index 3c55ecda3..39b2d46b3 100644
--- a/data/templates/npc/monster/25662-KanadisFollower.xml
+++ b/data/templates/npc/monster/25662-KanadisFollower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25662" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25663-KanadisFollower.xml b/data/templates/npc/monster/25663-KanadisFollower.xml
index a5b6e4fd9..77fad0be1 100644
--- a/data/templates/npc/monster/25663-KanadisFollower.xml
+++ b/data/templates/npc/monster/25663-KanadisFollower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25663" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25664-KanadisFollower.xml b/data/templates/npc/monster/25664-KanadisFollower.xml
index 8bea52c09..d74b987ba 100644
--- a/data/templates/npc/monster/25664-KanadisFollower.xml
+++ b/data/templates/npc/monster/25664-KanadisFollower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25664" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25672-SpikedStakato.xml b/data/templates/npc/monster/25672-SpikedStakato.xml
index 257102189..cdec24ec7 100644
--- a/data/templates/npc/monster/25672-SpikedStakato.xml
+++ b/data/templates/npc/monster/25672-SpikedStakato.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25672" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25673-SpikedStakato.xml b/data/templates/npc/monster/25673-SpikedStakato.xml
index b12c53570..950239c83 100644
--- a/data/templates/npc/monster/25673-SpikedStakato.xml
+++ b/data/templates/npc/monster/25673-SpikedStakato.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25673" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25675-GuardOfGwindorr.xml b/data/templates/npc/monster/25675-GuardOfGwindorr.xml
index 7ad194039..83dec0e8b 100644
--- a/data/templates/npc/monster/25675-GuardOfGwindorr.xml
+++ b/data/templates/npc/monster/25675-GuardOfGwindorr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25675" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25676-FollowerOfGwindorr.xml b/data/templates/npc/monster/25676-FollowerOfGwindorr.xml
index c41b5c97c..7fbcf82c3 100644
--- a/data/templates/npc/monster/25676-FollowerOfGwindorr.xml
+++ b/data/templates/npc/monster/25676-FollowerOfGwindorr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25676" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25678-SpriteOfGildor.xml b/data/templates/npc/monster/25678-SpriteOfGildor.xml
index 766a979bc..10b02686c 100644
--- a/data/templates/npc/monster/25678-SpriteOfGildor.xml
+++ b/data/templates/npc/monster/25678-SpriteOfGildor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25678" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25679-GuardianOfGildor.xml b/data/templates/npc/monster/25679-GuardianOfGildor.xml
index 38e6ef272..8aa087b10 100644
--- a/data/templates/npc/monster/25679-GuardianOfGildor.xml
+++ b/data/templates/npc/monster/25679-GuardianOfGildor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25679" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25682-CursedLife.xml b/data/templates/npc/monster/25682-CursedLife.xml
index a938a4d30..20c8939fa 100644
--- a/data/templates/npc/monster/25682-CursedLife.xml
+++ b/data/templates/npc/monster/25682-CursedLife.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25682" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25683-CursedSoul.xml b/data/templates/npc/monster/25683-CursedSoul.xml
index bd3896ec8..0925e8ef9 100644
--- a/data/templates/npc/monster/25683-CursedSoul.xml
+++ b/data/templates/npc/monster/25683-CursedSoul.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25683" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25685-UtenusSWizard.xml b/data/templates/npc/monster/25685-UtenusSWizard.xml
index 4dfacc735..502631981 100644
--- a/data/templates/npc/monster/25685-UtenusSWizard.xml
+++ b/data/templates/npc/monster/25685-UtenusSWizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25685" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25686-UtenusSGuard.xml b/data/templates/npc/monster/25686-UtenusSGuard.xml
index 8bcbeb947..674cb46d4 100644
--- a/data/templates/npc/monster/25686-UtenusSGuard.xml
+++ b/data/templates/npc/monster/25686-UtenusSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25686" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25688-HekatonCottus.xml b/data/templates/npc/monster/25688-HekatonCottus.xml
index fad1a1753..6c064c2f2 100644
--- a/data/templates/npc/monster/25688-HekatonCottus.xml
+++ b/data/templates/npc/monster/25688-HekatonCottus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25688" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25689-HekatonChires.xml b/data/templates/npc/monster/25689-HekatonChires.xml
index 2a4aec9cb..d90e763b5 100644
--- a/data/templates/npc/monster/25689-HekatonChires.xml
+++ b/data/templates/npc/monster/25689-HekatonChires.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25689" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25702-GuardOfTheGrail.xml b/data/templates/npc/monster/25702-GuardOfTheGrail.xml
index 3873b4503..7279cd210 100644
--- a/data/templates/npc/monster/25702-GuardOfTheGrail.xml
+++ b/data/templates/npc/monster/25702-GuardOfTheGrail.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25702" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25704-GiganticGolemSubordinate.xml b/data/templates/npc/monster/25704-GiganticGolemSubordinate.xml
index a38765abe..0d6e3da78 100644
--- a/data/templates/npc/monster/25704-GiganticGolemSubordinate.xml
+++ b/data/templates/npc/monster/25704-GiganticGolemSubordinate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25704" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25705-GiganticBoomGolem.xml b/data/templates/npc/monster/25705-GiganticBoomGolem.xml
index 7d53615f6..3a842715e 100644
--- a/data/templates/npc/monster/25705-GiganticBoomGolem.xml
+++ b/data/templates/npc/monster/25705-GiganticBoomGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25705" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25706-LostWatcher.xml b/data/templates/npc/monster/25706-LostWatcher.xml
index 498fbf29d..a7f7030d4 100644
--- a/data/templates/npc/monster/25706-LostWatcher.xml
+++ b/data/templates/npc/monster/25706-LostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25706" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25707-LostWatcher.xml b/data/templates/npc/monster/25707-LostWatcher.xml
index 1bcd870ae..3470ffbc1 100644
--- a/data/templates/npc/monster/25707-LostWatcher.xml
+++ b/data/templates/npc/monster/25707-LostWatcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25707" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25708-LostBeholder.xml b/data/templates/npc/monster/25708-LostBeholder.xml
index 55dd36127..09e985685 100644
--- a/data/templates/npc/monster/25708-LostBeholder.xml
+++ b/data/templates/npc/monster/25708-LostBeholder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25708" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25711-LostGuard.xml b/data/templates/npc/monster/25711-LostGuard.xml
index 55881fbc0..748af4a92 100644
--- a/data/templates/npc/monster/25711-LostGuard.xml
+++ b/data/templates/npc/monster/25711-LostGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25711" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25712-LostAssistantGuard.xml b/data/templates/npc/monster/25712-LostAssistantGuard.xml
index 583daaa75..78c708424 100644
--- a/data/templates/npc/monster/25712-LostAssistantGuard.xml
+++ b/data/templates/npc/monster/25712-LostAssistantGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25712" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25715-KietchSSubordinate.xml b/data/templates/npc/monster/25715-KietchSSubordinate.xml
index 0c59facc1..3653656ec 100644
--- a/data/templates/npc/monster/25715-KietchSSubordinate.xml
+++ b/data/templates/npc/monster/25715-KietchSSubordinate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25715" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/25717-Tears.xml b/data/templates/npc/monster/25717-Tears.xml
index e0900a3e2..8a4a9a526 100644
--- a/data/templates/npc/monster/25717-Tears.xml
+++ b/data/templates/npc/monster/25717-Tears.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="25717" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27001-OrcSniper.xml b/data/templates/npc/monster/27001-OrcSniper.xml
index ec4ec0d72..dc3c7133d 100644
--- a/data/templates/npc/monster/27001-OrcSniper.xml
+++ b/data/templates/npc/monster/27001-OrcSniper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27001" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27002-OrcFighter.xml b/data/templates/npc/monster/27002-OrcFighter.xml
index 21a9f76cf..c7580ac02 100644
--- a/data/templates/npc/monster/27002-OrcFighter.xml
+++ b/data/templates/npc/monster/27002-OrcFighter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27002" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27003-SpiritOfMirrors.xml b/data/templates/npc/monster/27003-SpiritOfMirrors.xml
index 2e6111075..12e61f90e 100644
--- a/data/templates/npc/monster/27003-SpiritOfMirrors.xml
+++ b/data/templates/npc/monster/27003-SpiritOfMirrors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27003" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27004-SpiritOfMirrors.xml b/data/templates/npc/monster/27004-SpiritOfMirrors.xml
index 22f761db9..2735c880d 100644
--- a/data/templates/npc/monster/27004-SpiritOfMirrors.xml
+++ b/data/templates/npc/monster/27004-SpiritOfMirrors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27004" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27005-SpiritOfMirrors.xml b/data/templates/npc/monster/27005-SpiritOfMirrors.xml
index 47dd6a23f..eba65d46f 100644
--- a/data/templates/npc/monster/27005-SpiritOfMirrors.xml
+++ b/data/templates/npc/monster/27005-SpiritOfMirrors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27005" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27006-BhatoBloodspear.xml b/data/templates/npc/monster/27006-BhatoBloodspear.xml
index 9c177c43a..4ccde7b31 100644
--- a/data/templates/npc/monster/27006-BhatoBloodspear.xml
+++ b/data/templates/npc/monster/27006-BhatoBloodspear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27006" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27007-TanukiSkullcrusher.xml b/data/templates/npc/monster/27007-TanukiSkullcrusher.xml
index 99de8ca8e..5fe287ae8 100644
--- a/data/templates/npc/monster/27007-TanukiSkullcrusher.xml
+++ b/data/templates/npc/monster/27007-TanukiSkullcrusher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27007" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27008-KraaculBlackskull.xml b/data/templates/npc/monster/27008-KraaculBlackskull.xml
index 2bdb522c0..a87a92ef2 100644
--- a/data/templates/npc/monster/27008-KraaculBlackskull.xml
+++ b/data/templates/npc/monster/27008-KraaculBlackskull.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27008" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27009-TaarqBlackskull.xml b/data/templates/npc/monster/27009-TaarqBlackskull.xml
index f2dbc7a6b..2691b610d 100644
--- a/data/templates/npc/monster/27009-TaarqBlackskull.xml
+++ b/data/templates/npc/monster/27009-TaarqBlackskull.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27009" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27016-Nerkas.xml b/data/templates/npc/monster/27016-Nerkas.xml
index 993d4f09d..f8b57c6e0 100644
--- a/data/templates/npc/monster/27016-Nerkas.xml
+++ b/data/templates/npc/monster/27016-Nerkas.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27016" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27017-PlagueZombie.xml b/data/templates/npc/monster/27017-PlagueZombie.xml
index 71a3a4898..224748fdb 100644
--- a/data/templates/npc/monster/27017-PlagueZombie.xml
+++ b/data/templates/npc/monster/27017-PlagueZombie.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27017" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27018-OrcWarrior.xml b/data/templates/npc/monster/27018-OrcWarrior.xml
index ecb6071c7..849d0c04c 100644
--- a/data/templates/npc/monster/27018-OrcWarrior.xml
+++ b/data/templates/npc/monster/27018-OrcWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27018" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27019-OrcWarriorLeader.xml b/data/templates/npc/monster/27019-OrcWarriorLeader.xml
index 0a912a7f2..2c3f5c0c1 100644
--- a/data/templates/npc/monster/27019-OrcWarriorLeader.xml
+++ b/data/templates/npc/monster/27019-OrcWarriorLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27019" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27020-VaroolFoulclaw.xml b/data/templates/npc/monster/27020-VaroolFoulclaw.xml
index 8d81fac84..5720f043a 100644
--- a/data/templates/npc/monster/27020-VaroolFoulclaw.xml
+++ b/data/templates/npc/monster/27020-VaroolFoulclaw.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27020" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27021-Kirunak.xml b/data/templates/npc/monster/27021-Kirunak.xml
index fc5f1654d..5718baf2c 100644
--- a/data/templates/npc/monster/27021-Kirunak.xml
+++ b/data/templates/npc/monster/27021-Kirunak.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27021" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27022-Merkenis.xml b/data/templates/npc/monster/27022-Merkenis.xml
index 40b75b4c5..ab671c9be 100644
--- a/data/templates/npc/monster/27022-Merkenis.xml
+++ b/data/templates/npc/monster/27022-Merkenis.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27022" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27024-UndeadPriest.xml b/data/templates/npc/monster/27024-UndeadPriest.xml
index d9c3614bc..c542c9e1f 100644
--- a/data/templates/npc/monster/27024-UndeadPriest.xml
+++ b/data/templates/npc/monster/27024-UndeadPriest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27024" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27029-PhantomSalamander.xml b/data/templates/npc/monster/27029-PhantomSalamander.xml
index 6e61f8b38..4a7d9d19e 100644
--- a/data/templates/npc/monster/27029-PhantomSalamander.xml
+++ b/data/templates/npc/monster/27029-PhantomSalamander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27029" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27030-WaterSeer.xml b/data/templates/npc/monster/27030-WaterSeer.xml
index 628e9dabf..e4aaa2f83 100644
--- a/data/templates/npc/monster/27030-WaterSeer.xml
+++ b/data/templates/npc/monster/27030-WaterSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27030" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27031-OlMahumSentry.xml b/data/templates/npc/monster/27031-OlMahumSentry.xml
index 045ee4ab7..c314c2fad 100644
--- a/data/templates/npc/monster/27031-OlMahumSentry.xml
+++ b/data/templates/npc/monster/27031-OlMahumSentry.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27031" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27032-LizardmanWarrior.xml b/data/templates/npc/monster/27032-LizardmanWarrior.xml
index 4c2f459ac..5571a9016 100644
--- a/data/templates/npc/monster/27032-LizardmanWarrior.xml
+++ b/data/templates/npc/monster/27032-LizardmanWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27032" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27033-LizardmanScout.xml b/data/templates/npc/monster/27033-LizardmanScout.xml
index 0a881e462..e594d5520 100644
--- a/data/templates/npc/monster/27033-LizardmanScout.xml
+++ b/data/templates/npc/monster/27033-LizardmanScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27033" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27034-Lizardman.xml b/data/templates/npc/monster/27034-Lizardman.xml
index b9eb7c0a9..d00844d79 100644
--- a/data/templates/npc/monster/27034-Lizardman.xml
+++ b/data/templates/npc/monster/27034-Lizardman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27034" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27035-Tamil.xml b/data/templates/npc/monster/27035-Tamil.xml
index dc23524a1..b08705b62 100644
--- a/data/templates/npc/monster/27035-Tamil.xml
+++ b/data/templates/npc/monster/27035-Tamil.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27035" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27036-Calpico.xml b/data/templates/npc/monster/27036-Calpico.xml
index 6f0bde7c0..c84082ffe 100644
--- a/data/templates/npc/monster/27036-Calpico.xml
+++ b/data/templates/npc/monster/27036-Calpico.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27036" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27037-CalpicoSGoons.xml b/data/templates/npc/monster/27037-CalpicoSGoons.xml
index b35f17643..2e6746ac9 100644
--- a/data/templates/npc/monster/27037-CalpicoSGoons.xml
+++ b/data/templates/npc/monster/27037-CalpicoSGoons.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27037" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27038-CatSEyeBandit.xml b/data/templates/npc/monster/27038-CatSEyeBandit.xml
index 967edb85a..3486ff10c 100644
--- a/data/templates/npc/monster/27038-CatSEyeBandit.xml
+++ b/data/templates/npc/monster/27038-CatSEyeBandit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27038" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27041-BarankaSMessenger.xml b/data/templates/npc/monster/27041-BarankaSMessenger.xml
index 07e3debf6..e7056d46a 100644
--- a/data/templates/npc/monster/27041-BarankaSMessenger.xml
+++ b/data/templates/npc/monster/27041-BarankaSMessenger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27041" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27042-OrcEscort.xml b/data/templates/npc/monster/27042-OrcEscort.xml
index 57a22125d..93acb2dac 100644
--- a/data/templates/npc/monster/27042-OrcEscort.xml
+++ b/data/templates/npc/monster/27042-OrcEscort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27042" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27043-VarangkaSTracker.xml b/data/templates/npc/monster/27043-VarangkaSTracker.xml
index 556f8e4e7..58215ef00 100644
--- a/data/templates/npc/monster/27043-VarangkaSTracker.xml
+++ b/data/templates/npc/monster/27043-VarangkaSTracker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27043" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27044-KashaBearTotemSpirit.xml b/data/templates/npc/monster/27044-KashaBearTotemSpirit.xml
index 2293ac2e9..631ec6ddb 100644
--- a/data/templates/npc/monster/27044-KashaBearTotemSpirit.xml
+++ b/data/templates/npc/monster/27044-KashaBearTotemSpirit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27044" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27045-KurukaRatmanLeader.xml b/data/templates/npc/monster/27045-KurukaRatmanLeader.xml
index 0c969dede..f46073903 100644
--- a/data/templates/npc/monster/27045-KurukaRatmanLeader.xml
+++ b/data/templates/npc/monster/27045-KurukaRatmanLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27045" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27046-Sumi.xml b/data/templates/npc/monster/27046-Sumi.xml
index c7cb4de50..d614beacf 100644
--- a/data/templates/npc/monster/27046-Sumi.xml
+++ b/data/templates/npc/monster/27046-Sumi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27046" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27047-Wanuk.xml b/data/templates/npc/monster/27047-Wanuk.xml
index 748d13a4d..0c025705c 100644
--- a/data/templates/npc/monster/27047-Wanuk.xml
+++ b/data/templates/npc/monster/27047-Wanuk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27047" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27048-Chewba.xml b/data/templates/npc/monster/27048-Chewba.xml
index 64f929a08..62073d007 100644
--- a/data/templates/npc/monster/27048-Chewba.xml
+++ b/data/templates/npc/monster/27048-Chewba.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27048" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27049-Heitafu.xml b/data/templates/npc/monster/27049-Heitafu.xml
index 74f7bf342..51ba66a4c 100644
--- a/data/templates/npc/monster/27049-Heitafu.xml
+++ b/data/templates/npc/monster/27049-Heitafu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27049" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27050-Picubo.xml b/data/templates/npc/monster/27050-Picubo.xml
index ea7d35c45..179f75786 100644
--- a/data/templates/npc/monster/27050-Picubo.xml
+++ b/data/templates/npc/monster/27050-Picubo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27050" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27051-Bumbum.xml b/data/templates/npc/monster/27051-Bumbum.xml
index e4a765bd9..eef620a1c 100644
--- a/data/templates/npc/monster/27051-Bumbum.xml
+++ b/data/templates/npc/monster/27051-Bumbum.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27051" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27052-Minsku.xml b/data/templates/npc/monster/27052-Minsku.xml
index 133d37f33..3604e3e99 100644
--- a/data/templates/npc/monster/27052-Minsku.xml
+++ b/data/templates/npc/monster/27052-Minsku.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27052" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27053-Chuchu.xml b/data/templates/npc/monster/27053-Chuchu.xml
index eda615bc8..fe16fd40b 100644
--- a/data/templates/npc/monster/27053-Chuchu.xml
+++ b/data/templates/npc/monster/27053-Chuchu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27053" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27054-UmbarOrc.xml b/data/templates/npc/monster/27054-UmbarOrc.xml
index 1b6bdc7a0..63529991c 100644
--- a/data/templates/npc/monster/27054-UmbarOrc.xml
+++ b/data/templates/npc/monster/27054-UmbarOrc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27054" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27055-Zakan.xml b/data/templates/npc/monster/27055-Zakan.xml
index b5a763ad5..66148fdc3 100644
--- a/data/templates/npc/monster/27055-Zakan.xml
+++ b/data/templates/npc/monster/27055-Zakan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27055" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27056-DurkaSpirit.xml b/data/templates/npc/monster/27056-DurkaSpirit.xml
index e1538da79..819f8b986 100644
--- a/data/templates/npc/monster/27056-DurkaSpirit.xml
+++ b/data/templates/npc/monster/27056-DurkaSpirit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27056" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27058-HoneyBear.xml b/data/templates/npc/monster/27058-HoneyBear.xml
index 39628f608..893e74149 100644
--- a/data/templates/npc/monster/27058-HoneyBear.xml
+++ b/data/templates/npc/monster/27058-HoneyBear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27058" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27059-Uoph.xml b/data/templates/npc/monster/27059-Uoph.xml
index b223a7f2d..8e27ba11f 100644
--- a/data/templates/npc/monster/27059-Uoph.xml
+++ b/data/templates/npc/monster/27059-Uoph.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27059" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27060-Kracha.xml b/data/templates/npc/monster/27060-Kracha.xml
index 0ad2dd7fa..297772a68 100644
--- a/data/templates/npc/monster/27060-Kracha.xml
+++ b/data/templates/npc/monster/27060-Kracha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27060" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27061-Batoh.xml b/data/templates/npc/monster/27061-Batoh.xml
index c4e170487..5431dbb28 100644
--- a/data/templates/npc/monster/27061-Batoh.xml
+++ b/data/templates/npc/monster/27061-Batoh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27061" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27062-Tanukia.xml b/data/templates/npc/monster/27062-Tanukia.xml
index fe220d71a..09143aedc 100644
--- a/data/templates/npc/monster/27062-Tanukia.xml
+++ b/data/templates/npc/monster/27062-Tanukia.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27062" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27063-TanukiaSWarhound.xml b/data/templates/npc/monster/27063-TanukiaSWarhound.xml
index 84b510ced..f177b0a46 100644
--- a/data/templates/npc/monster/27063-TanukiaSWarhound.xml
+++ b/data/templates/npc/monster/27063-TanukiaSWarhound.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27063" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27064-Turel.xml b/data/templates/npc/monster/27064-Turel.xml
index 252eb59f9..4e47f5f2b 100644
--- a/data/templates/npc/monster/27064-Turel.xml
+++ b/data/templates/npc/monster/27064-Turel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27064" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27065-Roko.xml b/data/templates/npc/monster/27065-Roko.xml
index 2e6857557..27c3aa716 100644
--- a/data/templates/npc/monster/27065-Roko.xml
+++ b/data/templates/npc/monster/27065-Roko.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27065" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27066-RokoSWarhound.xml b/data/templates/npc/monster/27066-RokoSWarhound.xml
index 612262ac8..132fd2bd3 100644
--- a/data/templates/npc/monster/27066-RokoSWarhound.xml
+++ b/data/templates/npc/monster/27066-RokoSWarhound.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27066" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27067-Kamut.xml b/data/templates/npc/monster/27067-Kamut.xml
index a6a8bc720..af2d70d67 100644
--- a/data/templates/npc/monster/27067-Kamut.xml
+++ b/data/templates/npc/monster/27067-Kamut.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27067" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27068-Murtika.xml b/data/templates/npc/monster/27068-Murtika.xml
index 93e1ceeb5..409edf4a9 100644
--- a/data/templates/npc/monster/27068-Murtika.xml
+++ b/data/templates/npc/monster/27068-Murtika.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27068" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27069-MurtikaSWarhound.xml b/data/templates/npc/monster/27069-MurtikaSWarhound.xml
index cf1e94993..e95e7a5a0 100644
--- a/data/templates/npc/monster/27069-MurtikaSWarhound.xml
+++ b/data/templates/npc/monster/27069-MurtikaSWarhound.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27069" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27070-TumranOrcBrigand.xml b/data/templates/npc/monster/27070-TumranOrcBrigand.xml
index 65af2b958..34d1bac19 100644
--- a/data/templates/npc/monster/27070-TumranOrcBrigand.xml
+++ b/data/templates/npc/monster/27070-TumranOrcBrigand.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27070" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27077-UnicornOfEva.xml b/data/templates/npc/monster/27077-UnicornOfEva.xml
index b17cdbe44..b1853c199 100644
--- a/data/templates/npc/monster/27077-UnicornOfEva.xml
+++ b/data/templates/npc/monster/27077-UnicornOfEva.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27077" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27078-TrimdenLord.xml b/data/templates/npc/monster/27078-TrimdenLord.xml
index 524af6168..42e252bbf 100644
--- a/data/templates/npc/monster/27078-TrimdenLord.xml
+++ b/data/templates/npc/monster/27078-TrimdenLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27078" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27079-BlackWillowLurker.xml b/data/templates/npc/monster/27079-BlackWillowLurker.xml
index 840b0a2fa..b8f2df37b 100644
--- a/data/templates/npc/monster/27079-BlackWillowLurker.xml
+++ b/data/templates/npc/monster/27079-BlackWillowLurker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27079" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27080-PashikaSonOfVoltar.xml b/data/templates/npc/monster/27080-PashikaSonOfVoltar.xml
index d5163771c..aa2225e4f 100644
--- a/data/templates/npc/monster/27080-PashikaSonOfVoltar.xml
+++ b/data/templates/npc/monster/27080-PashikaSonOfVoltar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27080" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27081-VultusSonOfVoltar.xml b/data/templates/npc/monster/27081-VultusSonOfVoltar.xml
index e4086f47e..ebbe432be 100644
--- a/data/templates/npc/monster/27081-VultusSonOfVoltar.xml
+++ b/data/templates/npc/monster/27081-VultusSonOfVoltar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27081" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27082-EnkuOrcOverlord.xml b/data/templates/npc/monster/27082-EnkuOrcOverlord.xml
index 1dbf8e824..4b0e69569 100644
--- a/data/templates/npc/monster/27082-EnkuOrcOverlord.xml
+++ b/data/templates/npc/monster/27082-EnkuOrcOverlord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27082" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27083-MakumBugbearThug.xml b/data/templates/npc/monster/27083-MakumBugbearThug.xml
index b1d52e884..2019ff588 100644
--- a/data/templates/npc/monster/27083-MakumBugbearThug.xml
+++ b/data/templates/npc/monster/27083-MakumBugbearThug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27083" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27086-RevenantOfTantosChief.xml b/data/templates/npc/monster/27086-RevenantOfTantosChief.xml
index af79bce55..2bf70a18e 100644
--- a/data/templates/npc/monster/27086-RevenantOfTantosChief.xml
+++ b/data/templates/npc/monster/27086-RevenantOfTantosChief.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27086" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27088-HarpyMatriarch.xml b/data/templates/npc/monster/27088-HarpyMatriarch.xml
index 6b0a65a17..85fb3ce6c 100644
--- a/data/templates/npc/monster/27088-HarpyMatriarch.xml
+++ b/data/templates/npc/monster/27088-HarpyMatriarch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27088" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27089-RoadCollector.xml b/data/templates/npc/monster/27089-RoadCollector.xml
index c01c23829..7708409ad 100644
--- a/data/templates/npc/monster/27089-RoadCollector.xml
+++ b/data/templates/npc/monster/27089-RoadCollector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27089" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27090-SerpentDemonKadesh.xml b/data/templates/npc/monster/27090-SerpentDemonKadesh.xml
index 4bb30e507..6003d4f0a 100644
--- a/data/templates/npc/monster/27090-SerpentDemonKadesh.xml
+++ b/data/templates/npc/monster/27090-SerpentDemonKadesh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27090" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27092-NeerBodyguard.xml b/data/templates/npc/monster/27092-NeerBodyguard.xml
index e9c6e1585..a50657dc5 100644
--- a/data/templates/npc/monster/27092-NeerBodyguard.xml
+++ b/data/templates/npc/monster/27092-NeerBodyguard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27092" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27093-DeluChiefKalkis.xml b/data/templates/npc/monster/27093-DeluChiefKalkis.xml
index 8f2efa7c6..ec9fbf4e9 100644
--- a/data/templates/npc/monster/27093-DeluChiefKalkis.xml
+++ b/data/templates/npc/monster/27093-DeluChiefKalkis.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27093" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27094-DeluLizardmanAssassin.xml b/data/templates/npc/monster/27094-DeluLizardmanAssassin.xml
index 0a7cc452e..72bf4d905 100644
--- a/data/templates/npc/monster/27094-DeluLizardmanAssassin.xml
+++ b/data/templates/npc/monster/27094-DeluLizardmanAssassin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27094" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27095-SingingFlowerPhantasm.xml b/data/templates/npc/monster/27095-SingingFlowerPhantasm.xml
index b87d05409..410aefe7b 100644
--- a/data/templates/npc/monster/27095-SingingFlowerPhantasm.xml
+++ b/data/templates/npc/monster/27095-SingingFlowerPhantasm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27095" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27096-SingingFlowerNightmare.xml b/data/templates/npc/monster/27096-SingingFlowerNightmare.xml
index 9416de374..14b3764b3 100644
--- a/data/templates/npc/monster/27096-SingingFlowerNightmare.xml
+++ b/data/templates/npc/monster/27096-SingingFlowerNightmare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27096" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27097-SingingFlowerDarkling.xml b/data/templates/npc/monster/27097-SingingFlowerDarkling.xml
index fec5da013..ad6ac36bc 100644
--- a/data/templates/npc/monster/27097-SingingFlowerDarkling.xml
+++ b/data/templates/npc/monster/27097-SingingFlowerDarkling.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27097" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27098-GhostFire.xml b/data/templates/npc/monster/27098-GhostFire.xml
index bd3ef8551..93f4f168f 100644
--- a/data/templates/npc/monster/27098-GhostFire.xml
+++ b/data/templates/npc/monster/27098-GhostFire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27098" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27099-NamelessRevenant.xml b/data/templates/npc/monster/27099-NamelessRevenant.xml
index 12fcde4fc..013fcacba 100644
--- a/data/templates/npc/monster/27099-NamelessRevenant.xml
+++ b/data/templates/npc/monster/27099-NamelessRevenant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27099" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27100-SkeletalMercenary.xml b/data/templates/npc/monster/27100-SkeletalMercenary.xml
index a54f60b54..503b53fc6 100644
--- a/data/templates/npc/monster/27100-SkeletalMercenary.xml
+++ b/data/templates/npc/monster/27100-SkeletalMercenary.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27100" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27101-DrevanulPrinceZeruel.xml b/data/templates/npc/monster/27101-DrevanulPrinceZeruel.xml
index 43a8ffea7..34938b9c3 100644
--- a/data/templates/npc/monster/27101-DrevanulPrinceZeruel.xml
+++ b/data/templates/npc/monster/27101-DrevanulPrinceZeruel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27101" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27102-PakoTheCat.xml b/data/templates/npc/monster/27102-PakoTheCat.xml
index 9de7c257b..3c3a3f8f7 100644
--- a/data/templates/npc/monster/27102-PakoTheCat.xml
+++ b/data/templates/npc/monster/27102-PakoTheCat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27102" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27103-UnicornRacer.xml b/data/templates/npc/monster/27103-UnicornRacer.xml
index 93b22dd19..d39432ba1 100644
--- a/data/templates/npc/monster/27103-UnicornRacer.xml
+++ b/data/templates/npc/monster/27103-UnicornRacer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27103" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27104-ShadowTuren.xml b/data/templates/npc/monster/27104-ShadowTuren.xml
index 18cd9d655..47870ab22 100644
--- a/data/templates/npc/monster/27104-ShadowTuren.xml
+++ b/data/templates/npc/monster/27104-ShadowTuren.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27104" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27105-MimiTheCat.xml b/data/templates/npc/monster/27105-MimiTheCat.xml
index 20dc4eeee..e1a7c896f 100644
--- a/data/templates/npc/monster/27105-MimiTheCat.xml
+++ b/data/templates/npc/monster/27105-MimiTheCat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27105" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27106-UnicornPhantasm.xml b/data/templates/npc/monster/27106-UnicornPhantasm.xml
index 0e35e0822..286244f07 100644
--- a/data/templates/npc/monster/27106-UnicornPhantasm.xml
+++ b/data/templates/npc/monster/27106-UnicornPhantasm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27106" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27107-SilhouetteTilfo.xml b/data/templates/npc/monster/27107-SilhouetteTilfo.xml
index fe4abbee4..8b5202f72 100644
--- a/data/templates/npc/monster/27107-SilhouetteTilfo.xml
+++ b/data/templates/npc/monster/27107-SilhouetteTilfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27107" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27108-StenoaGorgonQueen.xml b/data/templates/npc/monster/27108-StenoaGorgonQueen.xml
index f8e243e9e..e7e90a305 100644
--- a/data/templates/npc/monster/27108-StenoaGorgonQueen.xml
+++ b/data/templates/npc/monster/27108-StenoaGorgonQueen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27108" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27109-HandmaidenOfStenoa.xml b/data/templates/npc/monster/27109-HandmaidenOfStenoa.xml
index 8c4694077..0abcddbe1 100644
--- a/data/templates/npc/monster/27109-HandmaidenOfStenoa.xml
+++ b/data/templates/npc/monster/27109-HandmaidenOfStenoa.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27109" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27110-Shyslassys.xml b/data/templates/npc/monster/27110-Shyslassys.xml
index cf18759e0..d55378775 100644
--- a/data/templates/npc/monster/27110-Shyslassys.xml
+++ b/data/templates/npc/monster/27110-Shyslassys.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27110" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27111-CaveBasilisk.xml b/data/templates/npc/monster/27111-CaveBasilisk.xml
index a27d1f984..a22c8e3f8 100644
--- a/data/templates/npc/monster/27111-CaveBasilisk.xml
+++ b/data/templates/npc/monster/27111-CaveBasilisk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27111" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27112-Gorr.xml b/data/templates/npc/monster/27112-Gorr.xml
index 589f86375..0271c884f 100644
--- a/data/templates/npc/monster/27112-Gorr.xml
+++ b/data/templates/npc/monster/27112-Gorr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27112" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27113-Baraham.xml b/data/templates/npc/monster/27113-Baraham.xml
index 15be75c2a..8ac1c4172 100644
--- a/data/templates/npc/monster/27113-Baraham.xml
+++ b/data/templates/npc/monster/27113-Baraham.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27113" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27114-SuccubusQueen.xml b/data/templates/npc/monster/27114-SuccubusQueen.xml
index 8ace5bdbb..6d68db461 100644
--- a/data/templates/npc/monster/27114-SuccubusQueen.xml
+++ b/data/templates/npc/monster/27114-SuccubusQueen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27114" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27115-ClawOfSuccubus.xml b/data/templates/npc/monster/27115-ClawOfSuccubus.xml
index 4a08b0795..454c31041 100644
--- a/data/templates/npc/monster/27115-ClawOfSuccubus.xml
+++ b/data/templates/npc/monster/27115-ClawOfSuccubus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27115" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27116-LavaSalamander.xml b/data/templates/npc/monster/27116-LavaSalamander.xml
index ec8fbe7a1..33185fc28 100644
--- a/data/templates/npc/monster/27116-LavaSalamander.xml
+++ b/data/templates/npc/monster/27116-LavaSalamander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27116" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27117-Nahir.xml b/data/templates/npc/monster/27117-Nahir.xml
index d22cc08d3..7285bb24e 100644
--- a/data/templates/npc/monster/27117-Nahir.xml
+++ b/data/templates/npc/monster/27117-Nahir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27117" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27118-BlackWillow.xml b/data/templates/npc/monster/27118-BlackWillow.xml
index 7ba5bc38c..69b1dd64f 100644
--- a/data/templates/npc/monster/27118-BlackWillow.xml
+++ b/data/templates/npc/monster/27118-BlackWillow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27118" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27119-SpiritOfSirHerod.xml b/data/templates/npc/monster/27119-SpiritOfSirHerod.xml
index ba27f6fbc..7f1f870a4 100644
--- a/data/templates/npc/monster/27119-SpiritOfSirHerod.xml
+++ b/data/templates/npc/monster/27119-SpiritOfSirHerod.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27119" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27120-LuellOfZephyrWinds.xml b/data/templates/npc/monster/27120-LuellOfZephyrWinds.xml
index 93a788c15..2b851e982 100644
--- a/data/templates/npc/monster/27120-LuellOfZephyrWinds.xml
+++ b/data/templates/npc/monster/27120-LuellOfZephyrWinds.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27120" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27121-ActeaOfVerdantWilds.xml b/data/templates/npc/monster/27121-ActeaOfVerdantWilds.xml
index e297f2fc0..a4e8b3c25 100644
--- a/data/templates/npc/monster/27121-ActeaOfVerdantWilds.xml
+++ b/data/templates/npc/monster/27121-ActeaOfVerdantWilds.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27121" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27122-LetoLizardmanAgent.xml b/data/templates/npc/monster/27122-LetoLizardmanAgent.xml
index 09f5cc665..6e2d43610 100644
--- a/data/templates/npc/monster/27122-LetoLizardmanAgent.xml
+++ b/data/templates/npc/monster/27122-LetoLizardmanAgent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27122" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27123-LetoLizardmanLeader.xml b/data/templates/npc/monster/27123-LetoLizardmanLeader.xml
index dc2fb518f..4f6aa60e4 100644
--- a/data/templates/npc/monster/27123-LetoLizardmanLeader.xml
+++ b/data/templates/npc/monster/27123-LetoLizardmanLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27123" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27124-LetoLizardmanAssassin.xml b/data/templates/npc/monster/27124-LetoLizardmanAssassin.xml
index 63e16a7c6..4f2e96371 100644
--- a/data/templates/npc/monster/27124-LetoLizardmanAssassin.xml
+++ b/data/templates/npc/monster/27124-LetoLizardmanAssassin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27124" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27125-LetoLizardmanSniper.xml b/data/templates/npc/monster/27125-LetoLizardmanSniper.xml
index 6ead3d7b6..6f3adda21 100644
--- a/data/templates/npc/monster/27125-LetoLizardmanSniper.xml
+++ b/data/templates/npc/monster/27125-LetoLizardmanSniper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27125" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27126-LetoLizardmanWizard.xml b/data/templates/npc/monster/27126-LetoLizardmanWizard.xml
index f1f1be171..1029c09e8 100644
--- a/data/templates/npc/monster/27126-LetoLizardmanWizard.xml
+++ b/data/templates/npc/monster/27126-LetoLizardmanWizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27126" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27127-LetoLizardmanLord.xml b/data/templates/npc/monster/27127-LetoLizardmanLord.xml
index c0a14f793..dfe6cb12e 100644
--- a/data/templates/npc/monster/27127-LetoLizardmanLord.xml
+++ b/data/templates/npc/monster/27127-LetoLizardmanLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27127" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27128-Aruraune.xml b/data/templates/npc/monster/27128-Aruraune.xml
index 3eba34a79..8abcebcf2 100644
--- a/data/templates/npc/monster/27128-Aruraune.xml
+++ b/data/templates/npc/monster/27128-Aruraune.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27128" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27129-OlMahumInspector.xml b/data/templates/npc/monster/27129-OlMahumInspector.xml
index 36fd064c5..67bb76dd1 100644
--- a/data/templates/npc/monster/27129-OlMahumInspector.xml
+++ b/data/templates/npc/monster/27129-OlMahumInspector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27129" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27130-OlMahumBetrayer.xml b/data/templates/npc/monster/27130-OlMahumBetrayer.xml
index 3d4718aec..d1542ef6d 100644
--- a/data/templates/npc/monster/27130-OlMahumBetrayer.xml
+++ b/data/templates/npc/monster/27130-OlMahumBetrayer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27130" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27131-CrimsonWerewolf.xml b/data/templates/npc/monster/27131-CrimsonWerewolf.xml
index 97baee086..46d21dcc1 100644
--- a/data/templates/npc/monster/27131-CrimsonWerewolf.xml
+++ b/data/templates/npc/monster/27131-CrimsonWerewolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27131" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27132-KrudelLizardman.xml b/data/templates/npc/monster/27132-KrudelLizardman.xml
index 058979d3b..ecfa6e527 100644
--- a/data/templates/npc/monster/27132-KrudelLizardman.xml
+++ b/data/templates/npc/monster/27132-KrudelLizardman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27132" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27133-EvilEyeLord.xml b/data/templates/npc/monster/27133-EvilEyeLord.xml
index 7f87be20a..35f12613b 100644
--- a/data/templates/npc/monster/27133-EvilEyeLord.xml
+++ b/data/templates/npc/monster/27133-EvilEyeLord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27133" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27134-Tatoma.xml b/data/templates/npc/monster/27134-Tatoma.xml
index 05032dd6b..6986834a9 100644
--- a/data/templates/npc/monster/27134-Tatoma.xml
+++ b/data/templates/npc/monster/27134-Tatoma.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27134" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27135-Grima.xml b/data/templates/npc/monster/27135-Grima.xml
index 16aef4986..c30102db3 100644
--- a/data/templates/npc/monster/27135-Grima.xml
+++ b/data/templates/npc/monster/27135-Grima.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27135" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27136-SuccubusOfSeduction.xml b/data/templates/npc/monster/27136-SuccubusOfSeduction.xml
index 9962df3bf..023ccfa25 100644
--- a/data/templates/npc/monster/27136-SuccubusOfSeduction.xml
+++ b/data/templates/npc/monster/27136-SuccubusOfSeduction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27136" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27137-DemonKing.xml b/data/templates/npc/monster/27137-DemonKing.xml
index 5909b37fc..9e5754892 100644
--- a/data/templates/npc/monster/27137-DemonKing.xml
+++ b/data/templates/npc/monster/27137-DemonKing.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27137" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27138-GreatDemonKing.xml b/data/templates/npc/monster/27138-GreatDemonKing.xml
index 1765fceee..e390fd666 100644
--- a/data/templates/npc/monster/27138-GreatDemonKing.xml
+++ b/data/templates/npc/monster/27138-GreatDemonKing.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27138" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27139-SecretKeeperTree.xml b/data/templates/npc/monster/27139-SecretKeeperTree.xml
index d9da1eb24..dc83b5905 100644
--- a/data/templates/npc/monster/27139-SecretKeeperTree.xml
+++ b/data/templates/npc/monster/27139-SecretKeeperTree.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27139" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27140-BrekaOverlordHaka.xml b/data/templates/npc/monster/27140-BrekaOverlordHaka.xml
index 90c8a2155..1e9b004ac 100644
--- a/data/templates/npc/monster/27140-BrekaOverlordHaka.xml
+++ b/data/templates/npc/monster/27140-BrekaOverlordHaka.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27140" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27141-BrekaOverlordJaka.xml b/data/templates/npc/monster/27141-BrekaOverlordJaka.xml
index 3641ef9d8..8d1f9a28f 100644
--- a/data/templates/npc/monster/27141-BrekaOverlordJaka.xml
+++ b/data/templates/npc/monster/27141-BrekaOverlordJaka.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27141" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27142-BrekaOverlordMarka.xml b/data/templates/npc/monster/27142-BrekaOverlordMarka.xml
index c9fbeeef9..73c5d4a47 100644
--- a/data/templates/npc/monster/27142-BrekaOverlordMarka.xml
+++ b/data/templates/npc/monster/27142-BrekaOverlordMarka.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27142" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27143-WindsusAleph.xml b/data/templates/npc/monster/27143-WindsusAleph.xml
index 0ede73901..5073eeb87 100644
--- a/data/templates/npc/monster/27143-WindsusAleph.xml
+++ b/data/templates/npc/monster/27143-WindsusAleph.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27143" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27144-TarlkRaiderAthu.xml b/data/templates/npc/monster/27144-TarlkRaiderAthu.xml
index 6ac9fc878..2e36c3203 100644
--- a/data/templates/npc/monster/27144-TarlkRaiderAthu.xml
+++ b/data/templates/npc/monster/27144-TarlkRaiderAthu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27144" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27145-TarlkRaiderLanka.xml b/data/templates/npc/monster/27145-TarlkRaiderLanka.xml
index 46d1d9ef7..67fe031e5 100644
--- a/data/templates/npc/monster/27145-TarlkRaiderLanka.xml
+++ b/data/templates/npc/monster/27145-TarlkRaiderLanka.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27145" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27146-TarlkRaiderTriska.xml b/data/templates/npc/monster/27146-TarlkRaiderTriska.xml
index e4e07e5d3..cbe729de5 100644
--- a/data/templates/npc/monster/27146-TarlkRaiderTriska.xml
+++ b/data/templates/npc/monster/27146-TarlkRaiderTriska.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27146" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27147-TarlkRaiderMotura.xml b/data/templates/npc/monster/27147-TarlkRaiderMotura.xml
index 0c113985b..d93587a80 100644
--- a/data/templates/npc/monster/27147-TarlkRaiderMotura.xml
+++ b/data/templates/npc/monster/27147-TarlkRaiderMotura.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27147" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27148-TarlkRaiderKalath.xml b/data/templates/npc/monster/27148-TarlkRaiderKalath.xml
index c68982a9d..666422b8c 100644
--- a/data/templates/npc/monster/27148-TarlkRaiderKalath.xml
+++ b/data/templates/npc/monster/27148-TarlkRaiderKalath.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27148" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27149-GremlinFilcher.xml b/data/templates/npc/monster/27149-GremlinFilcher.xml
index ec158202d..174ae6f2e 100644
--- a/data/templates/npc/monster/27149-GremlinFilcher.xml
+++ b/data/templates/npc/monster/27149-GremlinFilcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27149" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27150-BlackLegionStormtrooper.xml b/data/templates/npc/monster/27150-BlackLegionStormtrooper.xml
index 06d8e2050..98eadc61b 100644
--- a/data/templates/npc/monster/27150-BlackLegionStormtrooper.xml
+++ b/data/templates/npc/monster/27150-BlackLegionStormtrooper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27150" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27151-DeluLizardmanHeadhunter.xml b/data/templates/npc/monster/27151-DeluLizardmanHeadhunter.xml
index 00b86c695..7b1864fb2 100644
--- a/data/templates/npc/monster/27151-DeluLizardmanHeadhunter.xml
+++ b/data/templates/npc/monster/27151-DeluLizardmanHeadhunter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27151" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27152-MarshStakatoMarquess.xml b/data/templates/npc/monster/27152-MarshStakatoMarquess.xml
index ab910bf87..d9adbeeea 100644
--- a/data/templates/npc/monster/27152-MarshStakatoMarquess.xml
+++ b/data/templates/npc/monster/27152-MarshStakatoMarquess.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27152" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27153-AlexandroSanches.xml b/data/templates/npc/monster/27153-AlexandroSanches.xml
index 3d68c337f..143d60b94 100644
--- a/data/templates/npc/monster/27153-AlexandroSanches.xml
+++ b/data/templates/npc/monster/27153-AlexandroSanches.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27153" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27154-Bonaparterius.xml b/data/templates/npc/monster/27154-Bonaparterius.xml
index 3b8f8adda..53a4f7c4d 100644
--- a/data/templates/npc/monster/27154-Bonaparterius.xml
+++ b/data/templates/npc/monster/27154-Bonaparterius.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27154" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27155-Ramsebalius.xml b/data/templates/npc/monster/27155-Ramsebalius.xml
index 78984cae1..ff2025df3 100644
--- a/data/templates/npc/monster/27155-Ramsebalius.xml
+++ b/data/templates/npc/monster/27155-Ramsebalius.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27155" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27156-LetoShamanKetz.xml b/data/templates/npc/monster/27156-LetoShamanKetz.xml
index 6e47386dc..95fcfb719 100644
--- a/data/templates/npc/monster/27156-LetoShamanKetz.xml
+++ b/data/templates/npc/monster/27156-LetoShamanKetz.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27156" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27157-LetoChiefNarak.xml b/data/templates/npc/monster/27157-LetoChiefNarak.xml
index 6dc6c5e47..40aae27ef 100644
--- a/data/templates/npc/monster/27157-LetoChiefNarak.xml
+++ b/data/templates/npc/monster/27157-LetoChiefNarak.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27157" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27158-TimakRaiderKaikee.xml b/data/templates/npc/monster/27158-TimakRaiderKaikee.xml
index 07adf38fc..7b1d63ad4 100644
--- a/data/templates/npc/monster/27158-TimakRaiderKaikee.xml
+++ b/data/templates/npc/monster/27158-TimakRaiderKaikee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27158" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27159-TimakOverlordOkun.xml b/data/templates/npc/monster/27159-TimakOverlordOkun.xml
index 4c2d1eac9..d04d97dd1 100644
--- a/data/templates/npc/monster/27159-TimakOverlordOkun.xml
+++ b/data/templates/npc/monster/27159-TimakOverlordOkun.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27159" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27160-GokMagok.xml b/data/templates/npc/monster/27160-GokMagok.xml
index 3224c291b..016bd8953 100644
--- a/data/templates/npc/monster/27160-GokMagok.xml
+++ b/data/templates/npc/monster/27160-GokMagok.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27160" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27161-TaikOverlordKakran.xml b/data/templates/npc/monster/27161-TaikOverlordKakran.xml
index 7f7a00119..7bda4a0b6 100644
--- a/data/templates/npc/monster/27161-TaikOverlordKakran.xml
+++ b/data/templates/npc/monster/27161-TaikOverlordKakran.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27161" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27162-HatarChieftainKubel.xml b/data/templates/npc/monster/27162-HatarChieftainKubel.xml
index 29fc43cc0..0c5174aeb 100644
--- a/data/templates/npc/monster/27162-HatarChieftainKubel.xml
+++ b/data/templates/npc/monster/27162-HatarChieftainKubel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27162" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27163-VanorElderKerunos.xml b/data/templates/npc/monster/27163-VanorElderKerunos.xml
index 934329543..564a57990 100644
--- a/data/templates/npc/monster/27163-VanorElderKerunos.xml
+++ b/data/templates/npc/monster/27163-VanorElderKerunos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27163" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27164-KarulChiefOrooto.xml b/data/templates/npc/monster/27164-KarulChiefOrooto.xml
index 53a3244c1..084b5b252 100644
--- a/data/templates/npc/monster/27164-KarulChiefOrooto.xml
+++ b/data/templates/npc/monster/27164-KarulChiefOrooto.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27164" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27165-AbyssalJewel1.xml b/data/templates/npc/monster/27165-AbyssalJewel1.xml
index af13b5db3..ebc3c6a31 100644
--- a/data/templates/npc/monster/27165-AbyssalJewel1.xml
+++ b/data/templates/npc/monster/27165-AbyssalJewel1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27165" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27166-AbyssalJewel2.xml b/data/templates/npc/monster/27166-AbyssalJewel2.xml
index e4053639a..4a1880578 100644
--- a/data/templates/npc/monster/27166-AbyssalJewel2.xml
+++ b/data/templates/npc/monster/27166-AbyssalJewel2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27166" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27167-AbyssalJewel3.xml b/data/templates/npc/monster/27167-AbyssalJewel3.xml
index 849b5d03c..1911bf424 100644
--- a/data/templates/npc/monster/27167-AbyssalJewel3.xml
+++ b/data/templates/npc/monster/27167-AbyssalJewel3.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27167" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27168-JewelGuardianMara.xml b/data/templates/npc/monster/27168-JewelGuardianMara.xml
index f713ead78..2b2f3490f 100644
--- a/data/templates/npc/monster/27168-JewelGuardianMara.xml
+++ b/data/templates/npc/monster/27168-JewelGuardianMara.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27168" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27169-JewelGuardianMusfel.xml b/data/templates/npc/monster/27169-JewelGuardianMusfel.xml
index 040a48fc3..f45e4ab5f 100644
--- a/data/templates/npc/monster/27169-JewelGuardianMusfel.xml
+++ b/data/templates/npc/monster/27169-JewelGuardianMusfel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27169" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27170-JewelGuardianPyton.xml b/data/templates/npc/monster/27170-JewelGuardianPyton.xml
index 4eadc3860..78fceb23b 100644
--- a/data/templates/npc/monster/27170-JewelGuardianPyton.xml
+++ b/data/templates/npc/monster/27170-JewelGuardianPyton.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27170" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27171-SacrificeOfTheSacrificed.xml b/data/templates/npc/monster/27171-SacrificeOfTheSacrificed.xml
index 10341282a..1c2d1d922 100644
--- a/data/templates/npc/monster/27171-SacrificeOfTheSacrificed.xml
+++ b/data/templates/npc/monster/27171-SacrificeOfTheSacrificed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27171" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27172-HaritLizardmanZealot.xml b/data/templates/npc/monster/27172-HaritLizardmanZealot.xml
index 4a6e197b3..814dbc482 100644
--- a/data/templates/npc/monster/27172-HaritLizardmanZealot.xml
+++ b/data/templates/npc/monster/27172-HaritLizardmanZealot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27172" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27173-BoxOfAthrea1.xml b/data/templates/npc/monster/27173-BoxOfAthrea1.xml
index d8a600184..925eb0a66 100644
--- a/data/templates/npc/monster/27173-BoxOfAthrea1.xml
+++ b/data/templates/npc/monster/27173-BoxOfAthrea1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27173" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27174-BoxOfAthrea2.xml b/data/templates/npc/monster/27174-BoxOfAthrea2.xml
index 2778a0e5b..2a2b4772a 100644
--- a/data/templates/npc/monster/27174-BoxOfAthrea2.xml
+++ b/data/templates/npc/monster/27174-BoxOfAthrea2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27174" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27175-BoxOfAthrea3.xml b/data/templates/npc/monster/27175-BoxOfAthrea3.xml
index 4c645d26c..5acdaf759 100644
--- a/data/templates/npc/monster/27175-BoxOfAthrea3.xml
+++ b/data/templates/npc/monster/27175-BoxOfAthrea3.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27175" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27176-BoxOfAthrea4.xml b/data/templates/npc/monster/27176-BoxOfAthrea4.xml
index 1ab13d1d2..140b22f81 100644
--- a/data/templates/npc/monster/27176-BoxOfAthrea4.xml
+++ b/data/templates/npc/monster/27176-BoxOfAthrea4.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27176" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27177-BoxOfAthrea5.xml b/data/templates/npc/monster/27177-BoxOfAthrea5.xml
index 1a94307dd..160c9ad64 100644
--- a/data/templates/npc/monster/27177-BoxOfAthrea5.xml
+++ b/data/templates/npc/monster/27177-BoxOfAthrea5.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27177" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27178-BlitzWyrm.xml b/data/templates/npc/monster/27178-BlitzWyrm.xml
index 909e2c8e8..630bea1b4 100644
--- a/data/templates/npc/monster/27178-BlitzWyrm.xml
+++ b/data/templates/npc/monster/27178-BlitzWyrm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27178" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27179-GraveKeymaster.xml b/data/templates/npc/monster/27179-GraveKeymaster.xml
index 007b4752f..673cf5d1d 100644
--- a/data/templates/npc/monster/27179-GraveKeymaster.xml
+++ b/data/templates/npc/monster/27179-GraveKeymaster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27179" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27180-ImperialSlave.xml b/data/templates/npc/monster/27180-ImperialSlave.xml
index e5d341542..501083c03 100644
--- a/data/templates/npc/monster/27180-ImperialSlave.xml
+++ b/data/templates/npc/monster/27180-ImperialSlave.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27180" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27181-ImperialGravekeeper.xml b/data/templates/npc/monster/27181-ImperialGravekeeper.xml
index 35162ecb3..544413a52 100644
--- a/data/templates/npc/monster/27181-ImperialGravekeeper.xml
+++ b/data/templates/npc/monster/27181-ImperialGravekeeper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27181" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27182-ArkGuardianElberoth.xml b/data/templates/npc/monster/27182-ArkGuardianElberoth.xml
index e376fe3a2..b02b6c9d6 100644
--- a/data/templates/npc/monster/27182-ArkGuardianElberoth.xml
+++ b/data/templates/npc/monster/27182-ArkGuardianElberoth.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27182" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27183-ArkGuardianShadowfang.xml b/data/templates/npc/monster/27183-ArkGuardianShadowfang.xml
index 818d045ff..5ed2a64da 100644
--- a/data/templates/npc/monster/27183-ArkGuardianShadowfang.xml
+++ b/data/templates/npc/monster/27183-ArkGuardianShadowfang.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27183" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27184-AngelKiller.xml b/data/templates/npc/monster/27184-AngelKiller.xml
index bc162947f..bff83b60d 100644
--- a/data/templates/npc/monster/27184-AngelKiller.xml
+++ b/data/templates/npc/monster/27184-AngelKiller.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27184" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27185-FairyTreeOfWind.xml b/data/templates/npc/monster/27185-FairyTreeOfWind.xml
index e74461d11..2aedb3019 100644
--- a/data/templates/npc/monster/27185-FairyTreeOfWind.xml
+++ b/data/templates/npc/monster/27185-FairyTreeOfWind.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27185" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27186-FairyTreeOfStar.xml b/data/templates/npc/monster/27186-FairyTreeOfStar.xml
index a57b3bae4..387eef25d 100644
--- a/data/templates/npc/monster/27186-FairyTreeOfStar.xml
+++ b/data/templates/npc/monster/27186-FairyTreeOfStar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27186" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27187-FairyTreeOfTwilight.xml b/data/templates/npc/monster/27187-FairyTreeOfTwilight.xml
index 6ba91bc56..a67252cdc 100644
--- a/data/templates/npc/monster/27187-FairyTreeOfTwilight.xml
+++ b/data/templates/npc/monster/27187-FairyTreeOfTwilight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27187" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27188-FairyTreeOfAbyss.xml b/data/templates/npc/monster/27188-FairyTreeOfAbyss.xml
index 344c27918..2d3de2d92 100644
--- a/data/templates/npc/monster/27188-FairyTreeOfAbyss.xml
+++ b/data/templates/npc/monster/27188-FairyTreeOfAbyss.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27188" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27189-SoulOfTreeGuardian.xml b/data/templates/npc/monster/27189-SoulOfTreeGuardian.xml
index a74fcc5b4..7260dc273 100644
--- a/data/templates/npc/monster/27189-SoulOfTreeGuardian.xml
+++ b/data/templates/npc/monster/27189-SoulOfTreeGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27189" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27190-OlMahumSupportTroop.xml b/data/templates/npc/monster/27190-OlMahumSupportTroop.xml
index ea267179b..656da342b 100644
--- a/data/templates/npc/monster/27190-OlMahumSupportTroop.xml
+++ b/data/templates/npc/monster/27190-OlMahumSupportTroop.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27190" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27191-Malcom.xml b/data/templates/npc/monster/27191-Malcom.xml
index b1a39337c..06a004a3d 100644
--- a/data/templates/npc/monster/27191-Malcom.xml
+++ b/data/templates/npc/monster/27191-Malcom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27191" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27192-SuccubusHandmaiden.xml b/data/templates/npc/monster/27192-SuccubusHandmaiden.xml
index 1f70ebc0b..fd8f5ccc2 100644
--- a/data/templates/npc/monster/27192-SuccubusHandmaiden.xml
+++ b/data/templates/npc/monster/27192-SuccubusHandmaiden.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27192" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27193-GoblinServant.xml b/data/templates/npc/monster/27193-GoblinServant.xml
index f66ed2306..d84a59b70 100644
--- a/data/templates/npc/monster/27193-GoblinServant.xml
+++ b/data/templates/npc/monster/27193-GoblinServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27193" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27194-JulieTheRipper.xml b/data/templates/npc/monster/27194-JulieTheRipper.xml
index d43de8525..645d3bfc2 100644
--- a/data/templates/npc/monster/27194-JulieTheRipper.xml
+++ b/data/templates/npc/monster/27194-JulieTheRipper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27194" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27195-MaleAnt.xml b/data/templates/npc/monster/27195-MaleAnt.xml
index e47b87d96..cbc52b655 100644
--- a/data/templates/npc/monster/27195-MaleAnt.xml
+++ b/data/templates/npc/monster/27195-MaleAnt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27195" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27196-BluebackedAlligator.xml b/data/templates/npc/monster/27196-BluebackedAlligator.xml
index e216a535f..08649139c 100644
--- a/data/templates/npc/monster/27196-BluebackedAlligator.xml
+++ b/data/templates/npc/monster/27196-BluebackedAlligator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27196" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27197-BejewelledAlligator.xml b/data/templates/npc/monster/27197-BejewelledAlligator.xml
index 643ddf082..40ef03fe8 100644
--- a/data/templates/npc/monster/27197-BejewelledAlligator.xml
+++ b/data/templates/npc/monster/27197-BejewelledAlligator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27197" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27199-CrimsonWerewolf.xml b/data/templates/npc/monster/27199-CrimsonWerewolf.xml
index 6769b2bbf..d4eb630e1 100644
--- a/data/templates/npc/monster/27199-CrimsonWerewolf.xml
+++ b/data/templates/npc/monster/27199-CrimsonWerewolf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27199" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27200-KrudelLizardman.xml b/data/templates/npc/monster/27200-KrudelLizardman.xml
index 4ac5266b2..6f23a7224 100644
--- a/data/templates/npc/monster/27200-KrudelLizardman.xml
+++ b/data/templates/npc/monster/27200-KrudelLizardman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27200" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27201.xml b/data/templates/npc/monster/27201.xml
index 7f70dae81..814b2064e 100644
--- a/data/templates/npc/monster/27201.xml
+++ b/data/templates/npc/monster/27201.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27201" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27202.xml b/data/templates/npc/monster/27202.xml
index e1284d489..c5baaf153 100644
--- a/data/templates/npc/monster/27202.xml
+++ b/data/templates/npc/monster/27202.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27202" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27203.xml b/data/templates/npc/monster/27203.xml
index 5530f7df4..9dbbbf546 100644
--- a/data/templates/npc/monster/27203.xml
+++ b/data/templates/npc/monster/27203.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27203" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27204.xml b/data/templates/npc/monster/27204.xml
index ca978fad9..32c5ad9c6 100644
--- a/data/templates/npc/monster/27204.xml
+++ b/data/templates/npc/monster/27204.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27204" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27205.xml b/data/templates/npc/monster/27205.xml
index 4504bbf3e..9e2f20dab 100644
--- a/data/templates/npc/monster/27205.xml
+++ b/data/templates/npc/monster/27205.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27205" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27206.xml b/data/templates/npc/monster/27206.xml
index 4f789c1d1..1786eeb1f 100644
--- a/data/templates/npc/monster/27206.xml
+++ b/data/templates/npc/monster/27206.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27206" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27207.xml b/data/templates/npc/monster/27207.xml
index 0859df301..6d43913b7 100644
--- a/data/templates/npc/monster/27207.xml
+++ b/data/templates/npc/monster/27207.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27207" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27208.xml b/data/templates/npc/monster/27208.xml
index a7509b1fa..9990d7855 100644
--- a/data/templates/npc/monster/27208.xml
+++ b/data/templates/npc/monster/27208.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27208" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27209.xml b/data/templates/npc/monster/27209.xml
index 5659997aa..ed7cbf959 100644
--- a/data/templates/npc/monster/27209.xml
+++ b/data/templates/npc/monster/27209.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27209" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27210.xml b/data/templates/npc/monster/27210.xml
index b2b1d74ed..1b01776e8 100644
--- a/data/templates/npc/monster/27210.xml
+++ b/data/templates/npc/monster/27210.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27210" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27211.xml b/data/templates/npc/monster/27211.xml
index 0777fd093..2472c57f2 100644
--- a/data/templates/npc/monster/27211.xml
+++ b/data/templates/npc/monster/27211.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27211" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27212.xml b/data/templates/npc/monster/27212.xml
index 695704cd1..f93f57f3e 100644
--- a/data/templates/npc/monster/27212.xml
+++ b/data/templates/npc/monster/27212.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27212" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27213.xml b/data/templates/npc/monster/27213.xml
index 53285bd08..2841ffa19 100644
--- a/data/templates/npc/monster/27213.xml
+++ b/data/templates/npc/monster/27213.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27213" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27214-GuardianOfForbiddenKnowledge.xml b/data/templates/npc/monster/27214-GuardianOfForbiddenKnowledge.xml
index 15acc002d..bb4a7c2f2 100644
--- a/data/templates/npc/monster/27214-GuardianOfForbiddenKnowledge.xml
+++ b/data/templates/npc/monster/27214-GuardianOfForbiddenKnowledge.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27214" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27215-GuardianOfForbiddenKnowledge.xml b/data/templates/npc/monster/27215-GuardianOfForbiddenKnowledge.xml
index ad8556518..f3c5b5ccb 100644
--- a/data/templates/npc/monster/27215-GuardianOfForbiddenKnowledge.xml
+++ b/data/templates/npc/monster/27215-GuardianOfForbiddenKnowledge.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27215" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27216-GuardianOfForbiddenKnowledge.xml b/data/templates/npc/monster/27216-GuardianOfForbiddenKnowledge.xml
index 53e4f52d4..8bca817a8 100644
--- a/data/templates/npc/monster/27216-GuardianOfForbiddenKnowledge.xml
+++ b/data/templates/npc/monster/27216-GuardianOfForbiddenKnowledge.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27216" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27217-SoulOfWell.xml b/data/templates/npc/monster/27217-SoulOfWell.xml
index 07b8dc00a..f1641a419 100644
--- a/data/templates/npc/monster/27217-SoulOfWell.xml
+++ b/data/templates/npc/monster/27217-SoulOfWell.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27217" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27218-TriolSPawn.xml b/data/templates/npc/monster/27218-TriolSPawn.xml
index beb3178b7..b4dfdc462 100644
--- a/data/templates/npc/monster/27218-TriolSPawn.xml
+++ b/data/templates/npc/monster/27218-TriolSPawn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27218" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27219-ArchonOfHalisha.xml b/data/templates/npc/monster/27219-ArchonOfHalisha.xml
index eb65a9db5..129446f45 100644
--- a/data/templates/npc/monster/27219-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27219-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27219" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27220-ArchonOfHalisha.xml b/data/templates/npc/monster/27220-ArchonOfHalisha.xml
index e2e6388ec..a2883aa45 100644
--- a/data/templates/npc/monster/27220-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27220-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27220" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27221-ArchonOfHalisha.xml b/data/templates/npc/monster/27221-ArchonOfHalisha.xml
index 2e0070518..9ca2571b2 100644
--- a/data/templates/npc/monster/27221-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27221-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27221" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27222-ArchonOfHalisha.xml b/data/templates/npc/monster/27222-ArchonOfHalisha.xml
index d845d7c7f..5f997f852 100644
--- a/data/templates/npc/monster/27222-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27222-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27222" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27223-ArchonOfHalisha.xml b/data/templates/npc/monster/27223-ArchonOfHalisha.xml
index 95f6162cc..e982e62a2 100644
--- a/data/templates/npc/monster/27223-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27223-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27223" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27224-ArchonOfHalisha.xml b/data/templates/npc/monster/27224-ArchonOfHalisha.xml
index 438e268ce..c985ff1d8 100644
--- a/data/templates/npc/monster/27224-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27224-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27224" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27225-ArchonOfHalisha.xml b/data/templates/npc/monster/27225-ArchonOfHalisha.xml
index ef0720d38..dbb9b27d3 100644
--- a/data/templates/npc/monster/27225-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27225-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27225" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27226-ArchonOfHalisha.xml b/data/templates/npc/monster/27226-ArchonOfHalisha.xml
index df58bb9c3..b59d558ae 100644
--- a/data/templates/npc/monster/27226-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27226-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27226" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27227-ArchonOfHalisha.xml b/data/templates/npc/monster/27227-ArchonOfHalisha.xml
index f5996704b..f48d932be 100644
--- a/data/templates/npc/monster/27227-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27227-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27227" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27228-ArchonOfHalisha.xml b/data/templates/npc/monster/27228-ArchonOfHalisha.xml
index 7355300f2..bf047cf0c 100644
--- a/data/templates/npc/monster/27228-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27228-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27228" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27229-ArchonOfHalisha.xml b/data/templates/npc/monster/27229-ArchonOfHalisha.xml
index 8819b70c6..2b9b67fcf 100644
--- a/data/templates/npc/monster/27229-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27229-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27229" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27230-ArchonOfHalisha.xml b/data/templates/npc/monster/27230-ArchonOfHalisha.xml
index 7003271c2..5333002c8 100644
--- a/data/templates/npc/monster/27230-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27230-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27230" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27231-ArchonOfHalisha.xml b/data/templates/npc/monster/27231-ArchonOfHalisha.xml
index bd608510d..53303b997 100644
--- a/data/templates/npc/monster/27231-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27231-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27231" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27232-ArchonOfHalisha.xml b/data/templates/npc/monster/27232-ArchonOfHalisha.xml
index 930739546..afaf2af30 100644
--- a/data/templates/npc/monster/27232-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27232-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27232" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27233-ArchonOfHalisha.xml b/data/templates/npc/monster/27233-ArchonOfHalisha.xml
index a871a81f8..fdc6e46f3 100644
--- a/data/templates/npc/monster/27233-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27233-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27233" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27234-ArchonOfHalisha.xml b/data/templates/npc/monster/27234-ArchonOfHalisha.xml
index c130773a3..f8e57f6af 100644
--- a/data/templates/npc/monster/27234-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27234-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27234" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27235-ArchonOfHalisha.xml b/data/templates/npc/monster/27235-ArchonOfHalisha.xml
index aee4bd783..1000ff3a5 100644
--- a/data/templates/npc/monster/27235-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27235-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27235" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27236-ArchonOfHalisha.xml b/data/templates/npc/monster/27236-ArchonOfHalisha.xml
index fbd796853..bea13d252 100644
--- a/data/templates/npc/monster/27236-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27236-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27236" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27237-ArchonOfHalisha.xml b/data/templates/npc/monster/27237-ArchonOfHalisha.xml
index c571f6e33..265116b40 100644
--- a/data/templates/npc/monster/27237-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27237-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27237" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27238-ArchonOfHalisha.xml b/data/templates/npc/monster/27238-ArchonOfHalisha.xml
index 3e4224b7e..6d832ed81 100644
--- a/data/templates/npc/monster/27238-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27238-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27238" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27239-ArchonOfHalisha.xml b/data/templates/npc/monster/27239-ArchonOfHalisha.xml
index a0ab0698b..2ac5d6e2b 100644
--- a/data/templates/npc/monster/27239-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27239-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27239" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27240-ArchonOfHalisha.xml b/data/templates/npc/monster/27240-ArchonOfHalisha.xml
index c2a6a049b..49e58214a 100644
--- a/data/templates/npc/monster/27240-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27240-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27240" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27241-ArchonOfHalisha.xml b/data/templates/npc/monster/27241-ArchonOfHalisha.xml
index 8ddb54ddb..6316c97b8 100644
--- a/data/templates/npc/monster/27241-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27241-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27241" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27242-ArchonOfHalisha.xml b/data/templates/npc/monster/27242-ArchonOfHalisha.xml
index 6f60a0c2b..00f129a5f 100644
--- a/data/templates/npc/monster/27242-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27242-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27242" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27243-ArchonOfHalisha.xml b/data/templates/npc/monster/27243-ArchonOfHalisha.xml
index d69d92cee..e1bf0a4d4 100644
--- a/data/templates/npc/monster/27243-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27243-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27243" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27244-ArchonOfHalisha.xml b/data/templates/npc/monster/27244-ArchonOfHalisha.xml
index 7d4e1f258..b39025575 100644
--- a/data/templates/npc/monster/27244-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27244-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27244" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27245-ArchonOfHalisha.xml b/data/templates/npc/monster/27245-ArchonOfHalisha.xml
index a14e51e23..412116ca2 100644
--- a/data/templates/npc/monster/27245-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27245-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27245" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27246-ArchonOfHalisha.xml b/data/templates/npc/monster/27246-ArchonOfHalisha.xml
index 4924e5157..1bfb82d0a 100644
--- a/data/templates/npc/monster/27246-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27246-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27246" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27247-ArchonOfHalisha.xml b/data/templates/npc/monster/27247-ArchonOfHalisha.xml
index cd9294329..93d2e013b 100644
--- a/data/templates/npc/monster/27247-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27247-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27247" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27248-ArchonOfHalisha.xml b/data/templates/npc/monster/27248-ArchonOfHalisha.xml
index b08cc4af6..4e379be46 100644
--- a/data/templates/npc/monster/27248-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27248-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27248" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27249-ArchonOfHalisha.xml b/data/templates/npc/monster/27249-ArchonOfHalisha.xml
index 68b60f56c..137bc7a18 100644
--- a/data/templates/npc/monster/27249-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27249-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27249" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27250-FallenAngelAllector.xml b/data/templates/npc/monster/27250-FallenAngelAllector.xml
index eb724f9ae..f72732423 100644
--- a/data/templates/npc/monster/27250-FallenAngelAllector.xml
+++ b/data/templates/npc/monster/27250-FallenAngelAllector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27250" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27251-FallenAngelAllector.xml b/data/templates/npc/monster/27251-FallenAngelAllector.xml
index 8e220bbe4..faccec0c5 100644
--- a/data/templates/npc/monster/27251-FallenAngelAllector.xml
+++ b/data/templates/npc/monster/27251-FallenAngelAllector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27251" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27252-FallenAngelAllector.xml b/data/templates/npc/monster/27252-FallenAngelAllector.xml
index c0af983e4..57a75d55f 100644
--- a/data/templates/npc/monster/27252-FallenAngelAllector.xml
+++ b/data/templates/npc/monster/27252-FallenAngelAllector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27252" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27253-HellFire.xml b/data/templates/npc/monster/27253-HellFire.xml
index 2eca3dd08..f754afc20 100644
--- a/data/templates/npc/monster/27253-HellFire.xml
+++ b/data/templates/npc/monster/27253-HellFire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27253" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27254-UnknownStopper.xml b/data/templates/npc/monster/27254-UnknownStopper.xml
index 5a81e6013..56672b8ad 100644
--- a/data/templates/npc/monster/27254-UnknownStopper.xml
+++ b/data/templates/npc/monster/27254-UnknownStopper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27254" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27255-UnknownStopper.xml b/data/templates/npc/monster/27255-UnknownStopper.xml
index 8c6b13298..b39ecefd2 100644
--- a/data/templates/npc/monster/27255-UnknownStopper.xml
+++ b/data/templates/npc/monster/27255-UnknownStopper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27255" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27256-UnknownStopper.xml b/data/templates/npc/monster/27256-UnknownStopper.xml
index e3c57e3be..eae39fc54 100644
--- a/data/templates/npc/monster/27256-UnknownStopper.xml
+++ b/data/templates/npc/monster/27256-UnknownStopper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27256" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27257-ArchangelIconoclasis.xml b/data/templates/npc/monster/27257-ArchangelIconoclasis.xml
index a4513a96c..0118d3722 100644
--- a/data/templates/npc/monster/27257-ArchangelIconoclasis.xml
+++ b/data/templates/npc/monster/27257-ArchangelIconoclasis.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27257" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27258-ArchangelIconoclasis.xml b/data/templates/npc/monster/27258-ArchangelIconoclasis.xml
index 63f3ba848..064372048 100644
--- a/data/templates/npc/monster/27258-ArchangelIconoclasis.xml
+++ b/data/templates/npc/monster/27258-ArchangelIconoclasis.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27258" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27259-ArchangelIconoclasis.xml b/data/templates/npc/monster/27259-ArchangelIconoclasis.xml
index 286fb01fb..d32100a55 100644
--- a/data/templates/npc/monster/27259-ArchangelIconoclasis.xml
+++ b/data/templates/npc/monster/27259-ArchangelIconoclasis.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27259" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27260-ArchangelIconoclasis.xml b/data/templates/npc/monster/27260-ArchangelIconoclasis.xml
index 06feb7d3e..c6d6bb448 100644
--- a/data/templates/npc/monster/27260-ArchangelIconoclasis.xml
+++ b/data/templates/npc/monster/27260-ArchangelIconoclasis.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27260" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27261-BeadOfSacredFlame.xml b/data/templates/npc/monster/27261-BeadOfSacredFlame.xml
index 86f803d73..db1f75182 100644
--- a/data/templates/npc/monster/27261-BeadOfSacredFlame.xml
+++ b/data/templates/npc/monster/27261-BeadOfSacredFlame.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27261" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27262-DeathLordHallate.xml b/data/templates/npc/monster/27262-DeathLordHallate.xml
index 353541ebb..a56717b9d 100644
--- a/data/templates/npc/monster/27262-DeathLordHallate.xml
+++ b/data/templates/npc/monster/27262-DeathLordHallate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27262" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27263-DeathLordHallate.xml b/data/templates/npc/monster/27263-DeathLordHallate.xml
index 9c06134ca..2af14b9bd 100644
--- a/data/templates/npc/monster/27263-DeathLordHallate.xml
+++ b/data/templates/npc/monster/27263-DeathLordHallate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27263" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27264-DeathLordHallate.xml b/data/templates/npc/monster/27264-DeathLordHallate.xml
index 182aab6db..0d29378bd 100644
--- a/data/templates/npc/monster/27264-DeathLordHallate.xml
+++ b/data/templates/npc/monster/27264-DeathLordHallate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27264" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27265-LichKingIcarus.xml b/data/templates/npc/monster/27265-LichKingIcarus.xml
index e301c083e..4b1212f97 100644
--- a/data/templates/npc/monster/27265-LichKingIcarus.xml
+++ b/data/templates/npc/monster/27265-LichKingIcarus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27265" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27266-FallenAngelHaures.xml b/data/templates/npc/monster/27266-FallenAngelHaures.xml
index 91b7c9f6b..53fad3065 100644
--- a/data/templates/npc/monster/27266-FallenAngelHaures.xml
+++ b/data/templates/npc/monster/27266-FallenAngelHaures.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27266" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27267-FallenAngelHaures.xml b/data/templates/npc/monster/27267-FallenAngelHaures.xml
index 5fce2d603..c3884927f 100644
--- a/data/templates/npc/monster/27267-FallenAngelHaures.xml
+++ b/data/templates/npc/monster/27267-FallenAngelHaures.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27267" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27268-GuardOfHaures.xml b/data/templates/npc/monster/27268-GuardOfHaures.xml
index 6282d3b11..4e774f2d0 100644
--- a/data/templates/npc/monster/27268-GuardOfHaures.xml
+++ b/data/templates/npc/monster/27268-GuardOfHaures.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27268" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27269-FallenAngelNaverius.xml b/data/templates/npc/monster/27269-FallenAngelNaverius.xml
index 45ad0de5a..8293a6c0a 100644
--- a/data/templates/npc/monster/27269-FallenAngelNaverius.xml
+++ b/data/templates/npc/monster/27269-FallenAngelNaverius.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27269" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27270-FallenAngelNaverius.xml b/data/templates/npc/monster/27270-FallenAngelNaverius.xml
index b23a3fdb4..d519ac0a2 100644
--- a/data/templates/npc/monster/27270-FallenAngelNaverius.xml
+++ b/data/templates/npc/monster/27270-FallenAngelNaverius.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27270" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27271-ChimeraGolem.xml b/data/templates/npc/monster/27271-ChimeraGolem.xml
index dbeac0f4e..78782a347 100644
--- a/data/templates/npc/monster/27271-ChimeraGolem.xml
+++ b/data/templates/npc/monster/27271-ChimeraGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27271" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27272-HallateSDancerLillian.xml b/data/templates/npc/monster/27272-HallateSDancerLillian.xml
index b311f7f0e..a8d0bd9e0 100644
--- a/data/templates/npc/monster/27272-HallateSDancerLillian.xml
+++ b/data/templates/npc/monster/27272-HallateSDancerLillian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27272" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27273-AssassinPezel.xml b/data/templates/npc/monster/27273-AssassinPezel.xml
index 4c48a18a5..c0d05cd3a 100644
--- a/data/templates/npc/monster/27273-AssassinPezel.xml
+++ b/data/templates/npc/monster/27273-AssassinPezel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27273" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27274-FallenAngelTanakia.xml b/data/templates/npc/monster/27274-FallenAngelTanakia.xml
index df541b9f2..c83ef5535 100644
--- a/data/templates/npc/monster/27274-FallenAngelTanakia.xml
+++ b/data/templates/npc/monster/27274-FallenAngelTanakia.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27274" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27275-FallenAngelTanakia.xml b/data/templates/npc/monster/27275-FallenAngelTanakia.xml
index ab873a1d7..d16dfffe5 100644
--- a/data/templates/npc/monster/27275-FallenAngelTanakia.xml
+++ b/data/templates/npc/monster/27275-FallenAngelTanakia.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27275" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27276-FallenAngelTanakia.xml b/data/templates/npc/monster/27276-FallenAngelTanakia.xml
index 5ca76b2fd..95af2c89b 100644
--- a/data/templates/npc/monster/27276-FallenAngelTanakia.xml
+++ b/data/templates/npc/monster/27276-FallenAngelTanakia.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27276" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27277-FallenAngelTanakia.xml b/data/templates/npc/monster/27277-FallenAngelTanakia.xml
index ec8f786ad..b91c703de 100644
--- a/data/templates/npc/monster/27277-FallenAngelTanakia.xml
+++ b/data/templates/npc/monster/27277-FallenAngelTanakia.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27277" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27278-ShadowOfBeleth.xml b/data/templates/npc/monster/27278-ShadowOfBeleth.xml
index 72b1ee09e..a0314d97d 100644
--- a/data/templates/npc/monster/27278-ShadowOfBeleth.xml
+++ b/data/templates/npc/monster/27278-ShadowOfBeleth.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27278" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27279-CursedKesadein.xml b/data/templates/npc/monster/27279-CursedKesadein.xml
index 5ff3ab6ba..8996538df 100644
--- a/data/templates/npc/monster/27279-CursedKesadein.xml
+++ b/data/templates/npc/monster/27279-CursedKesadein.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27279" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27280-FallenAngelNarcissus.xml b/data/templates/npc/monster/27280-FallenAngelNarcissus.xml
index 49d9acefc..b6ee90882 100644
--- a/data/templates/npc/monster/27280-FallenAngelNarcissus.xml
+++ b/data/templates/npc/monster/27280-FallenAngelNarcissus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27280" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27281-FallenAngelMetellus.xml b/data/templates/npc/monster/27281-FallenAngelMetellus.xml
index f95339c90..d1e257ecf 100644
--- a/data/templates/npc/monster/27281-FallenAngelMetellus.xml
+++ b/data/templates/npc/monster/27281-FallenAngelMetellus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27281" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27282-DarkAngelOthiel.xml b/data/templates/npc/monster/27282-DarkAngelOthiel.xml
index 8b7d717b5..b1227ab37 100644
--- a/data/templates/npc/monster/27282-DarkAngelOthiel.xml
+++ b/data/templates/npc/monster/27282-DarkAngelOthiel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27282" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27283-GrandpapaAskalius.xml b/data/templates/npc/monster/27283-GrandpapaAskalius.xml
index bf22c4d84..3d2d89ef2 100644
--- a/data/templates/npc/monster/27283-GrandpapaAskalius.xml
+++ b/data/templates/npc/monster/27283-GrandpapaAskalius.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27283" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27284-FlameEvilSpiritAzira.xml b/data/templates/npc/monster/27284-FlameEvilSpiritAzira.xml
index 1817fa027..df80ca02b 100644
--- a/data/templates/npc/monster/27284-FlameEvilSpiritAzira.xml
+++ b/data/templates/npc/monster/27284-FlameEvilSpiritAzira.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27284" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27285-LizardSTotemSharuhi.xml b/data/templates/npc/monster/27285-LizardSTotemSharuhi.xml
index e39928438..f61281384 100644
--- a/data/templates/npc/monster/27285-LizardSTotemSharuhi.xml
+++ b/data/templates/npc/monster/27285-LizardSTotemSharuhi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27285" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27286-FallenKnightAdhil.xml b/data/templates/npc/monster/27286-FallenKnightAdhil.xml
index e40469561..2a7eddaf4 100644
--- a/data/templates/npc/monster/27286-FallenKnightAdhil.xml
+++ b/data/templates/npc/monster/27286-FallenKnightAdhil.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27286" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27287-BoundElfPanacea.xml b/data/templates/npc/monster/27287-BoundElfPanacea.xml
index 72177cc35..0898ac64d 100644
--- a/data/templates/npc/monster/27287-BoundElfPanacea.xml
+++ b/data/templates/npc/monster/27287-BoundElfPanacea.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27287" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27288-SwordPlayerBiel.xml b/data/templates/npc/monster/27288-SwordPlayerBiel.xml
index ba40dff99..c5b1d73c0 100644
--- a/data/templates/npc/monster/27288-SwordPlayerBiel.xml
+++ b/data/templates/npc/monster/27288-SwordPlayerBiel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27288" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27289-AncientSwordMasterIron.xml b/data/templates/npc/monster/27289-AncientSwordMasterIron.xml
index 605b9f9ce..79313f65b 100644
--- a/data/templates/npc/monster/27289-AncientSwordMasterIron.xml
+++ b/data/templates/npc/monster/27289-AncientSwordMasterIron.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27289" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27290-WhiteWingCommander.xml b/data/templates/npc/monster/27290-WhiteWingCommander.xml
index 10996e7b2..f0124b7dd 100644
--- a/data/templates/npc/monster/27290-WhiteWingCommander.xml
+++ b/data/templates/npc/monster/27290-WhiteWingCommander.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27290" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27291-WhiteWingFighter.xml b/data/templates/npc/monster/27291-WhiteWingFighter.xml
index 125afe69f..7b1fa9747 100644
--- a/data/templates/npc/monster/27291-WhiteWingFighter.xml
+++ b/data/templates/npc/monster/27291-WhiteWingFighter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27291" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27292-FallenNobleOrcMuhark.xml b/data/templates/npc/monster/27292-FallenNobleOrcMuhark.xml
index 8b3594a9f..619d6f570 100644
--- a/data/templates/npc/monster/27292-FallenNobleOrcMuhark.xml
+++ b/data/templates/npc/monster/27292-FallenNobleOrcMuhark.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27292" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27293-KhavatariUruz.xml b/data/templates/npc/monster/27293-KhavatariUruz.xml
index fa5b6803b..7c5ca41a3 100644
--- a/data/templates/npc/monster/27293-KhavatariUruz.xml
+++ b/data/templates/npc/monster/27293-KhavatariUruz.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27293" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27294-OverlordAtrus.xml b/data/templates/npc/monster/27294-OverlordAtrus.xml
index b6debf75f..268350509 100644
--- a/data/templates/npc/monster/27294-OverlordAtrus.xml
+++ b/data/templates/npc/monster/27294-OverlordAtrus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27294" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27295-SharuhiMouthMudaha.xml b/data/templates/npc/monster/27295-SharuhiMouthMudaha.xml
index 27178b7e6..e50d71de3 100644
--- a/data/templates/npc/monster/27295-SharuhiMouthMudaha.xml
+++ b/data/templates/npc/monster/27295-SharuhiMouthMudaha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27295" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27296-MonumentWatcherEzekiel.xml b/data/templates/npc/monster/27296-MonumentWatcherEzekiel.xml
index b382aad9d..500d4c04a 100644
--- a/data/templates/npc/monster/27296-MonumentWatcherEzekiel.xml
+++ b/data/templates/npc/monster/27296-MonumentWatcherEzekiel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27296" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27297-MonumentWatcherEzekiel.xml b/data/templates/npc/monster/27297-MonumentWatcherEzekiel.xml
index 48cd859c8..40d1165e5 100644
--- a/data/templates/npc/monster/27297-MonumentWatcherEzekiel.xml
+++ b/data/templates/npc/monster/27297-MonumentWatcherEzekiel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27297" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27298-MonumentWatcherEzekiel.xml b/data/templates/npc/monster/27298-MonumentWatcherEzekiel.xml
index 45e5d1c82..08a721cb0 100644
--- a/data/templates/npc/monster/27298-MonumentWatcherEzekiel.xml
+++ b/data/templates/npc/monster/27298-MonumentWatcherEzekiel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27298" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27299-MonumentWatcherEzekiel.xml b/data/templates/npc/monster/27299-MonumentWatcherEzekiel.xml
index 4530b76ce..09fdcdc65 100644
--- a/data/templates/npc/monster/27299-MonumentWatcherEzekiel.xml
+++ b/data/templates/npc/monster/27299-MonumentWatcherEzekiel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27299" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27300-MonumentWatcherEzekiel.xml b/data/templates/npc/monster/27300-MonumentWatcherEzekiel.xml
index 3fd5fb40e..0500dd3f1 100644
--- a/data/templates/npc/monster/27300-MonumentWatcherEzekiel.xml
+++ b/data/templates/npc/monster/27300-MonumentWatcherEzekiel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27300" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27301-MonumentWatcherEzekiel.xml b/data/templates/npc/monster/27301-MonumentWatcherEzekiel.xml
index 7ff7cb752..75395e8e9 100644
--- a/data/templates/npc/monster/27301-MonumentWatcherEzekiel.xml
+++ b/data/templates/npc/monster/27301-MonumentWatcherEzekiel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27301" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27302-MonumentDefenderAzrael.xml b/data/templates/npc/monster/27302-MonumentDefenderAzrael.xml
index c8c3505d5..de103bca5 100644
--- a/data/templates/npc/monster/27302-MonumentDefenderAzrael.xml
+++ b/data/templates/npc/monster/27302-MonumentDefenderAzrael.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27302" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27303-MonumentDefenderAzrael.xml b/data/templates/npc/monster/27303-MonumentDefenderAzrael.xml
index 4b4e2742d..7cc99d9b4 100644
--- a/data/templates/npc/monster/27303-MonumentDefenderAzrael.xml
+++ b/data/templates/npc/monster/27303-MonumentDefenderAzrael.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27303" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27304-MonumentDefenderAzrael.xml b/data/templates/npc/monster/27304-MonumentDefenderAzrael.xml
index 6d433a130..690674d82 100644
--- a/data/templates/npc/monster/27304-MonumentDefenderAzrael.xml
+++ b/data/templates/npc/monster/27304-MonumentDefenderAzrael.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27304" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27305-MonumentDefenderAzrael.xml b/data/templates/npc/monster/27305-MonumentDefenderAzrael.xml
index a9e872d01..d4f753f29 100644
--- a/data/templates/npc/monster/27305-MonumentDefenderAzrael.xml
+++ b/data/templates/npc/monster/27305-MonumentDefenderAzrael.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27305" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27306-MonumentDefenderAzrael.xml b/data/templates/npc/monster/27306-MonumentDefenderAzrael.xml
index cedac5fcb..a6f06ee11 100644
--- a/data/templates/npc/monster/27306-MonumentDefenderAzrael.xml
+++ b/data/templates/npc/monster/27306-MonumentDefenderAzrael.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27306" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27307-MonumentDefenderAzrael.xml b/data/templates/npc/monster/27307-MonumentDefenderAzrael.xml
index 11158f401..5c0d9bb37 100644
--- a/data/templates/npc/monster/27307-MonumentDefenderAzrael.xml
+++ b/data/templates/npc/monster/27307-MonumentDefenderAzrael.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27307" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27308-AssassinFrost.xml b/data/templates/npc/monster/27308-AssassinFrost.xml
index e46eff0da..c9802ff10 100644
--- a/data/templates/npc/monster/27308-AssassinFrost.xml
+++ b/data/templates/npc/monster/27308-AssassinFrost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27308" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27309-MinerviaVanHacken.xml b/data/templates/npc/monster/27309-MinerviaVanHacken.xml
index 6e7e60ee0..35654217a 100644
--- a/data/templates/npc/monster/27309-MinerviaVanHacken.xml
+++ b/data/templates/npc/monster/27309-MinerviaVanHacken.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27309" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27310-KitanisVanHacken.xml b/data/templates/npc/monster/27310-KitanisVanHacken.xml
index 869cb19bc..5f7faa619 100644
--- a/data/templates/npc/monster/27310-KitanisVanHacken.xml
+++ b/data/templates/npc/monster/27310-KitanisVanHacken.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27310" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27311-JudgmentHoundDogKelvas.xml b/data/templates/npc/monster/27311-JudgmentHoundDogKelvas.xml
index 0960e65aa..7baf38800 100644
--- a/data/templates/npc/monster/27311-JudgmentHoundDogKelvas.xml
+++ b/data/templates/npc/monster/27311-JudgmentHoundDogKelvas.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27311" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27312-MysteriousServitor.xml b/data/templates/npc/monster/27312-MysteriousServitor.xml
index 67d35985f..105622b5e 100644
--- a/data/templates/npc/monster/27312-MysteriousServitor.xml
+++ b/data/templates/npc/monster/27312-MysteriousServitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27312" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27313-VisionGuardianShakiel.xml b/data/templates/npc/monster/27313-VisionGuardianShakiel.xml
index 41ce15d53..89b45c43a 100644
--- a/data/templates/npc/monster/27313-VisionGuardianShakiel.xml
+++ b/data/templates/npc/monster/27313-VisionGuardianShakiel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27313" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27314-VisionGuardianShakiel.xml b/data/templates/npc/monster/27314-VisionGuardianShakiel.xml
index 6c6768747..47dfebe5d 100644
--- a/data/templates/npc/monster/27314-VisionGuardianShakiel.xml
+++ b/data/templates/npc/monster/27314-VisionGuardianShakiel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27314" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27315-VisionGuardianShakiel.xml b/data/templates/npc/monster/27315-VisionGuardianShakiel.xml
index 5381d3b19..34e7b9f50 100644
--- a/data/templates/npc/monster/27315-VisionGuardianShakiel.xml
+++ b/data/templates/npc/monster/27315-VisionGuardianShakiel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27315" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27316-FallenChieftainVegus.xml b/data/templates/npc/monster/27316-FallenChieftainVegus.xml
index b2db0f96d..1b8a8ac5c 100644
--- a/data/templates/npc/monster/27316-FallenChieftainVegus.xml
+++ b/data/templates/npc/monster/27316-FallenChieftainVegus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27316" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27317-RestrainerOfGlory.xml b/data/templates/npc/monster/27317-RestrainerOfGlory.xml
index aec49d950..c90c6690b 100644
--- a/data/templates/npc/monster/27317-RestrainerOfGlory.xml
+++ b/data/templates/npc/monster/27317-RestrainerOfGlory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27317" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27318-WendySGuardian.xml b/data/templates/npc/monster/27318-WendySGuardian.xml
index d7efc8930..5a6298874 100644
--- a/data/templates/npc/monster/27318-WendySGuardian.xml
+++ b/data/templates/npc/monster/27318-WendySGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27318" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27319-BlackLeopard.xml b/data/templates/npc/monster/27319-BlackLeopard.xml
index 4954b0fd4..f5c0249b8 100644
--- a/data/templates/npc/monster/27319-BlackLeopard.xml
+++ b/data/templates/npc/monster/27319-BlackLeopard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27319" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27320-TimoraOrc.xml b/data/templates/npc/monster/27320-TimoraOrc.xml
index a98dd72d7..ccc1ae663 100644
--- a/data/templates/npc/monster/27320-TimoraOrc.xml
+++ b/data/templates/npc/monster/27320-TimoraOrc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27320" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27321-BruinLizardman.xml b/data/templates/npc/monster/27321-BruinLizardman.xml
index 4aeef99fc..2ae2ad20e 100644
--- a/data/templates/npc/monster/27321-BruinLizardman.xml
+++ b/data/templates/npc/monster/27321-BruinLizardman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27321" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27322-PicotAraneid.xml b/data/templates/npc/monster/27322-PicotAraneid.xml
index 5be3acb9f..fd68588f9 100644
--- a/data/templates/npc/monster/27322-PicotAraneid.xml
+++ b/data/templates/npc/monster/27322-PicotAraneid.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27322" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27323-DivineEmissary.xml b/data/templates/npc/monster/27323-DivineEmissary.xml
index a0d64f9bb..2f5f18973 100644
--- a/data/templates/npc/monster/27323-DivineEmissary.xml
+++ b/data/templates/npc/monster/27323-DivineEmissary.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27323" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27324-VisionGuardEranus.xml b/data/templates/npc/monster/27324-VisionGuardEranus.xml
index 92c7062f4..e1ae3dbaa 100644
--- a/data/templates/npc/monster/27324-VisionGuardEranus.xml
+++ b/data/templates/npc/monster/27324-VisionGuardEranus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27324" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27325-ArchonOfHalisha.xml b/data/templates/npc/monster/27325-ArchonOfHalisha.xml
index 46dcdbfc2..be98e22fc 100644
--- a/data/templates/npc/monster/27325-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27325-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27325" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27326-ArchangelKanriel.xml b/data/templates/npc/monster/27326-ArchangelKanriel.xml
index 0cdfbe853..e86c4bca6 100644
--- a/data/templates/npc/monster/27326-ArchangelKanriel.xml
+++ b/data/templates/npc/monster/27326-ArchangelKanriel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27326" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27327-ZakorelSExecutor.xml b/data/templates/npc/monster/27327-ZakorelSExecutor.xml
index 7ce053967..99797f159 100644
--- a/data/templates/npc/monster/27327-ZakorelSExecutor.xml
+++ b/data/templates/npc/monster/27327-ZakorelSExecutor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27327" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27328-Zakorel.xml b/data/templates/npc/monster/27328-Zakorel.xml
index a99d820a2..4b43b2f6a 100644
--- a/data/templates/npc/monster/27328-Zakorel.xml
+++ b/data/templates/npc/monster/27328-Zakorel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27328" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27329-ArchonOfHalisha.xml b/data/templates/npc/monster/27329-ArchonOfHalisha.xml
index 470025caf..b003ac883 100644
--- a/data/templates/npc/monster/27329-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27329-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27329" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27332-GuardianAngel.xml b/data/templates/npc/monster/27332-GuardianAngel.xml
index 6a0005a83..d64ac05a5 100644
--- a/data/templates/npc/monster/27332-GuardianAngel.xml
+++ b/data/templates/npc/monster/27332-GuardianAngel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27332" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27333-CrimsonDuchess.xml b/data/templates/npc/monster/27333-CrimsonDuchess.xml
index 1dd5f3fe2..5b4f85c42 100644
--- a/data/templates/npc/monster/27333-CrimsonDuchess.xml
+++ b/data/templates/npc/monster/27333-CrimsonDuchess.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27333" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27334-ArchonOfHalisha.xml b/data/templates/npc/monster/27334-ArchonOfHalisha.xml
index 684d67d3e..56bc401eb 100644
--- a/data/templates/npc/monster/27334-ArchonOfHalisha.xml
+++ b/data/templates/npc/monster/27334-ArchonOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27334" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27335-DarkAngelOthiel.xml b/data/templates/npc/monster/27335-DarkAngelOthiel.xml
index c6223833f..66381385c 100644
--- a/data/templates/npc/monster/27335-DarkAngelOthiel.xml
+++ b/data/templates/npc/monster/27335-DarkAngelOthiel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27335" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27336-CrimsonLady.xml b/data/templates/npc/monster/27336-CrimsonLady.xml
index 128497a78..38e269ff3 100644
--- a/data/templates/npc/monster/27336-CrimsonLady.xml
+++ b/data/templates/npc/monster/27336-CrimsonLady.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27336" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27337-OlMahumOfficerTak.xml b/data/templates/npc/monster/27337-OlMahumOfficerTak.xml
index 4444b784c..7cd33aa40 100644
--- a/data/templates/npc/monster/27337-OlMahumOfficerTak.xml
+++ b/data/templates/npc/monster/27337-OlMahumOfficerTak.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27337" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27338-FallenAngel.xml b/data/templates/npc/monster/27338-FallenAngel.xml
index 823b632b4..13530a12b 100644
--- a/data/templates/npc/monster/27338-FallenAngel.xml
+++ b/data/templates/npc/monster/27338-FallenAngel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27338" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27339-CrumaMarshlandsTraitor.xml b/data/templates/npc/monster/27339-CrumaMarshlandsTraitor.xml
index 4d5b8b321..67a6d9304 100644
--- a/data/templates/npc/monster/27339-CrumaMarshlandsTraitor.xml
+++ b/data/templates/npc/monster/27339-CrumaMarshlandsTraitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27339" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27340-Pursuer.xml b/data/templates/npc/monster/27340-Pursuer.xml
index 21a443211..c6aec106c 100644
--- a/data/templates/npc/monster/27340-Pursuer.xml
+++ b/data/templates/npc/monster/27340-Pursuer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27340" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27341-ShilenSEvilThoughts.xml b/data/templates/npc/monster/27341-ShilenSEvilThoughts.xml
index f66b32433..81c63d74e 100644
--- a/data/templates/npc/monster/27341-ShilenSEvilThoughts.xml
+++ b/data/templates/npc/monster/27341-ShilenSEvilThoughts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27341" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27342-ShilenSEvilThoughts.xml b/data/templates/npc/monster/27342-ShilenSEvilThoughts.xml
index bd6983aaf..cac3ebecc 100644
--- a/data/templates/npc/monster/27342-ShilenSEvilThoughts.xml
+++ b/data/templates/npc/monster/27342-ShilenSEvilThoughts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27342" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27343-ShilenSEvilThoughts.xml b/data/templates/npc/monster/27343-ShilenSEvilThoughts.xml
index 5f9849afd..013aaaa6e 100644
--- a/data/templates/npc/monster/27343-ShilenSEvilThoughts.xml
+++ b/data/templates/npc/monster/27343-ShilenSEvilThoughts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27343" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27344-ShilenSEvilThoughts.xml b/data/templates/npc/monster/27344-ShilenSEvilThoughts.xml
index ff04bc3b3..ee97f9411 100644
--- a/data/templates/npc/monster/27344-ShilenSEvilThoughts.xml
+++ b/data/templates/npc/monster/27344-ShilenSEvilThoughts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27344" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27345-ShilenSEvilThoughts.xml b/data/templates/npc/monster/27345-ShilenSEvilThoughts.xml
index 8046357f7..289c691c9 100644
--- a/data/templates/npc/monster/27345-ShilenSEvilThoughts.xml
+++ b/data/templates/npc/monster/27345-ShilenSEvilThoughts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27345" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27346-ShilenSEvilThoughts.xml b/data/templates/npc/monster/27346-ShilenSEvilThoughts.xml
index 8232aafef..29f9b570a 100644
--- a/data/templates/npc/monster/27346-ShilenSEvilThoughts.xml
+++ b/data/templates/npc/monster/27346-ShilenSEvilThoughts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27346" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27347-GuardsOfTheDawnOracle.xml b/data/templates/npc/monster/27347-GuardsOfTheDawnOracle.xml
index a2410a15a..b4d798a52 100644
--- a/data/templates/npc/monster/27347-GuardsOfTheDawnOracle.xml
+++ b/data/templates/npc/monster/27347-GuardsOfTheDawnOracle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27347" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27348-GuardsOfTheDawnOracle.xml b/data/templates/npc/monster/27348-GuardsOfTheDawnOracle.xml
index 00e085fc7..00660464b 100644
--- a/data/templates/npc/monster/27348-GuardsOfTheDawnOracle.xml
+++ b/data/templates/npc/monster/27348-GuardsOfTheDawnOracle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27348" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27349-GuardsOfTheDawnOracle.xml b/data/templates/npc/monster/27349-GuardsOfTheDawnOracle.xml
index 530a354df..2ac6d3718 100644
--- a/data/templates/npc/monster/27349-GuardsOfTheDawnOracle.xml
+++ b/data/templates/npc/monster/27349-GuardsOfTheDawnOracle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27349" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27350-GuardsOfTheDawnOracle.xml b/data/templates/npc/monster/27350-GuardsOfTheDawnOracle.xml
index 4b3aca6e3..50c8bd507 100644
--- a/data/templates/npc/monster/27350-GuardsOfTheDawnOracle.xml
+++ b/data/templates/npc/monster/27350-GuardsOfTheDawnOracle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27350" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27351-GuardsOfTheDawn.xml b/data/templates/npc/monster/27351-GuardsOfTheDawn.xml
index 44ad95424..9e3065423 100644
--- a/data/templates/npc/monster/27351-GuardsOfTheDawn.xml
+++ b/data/templates/npc/monster/27351-GuardsOfTheDawn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27351" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27352-GuardsOfTheDawnOracle.xml b/data/templates/npc/monster/27352-GuardsOfTheDawnOracle.xml
index 5dbedde0a..d7c6d747d 100644
--- a/data/templates/npc/monster/27352-GuardsOfTheDawnOracle.xml
+++ b/data/templates/npc/monster/27352-GuardsOfTheDawnOracle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27352" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27353-LilimButcher.xml b/data/templates/npc/monster/27353-LilimButcher.xml
index 1237483da..1614f5948 100644
--- a/data/templates/npc/monster/27353-LilimButcher.xml
+++ b/data/templates/npc/monster/27353-LilimButcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27353" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27354-LilimMagus.xml b/data/templates/npc/monster/27354-LilimMagus.xml
index 67e198ca9..d72b1e266 100644
--- a/data/templates/npc/monster/27354-LilimMagus.xml
+++ b/data/templates/npc/monster/27354-LilimMagus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27354" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27355-LilimSlaveKnight.xml b/data/templates/npc/monster/27355-LilimSlaveKnight.xml
index a344e9a34..6e3e85c5a 100644
--- a/data/templates/npc/monster/27355-LilimSlaveKnight.xml
+++ b/data/templates/npc/monster/27355-LilimSlaveKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27355" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27356-LilimStabber.xml b/data/templates/npc/monster/27356-LilimStabber.xml
index 8a607626d..672920ad8 100644
--- a/data/templates/npc/monster/27356-LilimStabber.xml
+++ b/data/templates/npc/monster/27356-LilimStabber.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27356" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27357-LilimSeer.xml b/data/templates/npc/monster/27357-LilimSeer.xml
index 18d0868d3..263a5abab 100644
--- a/data/templates/npc/monster/27357-LilimSeer.xml
+++ b/data/templates/npc/monster/27357-LilimSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27357" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27358-LilimKnight.xml b/data/templates/npc/monster/27358-LilimKnight.xml
index 67d18e861..9123cd576 100644
--- a/data/templates/npc/monster/27358-LilimKnight.xml
+++ b/data/templates/npc/monster/27358-LilimKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27358" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27359-LilimAssassin.xml b/data/templates/npc/monster/27359-LilimAssassin.xml
index 0f1c608ea..41a473143 100644
--- a/data/templates/npc/monster/27359-LilimAssassin.xml
+++ b/data/templates/npc/monster/27359-LilimAssassin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27359" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27360-LilimGreatMagus.xml b/data/templates/npc/monster/27360-LilimGreatMagus.xml
index 19648285a..751855a01 100644
--- a/data/templates/npc/monster/27360-LilimGreatMagus.xml
+++ b/data/templates/npc/monster/27360-LilimGreatMagus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27360" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27361-LilimGuardKnight.xml b/data/templates/npc/monster/27361-LilimGuardKnight.xml
index d52baa532..b8e334fd0 100644
--- a/data/templates/npc/monster/27361-LilimGuardKnight.xml
+++ b/data/templates/npc/monster/27361-LilimGuardKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27361" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27362-LilimButcher.xml b/data/templates/npc/monster/27362-LilimButcher.xml
index 3d10a840b..55259b96b 100644
--- a/data/templates/npc/monster/27362-LilimButcher.xml
+++ b/data/templates/npc/monster/27362-LilimButcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27362" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27363-LilimMagus.xml b/data/templates/npc/monster/27363-LilimMagus.xml
index ff9b3498d..f112d91f6 100644
--- a/data/templates/npc/monster/27363-LilimMagus.xml
+++ b/data/templates/npc/monster/27363-LilimMagus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27363" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27364-LilimSlaveKnight.xml b/data/templates/npc/monster/27364-LilimSlaveKnight.xml
index 6887b1383..e7888dfcc 100644
--- a/data/templates/npc/monster/27364-LilimSlaveKnight.xml
+++ b/data/templates/npc/monster/27364-LilimSlaveKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27364" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27365-LilimStabber.xml b/data/templates/npc/monster/27365-LilimStabber.xml
index dd2539635..1ed1ba26e 100644
--- a/data/templates/npc/monster/27365-LilimStabber.xml
+++ b/data/templates/npc/monster/27365-LilimStabber.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27365" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27366-LilimSeer.xml b/data/templates/npc/monster/27366-LilimSeer.xml
index 66f8130f9..9da5f8d77 100644
--- a/data/templates/npc/monster/27366-LilimSeer.xml
+++ b/data/templates/npc/monster/27366-LilimSeer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27366" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27367-LilimKnight.xml b/data/templates/npc/monster/27367-LilimKnight.xml
index 0dea00bbe..ef806bcc7 100644
--- a/data/templates/npc/monster/27367-LilimKnight.xml
+++ b/data/templates/npc/monster/27367-LilimKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27367" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27368-LilimAssassin.xml b/data/templates/npc/monster/27368-LilimAssassin.xml
index 187eb36a3..3eaea261e 100644
--- a/data/templates/npc/monster/27368-LilimAssassin.xml
+++ b/data/templates/npc/monster/27368-LilimAssassin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27368" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27369-LilimGreatMagus.xml b/data/templates/npc/monster/27369-LilimGreatMagus.xml
index d90d48715..f7e805c4a 100644
--- a/data/templates/npc/monster/27369-LilimGreatMagus.xml
+++ b/data/templates/npc/monster/27369-LilimGreatMagus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27369" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27370-LilimGuardKnight.xml b/data/templates/npc/monster/27370-LilimGuardKnight.xml
index 705b34552..ce2f132c1 100644
--- a/data/templates/npc/monster/27370-LilimGuardKnight.xml
+++ b/data/templates/npc/monster/27370-LilimGuardKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27370" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27371-LilimButcher.xml b/data/templates/npc/monster/27371-LilimButcher.xml
index 5717d3acc..31bfafa18 100644
--- a/data/templates/npc/monster/27371-LilimButcher.xml
+++ b/data/templates/npc/monster/27371-LilimButcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27371" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27372-LilimMagus.xml b/data/templates/npc/monster/27372-LilimMagus.xml
index ff1c84689..540d58930 100644
--- a/data/templates/npc/monster/27372-LilimMagus.xml
+++ b/data/templates/npc/monster/27372-LilimMagus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27372" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27373-LilimSlaveKnight.xml b/data/templates/npc/monster/27373-LilimSlaveKnight.xml
index 7160417c7..750cc26b4 100644
--- a/data/templates/npc/monster/27373-LilimSlaveKnight.xml
+++ b/data/templates/npc/monster/27373-LilimSlaveKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27373" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27374-ShilenSEvilThoughts.xml b/data/templates/npc/monster/27374-ShilenSEvilThoughts.xml
index 437551adf..4e6b6f04a 100644
--- a/data/templates/npc/monster/27374-ShilenSEvilThoughts.xml
+++ b/data/templates/npc/monster/27374-ShilenSEvilThoughts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27374" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27375-ShilenSEvilThoughts.xml b/data/templates/npc/monster/27375-ShilenSEvilThoughts.xml
index e8ec21676..cf4cd7e24 100644
--- a/data/templates/npc/monster/27375-ShilenSEvilThoughts.xml
+++ b/data/templates/npc/monster/27375-ShilenSEvilThoughts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27375" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27376-LilimKnight.xml b/data/templates/npc/monster/27376-LilimKnight.xml
index b9a3ba71f..c52c933a3 100644
--- a/data/templates/npc/monster/27376-LilimKnight.xml
+++ b/data/templates/npc/monster/27376-LilimKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27376" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27377-LilimAssassin.xml b/data/templates/npc/monster/27377-LilimAssassin.xml
index a42904d6f..0cebacb35 100644
--- a/data/templates/npc/monster/27377-LilimAssassin.xml
+++ b/data/templates/npc/monster/27377-LilimAssassin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27377" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27378-LilimGreatMagus.xml b/data/templates/npc/monster/27378-LilimGreatMagus.xml
index c1a3d971f..6fc06e462 100644
--- a/data/templates/npc/monster/27378-LilimGreatMagus.xml
+++ b/data/templates/npc/monster/27378-LilimGreatMagus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27378" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27379-LilimGuardKnight.xml b/data/templates/npc/monster/27379-LilimGuardKnight.xml
index df5e0787c..ba1ceef1c 100644
--- a/data/templates/npc/monster/27379-LilimGuardKnight.xml
+++ b/data/templates/npc/monster/27379-LilimGuardKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27379" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27380-RecklessSpriteOfWater.xml b/data/templates/npc/monster/27380-RecklessSpriteOfWater.xml
index 8143b7e0f..1b24aa3d8 100644
--- a/data/templates/npc/monster/27380-RecklessSpriteOfWater.xml
+++ b/data/templates/npc/monster/27380-RecklessSpriteOfWater.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27380" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27381-RecklessSpriteOfAir.xml b/data/templates/npc/monster/27381-RecklessSpriteOfAir.xml
index a28a7970d..4b01b84ce 100644
--- a/data/templates/npc/monster/27381-RecklessSpriteOfAir.xml
+++ b/data/templates/npc/monster/27381-RecklessSpriteOfAir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27381" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27382-PowerOfSealIsolation.xml b/data/templates/npc/monster/27382-PowerOfSealIsolation.xml
index 4d19584bb..0e375714d 100644
--- a/data/templates/npc/monster/27382-PowerOfSealIsolation.xml
+++ b/data/templates/npc/monster/27382-PowerOfSealIsolation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27382" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27383-PowerOfSealIsolation.xml b/data/templates/npc/monster/27383-PowerOfSealIsolation.xml
index 2e551ed01..24f546d6f 100644
--- a/data/templates/npc/monster/27383-PowerOfSealIsolation.xml
+++ b/data/templates/npc/monster/27383-PowerOfSealIsolation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27383" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27384-SealDevice.xml b/data/templates/npc/monster/27384-SealDevice.xml
index 2fc2bb491..a68dee0a1 100644
--- a/data/templates/npc/monster/27384-SealDevice.xml
+++ b/data/templates/npc/monster/27384-SealDevice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27384" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27385-Lilith.xml b/data/templates/npc/monster/27385-Lilith.xml
index 97f80d74c..77ef4e632 100644
--- a/data/templates/npc/monster/27385-Lilith.xml
+++ b/data/templates/npc/monster/27385-Lilith.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27385" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="false" attackable="true">
diff --git a/data/templates/npc/monster/27386-LilithSSteward.xml b/data/templates/npc/monster/27386-LilithSSteward.xml
index e5f6c7829..b3dd79564 100644
--- a/data/templates/npc/monster/27386-LilithSSteward.xml
+++ b/data/templates/npc/monster/27386-LilithSSteward.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27386" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="false" attackable="true">
diff --git a/data/templates/npc/monster/27387-LilithSElite.xml b/data/templates/npc/monster/27387-LilithSElite.xml
index a49006aac..55a2f0bda 100644
--- a/data/templates/npc/monster/27387-LilithSElite.xml
+++ b/data/templates/npc/monster/27387-LilithSElite.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27387" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="false" attackable="true">
diff --git a/data/templates/npc/monster/27388-Anakim.xml b/data/templates/npc/monster/27388-Anakim.xml
index a611093dd..e5b598f2e 100644
--- a/data/templates/npc/monster/27388-Anakim.xml
+++ b/data/templates/npc/monster/27388-Anakim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27388" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="false" attackable="true">
diff --git a/data/templates/npc/monster/27389-AnakimSGuardian.xml b/data/templates/npc/monster/27389-AnakimSGuardian.xml
index d39472f0c..cec835110 100644
--- a/data/templates/npc/monster/27389-AnakimSGuardian.xml
+++ b/data/templates/npc/monster/27389-AnakimSGuardian.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27389" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="false" attackable="true">
diff --git a/data/templates/npc/monster/27390-AnakimSGuard.xml b/data/templates/npc/monster/27390-AnakimSGuard.xml
index d988fee34..10f088097 100644
--- a/data/templates/npc/monster/27390-AnakimSGuard.xml
+++ b/data/templates/npc/monster/27390-AnakimSGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27390" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="false" attackable="true">
diff --git a/data/templates/npc/monster/27391-AnakimSExecutor.xml b/data/templates/npc/monster/27391-AnakimSExecutor.xml
index 5f3e95fbc..c5b6fff0d 100644
--- a/data/templates/npc/monster/27391-AnakimSExecutor.xml
+++ b/data/templates/npc/monster/27391-AnakimSExecutor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27391" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="false" attackable="true">
diff --git a/data/templates/npc/monster/27392-BloodyAxeAide.xml b/data/templates/npc/monster/27392-BloodyAxeAide.xml
index 3ff3378c4..45b1f6936 100644
--- a/data/templates/npc/monster/27392-BloodyAxeAide.xml
+++ b/data/templates/npc/monster/27392-BloodyAxeAide.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27392" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27393-HeadlessKnight.xml b/data/templates/npc/monster/27393-HeadlessKnight.xml
index 00a9c086c..b90e3a78d 100644
--- a/data/templates/npc/monster/27393-HeadlessKnight.xml
+++ b/data/templates/npc/monster/27393-HeadlessKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27393" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27394-ShilenSEvilThoughts.xml b/data/templates/npc/monster/27394-ShilenSEvilThoughts.xml
index d5bc9ad5d..05da249e5 100644
--- a/data/templates/npc/monster/27394-ShilenSEvilThoughts.xml
+++ b/data/templates/npc/monster/27394-ShilenSEvilThoughts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27394" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27395-ShilenSEvilThoughts.xml b/data/templates/npc/monster/27395-ShilenSEvilThoughts.xml
index c93627319..109326a95 100644
--- a/data/templates/npc/monster/27395-ShilenSEvilThoughts.xml
+++ b/data/templates/npc/monster/27395-ShilenSEvilThoughts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27395" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27396-ShilenSEvilThoughts.xml b/data/templates/npc/monster/27396-ShilenSEvilThoughts.xml
index 48de0d95d..fc33f170f 100644
--- a/data/templates/npc/monster/27396-ShilenSEvilThoughts.xml
+++ b/data/templates/npc/monster/27396-ShilenSEvilThoughts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27396" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27397-ShilenSEvilThoughts.xml b/data/templates/npc/monster/27397-ShilenSEvilThoughts.xml
index 598c272e6..d209b2c5c 100644
--- a/data/templates/npc/monster/27397-ShilenSEvilThoughts.xml
+++ b/data/templates/npc/monster/27397-ShilenSEvilThoughts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27397" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27398-ShilenSEvilThoughts.xml b/data/templates/npc/monster/27398-ShilenSEvilThoughts.xml
index d998f3c95..c4d37751d 100644
--- a/data/templates/npc/monster/27398-ShilenSEvilThoughts.xml
+++ b/data/templates/npc/monster/27398-ShilenSEvilThoughts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27398" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27399-ShilenSEvilThoughts.xml b/data/templates/npc/monster/27399-ShilenSEvilThoughts.xml
index 76a2d2006..0dffb8b1a 100644
--- a/data/templates/npc/monster/27399-ShilenSEvilThoughts.xml
+++ b/data/templates/npc/monster/27399-ShilenSEvilThoughts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27399" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27400-ShilenSEvilThoughts.xml b/data/templates/npc/monster/27400-ShilenSEvilThoughts.xml
index ecc83390f..809ceb967 100644
--- a/data/templates/npc/monster/27400-ShilenSEvilThoughts.xml
+++ b/data/templates/npc/monster/27400-ShilenSEvilThoughts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27400" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27401-ShilenSEvilThoughts.xml b/data/templates/npc/monster/27401-ShilenSEvilThoughts.xml
index 1d1bdee79..6e99972a0 100644
--- a/data/templates/npc/monster/27401-ShilenSEvilThoughts.xml
+++ b/data/templates/npc/monster/27401-ShilenSEvilThoughts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27401" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/27402-ShilenSEvilThoughts.xml b/data/templates/npc/monster/27402-ShilenSEvilThoughts.xml
index b5c73b032..5469a771b 100644
--- a/data/templates/npc/monster/27402-ShilenSEvilThoughts.xml
+++ b/data/templates/npc/monster/27402-ShilenSEvilThoughts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="27402" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29002-QueenAntLarva.xml b/data/templates/npc/monster/29002-QueenAntLarva.xml
index 3ceb3b095..68b5b0f1f 100644
--- a/data/templates/npc/monster/29002-QueenAntLarva.xml
+++ b/data/templates/npc/monster/29002-QueenAntLarva.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29002" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29003-NurseAnt.xml b/data/templates/npc/monster/29003-NurseAnt.xml
index 77112c9f0..33defbe1d 100644
--- a/data/templates/npc/monster/29003-NurseAnt.xml
+++ b/data/templates/npc/monster/29003-NurseAnt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29003" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29004-GuardAnt.xml b/data/templates/npc/monster/29004-GuardAnt.xml
index 3ec415583..0d4521241 100644
--- a/data/templates/npc/monster/29004-GuardAnt.xml
+++ b/data/templates/npc/monster/29004-GuardAnt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29004" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29005-RoyalGuardAnt.xml b/data/templates/npc/monster/29005-RoyalGuardAnt.xml
index a7c899336..845976f94 100644
--- a/data/templates/npc/monster/29005-RoyalGuardAnt.xml
+++ b/data/templates/npc/monster/29005-RoyalGuardAnt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29005" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29007-DeathKnight.xml b/data/templates/npc/monster/29007-DeathKnight.xml
index 436c6ba1b..bacd1f995 100644
--- a/data/templates/npc/monster/29007-DeathKnight.xml
+++ b/data/templates/npc/monster/29007-DeathKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29007" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29008-DoomWraith.xml b/data/templates/npc/monster/29008-DoomWraith.xml
index 3429f3743..68dd08f06 100644
--- a/data/templates/npc/monster/29008-DoomWraith.xml
+++ b/data/templates/npc/monster/29008-DoomWraith.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29008" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29009-Dicor.xml b/data/templates/npc/monster/29009-Dicor.xml
index 0274d7782..fdf4c2e44 100644
--- a/data/templates/npc/monster/29009-Dicor.xml
+++ b/data/templates/npc/monster/29009-Dicor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29009" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29010-Validus.xml b/data/templates/npc/monster/29010-Validus.xml
index 958edb966..fd98e765f 100644
--- a/data/templates/npc/monster/29010-Validus.xml
+++ b/data/templates/npc/monster/29010-Validus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29010" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29011-Susceptor.xml b/data/templates/npc/monster/29011-Susceptor.xml
index 69b3b2b58..b039624dd 100644
--- a/data/templates/npc/monster/29011-Susceptor.xml
+++ b/data/templates/npc/monster/29011-Susceptor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29011" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29012-Perum.xml b/data/templates/npc/monster/29012-Perum.xml
index de8fcedb4..87f77a8a4 100644
--- a/data/templates/npc/monster/29012-Perum.xml
+++ b/data/templates/npc/monster/29012-Perum.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29012" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29013-Premo.xml b/data/templates/npc/monster/29013-Premo.xml
index 92bc9f7c7..83c314ed2 100644
--- a/data/templates/npc/monster/29013-Premo.xml
+++ b/data/templates/npc/monster/29013-Premo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29013" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29015-Raikel.xml b/data/templates/npc/monster/29015-Raikel.xml
index 7af58ed0c..71380f88e 100644
--- a/data/templates/npc/monster/29015-Raikel.xml
+++ b/data/templates/npc/monster/29015-Raikel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29015" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29016-RaikelLeos.xml b/data/templates/npc/monster/29016-RaikelLeos.xml
index 0afb05f36..9f5279cc5 100644
--- a/data/templates/npc/monster/29016-RaikelLeos.xml
+++ b/data/templates/npc/monster/29016-RaikelLeos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29016" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29017-Riba.xml b/data/templates/npc/monster/29017-Riba.xml
index 614bdb1ca..d9ce874ea 100644
--- a/data/templates/npc/monster/29017-Riba.xml
+++ b/data/templates/npc/monster/29017-Riba.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29017" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29018-RibaIren.xml b/data/templates/npc/monster/29018-RibaIren.xml
index 12ce1b9aa..27ebd5aff 100644
--- a/data/templates/npc/monster/29018-RibaIren.xml
+++ b/data/templates/npc/monster/29018-RibaIren.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29018" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29021-Archangel.xml b/data/templates/npc/monster/29021-Archangel.xml
index d3be29aea..a12cd3b3e 100644
--- a/data/templates/npc/monster/29021-Archangel.xml
+++ b/data/templates/npc/monster/29021-Archangel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29021" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29023-DollBlader.xml b/data/templates/npc/monster/29023-DollBlader.xml
index c4f58d7a7..43cecbb3b 100644
--- a/data/templates/npc/monster/29023-DollBlader.xml
+++ b/data/templates/npc/monster/29023-DollBlader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29023" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29024-ValeMaster.xml b/data/templates/npc/monster/29024-ValeMaster.xml
index 634b1b853..731ef65f6 100644
--- a/data/templates/npc/monster/29024-ValeMaster.xml
+++ b/data/templates/npc/monster/29024-ValeMaster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29024" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29026-PirateZombieCaptain.xml b/data/templates/npc/monster/29026-PirateZombieCaptain.xml
index 0cbf28620..f9a1ea697 100644
--- a/data/templates/npc/monster/29026-PirateZombieCaptain.xml
+++ b/data/templates/npc/monster/29026-PirateZombieCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29026" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29027-PirateZombie.xml b/data/templates/npc/monster/29027-PirateZombie.xml
index f5f50f32c..fa9c09f3a 100644
--- a/data/templates/npc/monster/29027-PirateZombie.xml
+++ b/data/templates/npc/monster/29027-PirateZombie.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29027" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29029-LavasaurusPustbon.xml b/data/templates/npc/monster/29029-LavasaurusPustbon.xml
index 81ed7c95f..d0e37e663 100644
--- a/data/templates/npc/monster/29029-LavasaurusPustbon.xml
+++ b/data/templates/npc/monster/29029-LavasaurusPustbon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29029" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="false" attackable="true">
diff --git a/data/templates/npc/monster/29031-KerinneSIfrit.xml b/data/templates/npc/monster/29031-KerinneSIfrit.xml
index 64750054f..aab22e5d7 100644
--- a/data/templates/npc/monster/29031-KerinneSIfrit.xml
+++ b/data/templates/npc/monster/29031-KerinneSIfrit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29031" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29032-KerinneSGolem.xml b/data/templates/npc/monster/29032-KerinneSGolem.xml
index 8efab6640..8f2c5c828 100644
--- a/data/templates/npc/monster/29032-KerinneSGolem.xml
+++ b/data/templates/npc/monster/29032-KerinneSGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29032" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29034-FrekiSIfrit.xml b/data/templates/npc/monster/29034-FrekiSIfrit.xml
index 061b6b595..3ec392fa2 100644
--- a/data/templates/npc/monster/29034-FrekiSIfrit.xml
+++ b/data/templates/npc/monster/29034-FrekiSIfrit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29034" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29035-FrekiSGolem.xml b/data/templates/npc/monster/29035-FrekiSGolem.xml
index ccbbe1d03..be466eab2 100644
--- a/data/templates/npc/monster/29035-FrekiSGolem.xml
+++ b/data/templates/npc/monster/29035-FrekiSGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29035" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29038-KinazSIfrit.xml b/data/templates/npc/monster/29038-KinazSIfrit.xml
index 35a84deda..51a0de35f 100644
--- a/data/templates/npc/monster/29038-KinazSIfrit.xml
+++ b/data/templates/npc/monster/29038-KinazSIfrit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29038" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29039-KinazSIfrit.xml b/data/templates/npc/monster/29039-KinazSIfrit.xml
index 191a818cc..f8edf1d0a 100644
--- a/data/templates/npc/monster/29039-KinazSIfrit.xml
+++ b/data/templates/npc/monster/29039-KinazSIfrit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29039" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29041-InfernoGolem.xml b/data/templates/npc/monster/29041-InfernoGolem.xml
index 0b568037d..e32f5edd2 100644
--- a/data/templates/npc/monster/29041-InfernoGolem.xml
+++ b/data/templates/npc/monster/29041-InfernoGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29041" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29042-InfernoGolem.xml b/data/templates/npc/monster/29042-InfernoGolem.xml
index 90f2bb2b5..68d0498c4 100644
--- a/data/templates/npc/monster/29042-InfernoGolem.xml
+++ b/data/templates/npc/monster/29042-InfernoGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29042" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29043-HowlingIfrit.xml b/data/templates/npc/monster/29043-HowlingIfrit.xml
index f32824792..d6794c738 100644
--- a/data/templates/npc/monster/29043-HowlingIfrit.xml
+++ b/data/templates/npc/monster/29043-HowlingIfrit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29043" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29044-HowlingIfrit.xml b/data/templates/npc/monster/29044-HowlingIfrit.xml
index 0f4541e88..5f6a497e2 100644
--- a/data/templates/npc/monster/29044-HowlingIfrit.xml
+++ b/data/templates/npc/monster/29044-HowlingIfrit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29044" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29048-EvilSpirit.xml b/data/templates/npc/monster/29048-EvilSpirit.xml
index ae519d61f..736c836db 100644
--- a/data/templates/npc/monster/29048-EvilSpirit.xml
+++ b/data/templates/npc/monster/29048-EvilSpirit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29048" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29049-EvilSpirit.xml b/data/templates/npc/monster/29049-EvilSpirit.xml
index 42057af19..2266d5296 100644
--- a/data/templates/npc/monster/29049-EvilSpirit.xml
+++ b/data/templates/npc/monster/29049-EvilSpirit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29049" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29050-BreathOfHalisha.xml b/data/templates/npc/monster/29050-BreathOfHalisha.xml
index 8af27521b..6740e6007 100644
--- a/data/templates/npc/monster/29050-BreathOfHalisha.xml
+++ b/data/templates/npc/monster/29050-BreathOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29050" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29051-BreathOfHalisha.xml b/data/templates/npc/monster/29051-BreathOfHalisha.xml
index 3fed008d0..99ededda2 100644
--- a/data/templates/npc/monster/29051-BreathOfHalisha.xml
+++ b/data/templates/npc/monster/29051-BreathOfHalisha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29051" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29052.xml b/data/templates/npc/monster/29052.xml
index 6aa2dd320..4bd4d85f1 100644
--- a/data/templates/npc/monster/29052.xml
+++ b/data/templates/npc/monster/29052.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29052" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29053.xml b/data/templates/npc/monster/29053.xml
index a0d3f0f8c..2c762d3fc 100644
--- a/data/templates/npc/monster/29053.xml
+++ b/data/templates/npc/monster/29053.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29053" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29057-SirraSPage.xml b/data/templates/npc/monster/29057-SirraSPage.xml
index 6c1d415b1..348f64ed5 100644
--- a/data/templates/npc/monster/29057-SirraSPage.xml
+++ b/data/templates/npc/monster/29057-SirraSPage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29057" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29058-SirraSBeholder.xml b/data/templates/npc/monster/29058-SirraSBeholder.xml
index 6f1767bb7..8db7d2f33 100644
--- a/data/templates/npc/monster/29058-SirraSBeholder.xml
+++ b/data/templates/npc/monster/29058-SirraSBeholder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29058" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29059.xml b/data/templates/npc/monster/29059.xml
index cea0703dc..0f768fde6 100644
--- a/data/templates/npc/monster/29059.xml
+++ b/data/templates/npc/monster/29059.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29059" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="false" attackable="true">
diff --git a/data/templates/npc/monster/29063-AndreasAcolyte.xml b/data/templates/npc/monster/29063-AndreasAcolyte.xml
index 7ba8839ad..39bdc1414 100644
--- a/data/templates/npc/monster/29063-AndreasAcolyte.xml
+++ b/data/templates/npc/monster/29063-AndreasAcolyte.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29063" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29064-AndreasAcolyte.xml b/data/templates/npc/monster/29064-AndreasAcolyte.xml
index afa438d7c..2bc733d5c 100644
--- a/data/templates/npc/monster/29064-AndreasAcolyte.xml
+++ b/data/templates/npc/monster/29064-AndreasAcolyte.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29064" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29069-BehemothDragon.xml b/data/templates/npc/monster/29069-BehemothDragon.xml
index a4aaf1408..a904d7526 100644
--- a/data/templates/npc/monster/29069-BehemothDragon.xml
+++ b/data/templates/npc/monster/29069-BehemothDragon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29069" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29070-DragonBomber.xml b/data/templates/npc/monster/29070-DragonBomber.xml
index 46b6904f4..91e8b8aae 100644
--- a/data/templates/npc/monster/29070-DragonBomber.xml
+++ b/data/templates/npc/monster/29070-DragonBomber.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29070" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29071-DragonBomber.xml b/data/templates/npc/monster/29071-DragonBomber.xml
index 89eb3342c..6b6c2f94d 100644
--- a/data/templates/npc/monster/29071-DragonBomber.xml
+++ b/data/templates/npc/monster/29071-DragonBomber.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29071" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29072-DragonBomber.xml b/data/templates/npc/monster/29072-DragonBomber.xml
index f5f318029..823216f57 100644
--- a/data/templates/npc/monster/29072-DragonBomber.xml
+++ b/data/templates/npc/monster/29072-DragonBomber.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29072" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29073-DragonBomber.xml b/data/templates/npc/monster/29073-DragonBomber.xml
index 58c0069c5..636170bdc 100644
--- a/data/templates/npc/monster/29073-DragonBomber.xml
+++ b/data/templates/npc/monster/29073-DragonBomber.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29073" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29074-DragonBomber.xml b/data/templates/npc/monster/29074-DragonBomber.xml
index 4d832a76e..41f52e3c9 100644
--- a/data/templates/npc/monster/29074-DragonBomber.xml
+++ b/data/templates/npc/monster/29074-DragonBomber.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29074" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29075-DragonBomber.xml b/data/templates/npc/monster/29075-DragonBomber.xml
index a931e33d4..096883b9f 100644
--- a/data/templates/npc/monster/29075-DragonBomber.xml
+++ b/data/templates/npc/monster/29075-DragonBomber.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29075" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29076-DragonBomber.xml b/data/templates/npc/monster/29076-DragonBomber.xml
index 26aa35871..b6758a1b7 100644
--- a/data/templates/npc/monster/29076-DragonBomber.xml
+++ b/data/templates/npc/monster/29076-DragonBomber.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29076" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29077.xml b/data/templates/npc/monster/29077.xml
index 851bbec55..1b4be3c9f 100644
--- a/data/templates/npc/monster/29077.xml
+++ b/data/templates/npc/monster/29077.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29077" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29078.xml b/data/templates/npc/monster/29078.xml
index 4fbd39871..97d01a78b 100644
--- a/data/templates/npc/monster/29078.xml
+++ b/data/templates/npc/monster/29078.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29078" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29079.xml b/data/templates/npc/monster/29079.xml
index e0028ead4..a6b4e09d2 100644
--- a/data/templates/npc/monster/29079.xml
+++ b/data/templates/npc/monster/29079.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29079" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29080.xml b/data/templates/npc/monster/29080.xml
index 45cb42ad3..ec48f8ad7 100644
--- a/data/templates/npc/monster/29080.xml
+++ b/data/templates/npc/monster/29080.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29080" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29081.xml b/data/templates/npc/monster/29081.xml
index 4725f678c..068296870 100644
--- a/data/templates/npc/monster/29081.xml
+++ b/data/templates/npc/monster/29081.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29081" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29082.xml b/data/templates/npc/monster/29082.xml
index 33cad600e..9a3b27a0d 100644
--- a/data/templates/npc/monster/29082.xml
+++ b/data/templates/npc/monster/29082.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29082" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29083.xml b/data/templates/npc/monster/29083.xml
index c3b7cdaec..9bff71196 100644
--- a/data/templates/npc/monster/29083.xml
+++ b/data/templates/npc/monster/29083.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29083" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29084.xml b/data/templates/npc/monster/29084.xml
index 0e2a8159e..ae92d8bff 100644
--- a/data/templates/npc/monster/29084.xml
+++ b/data/templates/npc/monster/29084.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29084" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29085.xml b/data/templates/npc/monster/29085.xml
index 6c2b764be..56c1f939e 100644
--- a/data/templates/npc/monster/29085.xml
+++ b/data/templates/npc/monster/29085.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29085" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29086.xml b/data/templates/npc/monster/29086.xml
index 21ab58e6c..be94022cc 100644
--- a/data/templates/npc/monster/29086.xml
+++ b/data/templates/npc/monster/29086.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29086" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29087.xml b/data/templates/npc/monster/29087.xml
index d51a788e3..7cafb4e0b 100644
--- a/data/templates/npc/monster/29087.xml
+++ b/data/templates/npc/monster/29087.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29087" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29088.xml b/data/templates/npc/monster/29088.xml
index 16fa827c3..fb3fd5507 100644
--- a/data/templates/npc/monster/29088.xml
+++ b/data/templates/npc/monster/29088.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29088" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29089.xml b/data/templates/npc/monster/29089.xml
index c74cabc78..3ab42f21d 100644
--- a/data/templates/npc/monster/29089.xml
+++ b/data/templates/npc/monster/29089.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29089" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29090.xml b/data/templates/npc/monster/29090.xml
index 805a83416..7d5d6c066 100644
--- a/data/templates/npc/monster/29090.xml
+++ b/data/templates/npc/monster/29090.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29090" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29091.xml b/data/templates/npc/monster/29091.xml
index f07ae6e5e..8faaecb07 100644
--- a/data/templates/npc/monster/29091.xml
+++ b/data/templates/npc/monster/29091.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29091" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29092.xml b/data/templates/npc/monster/29092.xml
index ec31fa0b2..61780c77f 100644
--- a/data/templates/npc/monster/29092.xml
+++ b/data/templates/npc/monster/29092.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29092" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29093.xml b/data/templates/npc/monster/29093.xml
index cf4b460a2..8ce371f2b 100644
--- a/data/templates/npc/monster/29093.xml
+++ b/data/templates/npc/monster/29093.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29093" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29094.xml b/data/templates/npc/monster/29094.xml
index c217df0d2..67e24dfc4 100644
--- a/data/templates/npc/monster/29094.xml
+++ b/data/templates/npc/monster/29094.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29094" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29097-SplendorDisciple.xml b/data/templates/npc/monster/29097-SplendorDisciple.xml
index ad571baff..fb2b757d4 100644
--- a/data/templates/npc/monster/29097-SplendorDisciple.xml
+++ b/data/templates/npc/monster/29097-SplendorDisciple.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29097" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29098-SplendorWorshiper.xml b/data/templates/npc/monster/29098-SplendorWorshiper.xml
index 24caa5728..d2f3723d2 100644
--- a/data/templates/npc/monster/29098-SplendorWorshiper.xml
+++ b/data/templates/npc/monster/29098-SplendorWorshiper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29098" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29100-CrystalPrisonGuard.xml b/data/templates/npc/monster/29100-CrystalPrisonGuard.xml
index 07cc1af30..5cf883f5b 100644
--- a/data/templates/npc/monster/29100-CrystalPrisonGuard.xml
+++ b/data/templates/npc/monster/29100-CrystalPrisonGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29100" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29101-CrystallineGolem.xml b/data/templates/npc/monster/29101-CrystallineGolem.xml
index 7471cbe6d..4f3a336bf 100644
--- a/data/templates/npc/monster/29101-CrystallineGolem.xml
+++ b/data/templates/npc/monster/29101-CrystallineGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29101" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29102-CrystallineGolem.xml b/data/templates/npc/monster/29102-CrystallineGolem.xml
index 7846005fd..73f4c7356 100644
--- a/data/templates/npc/monster/29102-CrystallineGolem.xml
+++ b/data/templates/npc/monster/29102-CrystallineGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29102" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29103-Baylor.xml b/data/templates/npc/monster/29103-Baylor.xml
index 386faacff..a107b7509 100644
--- a/data/templates/npc/monster/29103-Baylor.xml
+++ b/data/templates/npc/monster/29103-Baylor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29103" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29104-CrystalPrisonGuard.xml b/data/templates/npc/monster/29104-CrystalPrisonGuard.xml
index b285b8c73..6ca14e515 100644
--- a/data/templates/npc/monster/29104-CrystalPrisonGuard.xml
+++ b/data/templates/npc/monster/29104-CrystalPrisonGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29104" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29105-CrystallineGolem.xml b/data/templates/npc/monster/29105-CrystallineGolem.xml
index 076a0a2ac..83bb1b395 100644
--- a/data/templates/npc/monster/29105-CrystallineGolem.xml
+++ b/data/templates/npc/monster/29105-CrystallineGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29105" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29115-CrystalPrisonGuard.xml b/data/templates/npc/monster/29115-CrystalPrisonGuard.xml
index f91509b0a..51f4b9a6d 100644
--- a/data/templates/npc/monster/29115-CrystalPrisonGuard.xml
+++ b/data/templates/npc/monster/29115-CrystalPrisonGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29115" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29116-BaylorSTreasureChest.xml b/data/templates/npc/monster/29116-BaylorSTreasureChest.xml
index c22eb1ecd..6cff4a5e4 100644
--- a/data/templates/npc/monster/29116-BaylorSTreasureChest.xml
+++ b/data/templates/npc/monster/29116-BaylorSTreasureChest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29116" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29117-BaylorSTreasureChest.xml b/data/templates/npc/monster/29117-BaylorSTreasureChest.xml
index 79ad853da..0227ce7d0 100644
--- a/data/templates/npc/monster/29117-BaylorSTreasureChest.xml
+++ b/data/templates/npc/monster/29117-BaylorSTreasureChest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29117" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29119-Beleth.xml b/data/templates/npc/monster/29119-Beleth.xml
index 488b99e4d..a808c0783 100644
--- a/data/templates/npc/monster/29119-Beleth.xml
+++ b/data/templates/npc/monster/29119-Beleth.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29119" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29130-LostGuard.xml b/data/templates/npc/monster/29130-LostGuard.xml
index e774a456c..2a4930bdd 100644
--- a/data/templates/npc/monster/29130-LostGuard.xml
+++ b/data/templates/npc/monster/29130-LostGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29130" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29131-LostAssistantGuard.xml b/data/templates/npc/monster/29131-LostAssistantGuard.xml
index 8298935f6..dfa104343 100644
--- a/data/templates/npc/monster/29131-LostAssistantGuard.xml
+++ b/data/templates/npc/monster/29131-LostAssistantGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29131" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29133-LostGuard.xml b/data/templates/npc/monster/29133-LostGuard.xml
index 3baff1b6e..ce96e297b 100644
--- a/data/templates/npc/monster/29133-LostGuard.xml
+++ b/data/templates/npc/monster/29133-LostGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29133" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29134-LostAssistantGuard.xml b/data/templates/npc/monster/29134-LostAssistantGuard.xml
index 048c19d47..454c7eb8c 100644
--- a/data/templates/npc/monster/29134-LostAssistantGuard.xml
+++ b/data/templates/npc/monster/29134-LostAssistantGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29134" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29136-LostGuard.xml b/data/templates/npc/monster/29136-LostGuard.xml
index 0b0937b39..f6958e9e1 100644
--- a/data/templates/npc/monster/29136-LostGuard.xml
+++ b/data/templates/npc/monster/29136-LostGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29136" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29137-LostAssistantGuard.xml b/data/templates/npc/monster/29137-LostAssistantGuard.xml
index 3a6312007..a78b4bee1 100644
--- a/data/templates/npc/monster/29137-LostAssistantGuard.xml
+++ b/data/templates/npc/monster/29137-LostAssistantGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29137" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29139-LostGuard.xml b/data/templates/npc/monster/29139-LostGuard.xml
index 3907ce0eb..93ce0db26 100644
--- a/data/templates/npc/monster/29139-LostGuard.xml
+++ b/data/templates/npc/monster/29139-LostGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29139" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29140-LostAssistantGuard.xml b/data/templates/npc/monster/29140-LostAssistantGuard.xml
index 94dc2b16d..e93fb9451 100644
--- a/data/templates/npc/monster/29140-LostAssistantGuard.xml
+++ b/data/templates/npc/monster/29140-LostAssistantGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29140" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29142-LostGuard.xml b/data/templates/npc/monster/29142-LostGuard.xml
index 2cf1ae1c2..c8245a725 100644
--- a/data/templates/npc/monster/29142-LostGuard.xml
+++ b/data/templates/npc/monster/29142-LostGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29142" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29143-LostAssistantGuard.xml b/data/templates/npc/monster/29143-LostAssistantGuard.xml
index 776a74f6a..bbff05fba 100644
--- a/data/templates/npc/monster/29143-LostAssistantGuard.xml
+++ b/data/templates/npc/monster/29143-LostAssistantGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29143" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29145-LostGuard.xml b/data/templates/npc/monster/29145-LostGuard.xml
index 07e993ccd..10dd75f9d 100644
--- a/data/templates/npc/monster/29145-LostGuard.xml
+++ b/data/templates/npc/monster/29145-LostGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29145" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29146-LostAssistantGuard.xml b/data/templates/npc/monster/29146-LostAssistantGuard.xml
index 315258fdb..4422ce945 100644
--- a/data/templates/npc/monster/29146-LostAssistantGuard.xml
+++ b/data/templates/npc/monster/29146-LostAssistantGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29146" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29148-LostGuard.xml b/data/templates/npc/monster/29148-LostGuard.xml
index 3ce92553e..0963b2a69 100644
--- a/data/templates/npc/monster/29148-LostGuard.xml
+++ b/data/templates/npc/monster/29148-LostGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29148" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29149-LostAssistantGuard.xml b/data/templates/npc/monster/29149-LostAssistantGuard.xml
index b39d213bc..316849b34 100644
--- a/data/templates/npc/monster/29149-LostAssistantGuard.xml
+++ b/data/templates/npc/monster/29149-LostAssistantGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29149" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29151-FeralHoundOfTheNetherworld.xml b/data/templates/npc/monster/29151-FeralHoundOfTheNetherworld.xml
index 6808f1242..60d797fad 100644
--- a/data/templates/npc/monster/29151-FeralHoundOfTheNetherworld.xml
+++ b/data/templates/npc/monster/29151-FeralHoundOfTheNetherworld.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29151" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29152-FeralHoundOfTheNetherworld.xml b/data/templates/npc/monster/29152-FeralHoundOfTheNetherworld.xml
index 5d60ccec2..e16a9fd82 100644
--- a/data/templates/npc/monster/29152-FeralHoundOfTheNetherworld.xml
+++ b/data/templates/npc/monster/29152-FeralHoundOfTheNetherworld.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29152" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29162-SoldiersOfBravery.xml b/data/templates/npc/monster/29162-SoldiersOfBravery.xml
index 358995f36..2ca51ee1f 100644
--- a/data/templates/npc/monster/29162-SoldiersOfBravery.xml
+++ b/data/templates/npc/monster/29162-SoldiersOfBravery.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29162" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29169.xml b/data/templates/npc/monster/29169.xml
index 0fc0c8f99..9e7ee862b 100644
--- a/data/templates/npc/monster/29169.xml
+++ b/data/templates/npc/monster/29169.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29169" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29182-DollBlader.xml b/data/templates/npc/monster/29182-DollBlader.xml
index 06c189e18..9ea29d523 100644
--- a/data/templates/npc/monster/29182-DollBlader.xml
+++ b/data/templates/npc/monster/29182-DollBlader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29182" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29183-VeilMaster.xml b/data/templates/npc/monster/29183-VeilMaster.xml
index f00a6c9b1..83b875de0 100644
--- a/data/templates/npc/monster/29183-VeilMaster.xml
+++ b/data/templates/npc/monster/29183-VeilMaster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29183" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29184-PirateZombieCaptain.xml b/data/templates/npc/monster/29184-PirateZombieCaptain.xml
index 4e3bb1895..9645011e0 100644
--- a/data/templates/npc/monster/29184-PirateZombieCaptain.xml
+++ b/data/templates/npc/monster/29184-PirateZombieCaptain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29184" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29185-PirateZombie.xml b/data/templates/npc/monster/29185-PirateZombie.xml
index 7fce0ca12..53628f71a 100644
--- a/data/templates/npc/monster/29185-PirateZombie.xml
+++ b/data/templates/npc/monster/29185-PirateZombie.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29185" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29187-CrystalPrisonGuard.xml b/data/templates/npc/monster/29187-CrystalPrisonGuard.xml
index c00e6632d..f89ba9a27 100644
--- a/data/templates/npc/monster/29187-CrystalPrisonGuard.xml
+++ b/data/templates/npc/monster/29187-CrystalPrisonGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29187" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29188-CrystalGolem.xml b/data/templates/npc/monster/29188-CrystalGolem.xml
index 4f1e36978..7a68dcb65 100644
--- a/data/templates/npc/monster/29188-CrystalGolem.xml
+++ b/data/templates/npc/monster/29188-CrystalGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29188" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29189-CrystalGolem.xml b/data/templates/npc/monster/29189-CrystalGolem.xml
index b249226e7..c12ae3d7d 100644
--- a/data/templates/npc/monster/29189-CrystalGolem.xml
+++ b/data/templates/npc/monster/29189-CrystalGolem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29189" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/29190-TaraskDragon.xml b/data/templates/npc/monster/29190-TaraskDragon.xml
index 9e08dddd4..f29cca731 100644
--- a/data/templates/npc/monster/29190-TaraskDragon.xml
+++ b/data/templates/npc/monster/29190-TaraskDragon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="29190" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/30936-Malcom1.xml b/data/templates/npc/monster/30936-Malcom1.xml
index 7cdf2ff0d..ae9bc0328 100644
--- a/data/templates/npc/monster/30936-Malcom1.xml
+++ b/data/templates/npc/monster/30936-Malcom1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="30936" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/30937-Malcom2.xml b/data/templates/npc/monster/30937-Malcom2.xml
index c3b0e9ccf..f002160c9 100644
--- a/data/templates/npc/monster/30937-Malcom2.xml
+++ b/data/templates/npc/monster/30937-Malcom2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="30937" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/30938-Malcom3.xml b/data/templates/npc/monster/30938-Malcom3.xml
index 95b52b376..a92ea5008 100644
--- a/data/templates/npc/monster/30938-Malcom3.xml
+++ b/data/templates/npc/monster/30938-Malcom3.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="30938" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/30939-Malcom4.xml b/data/templates/npc/monster/30939-Malcom4.xml
index 67c414f22..e1ba805c3 100644
--- a/data/templates/npc/monster/30939-Malcom4.xml
+++ b/data/templates/npc/monster/30939-Malcom4.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="30939" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/30940-Malcom5.xml b/data/templates/npc/monster/30940-Malcom5.xml
index d478394a2..2e67e299a 100644
--- a/data/templates/npc/monster/30940-Malcom5.xml
+++ b/data/templates/npc/monster/30940-Malcom5.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="30940" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/30941-Malcom6.xml b/data/templates/npc/monster/30941-Malcom6.xml
index 1a2e0a862..cfa73cb90 100644
--- a/data/templates/npc/monster/30941-Malcom6.xml
+++ b/data/templates/npc/monster/30941-Malcom6.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="30941" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/30942-Malcom7.xml b/data/templates/npc/monster/30942-Malcom7.xml
index 18ba3e713..becf5fb83 100644
--- a/data/templates/npc/monster/30942-Malcom7.xml
+++ b/data/templates/npc/monster/30942-Malcom7.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="30942" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/30943-Malcom8.xml b/data/templates/npc/monster/30943-Malcom8.xml
index 404b37dc1..7c28fa127 100644
--- a/data/templates/npc/monster/30943-Malcom8.xml
+++ b/data/templates/npc/monster/30943-Malcom8.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="30943" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/30955-GillianSRevenant.xml b/data/templates/npc/monster/30955-GillianSRevenant.xml
index 762c8b54a..9d17a60a3 100644
--- a/data/templates/npc/monster/30955-GillianSRevenant.xml
+++ b/data/templates/npc/monster/30955-GillianSRevenant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="30955" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/30972-OrpheusResurrecter.xml b/data/templates/npc/monster/30972-OrpheusResurrecter.xml
index 0688c5640..d3d493350 100644
--- a/data/templates/npc/monster/30972-OrpheusResurrecter.xml
+++ b/data/templates/npc/monster/30972-OrpheusResurrecter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="30972" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/30982-SleepingAntLarva1.xml b/data/templates/npc/monster/30982-SleepingAntLarva1.xml
index cf4a97a3f..acf5f176f 100644
--- a/data/templates/npc/monster/30982-SleepingAntLarva1.xml
+++ b/data/templates/npc/monster/30982-SleepingAntLarva1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="30982" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/30983-SleepingAntLarva2.xml b/data/templates/npc/monster/30983-SleepingAntLarva2.xml
index b0766443d..523a72594 100644
--- a/data/templates/npc/monster/30983-SleepingAntLarva2.xml
+++ b/data/templates/npc/monster/30983-SleepingAntLarva2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="30983" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/30984-SleepingAntLarva3.xml b/data/templates/npc/monster/30984-SleepingAntLarva3.xml
index cb634ecc4..099374b0c 100644
--- a/data/templates/npc/monster/30984-SleepingAntLarva3.xml
+++ b/data/templates/npc/monster/30984-SleepingAntLarva3.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="30984" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/30985-SleepingAntLarva4.xml b/data/templates/npc/monster/30985-SleepingAntLarva4.xml
index b250182a9..b7cbdbbf6 100644
--- a/data/templates/npc/monster/30985-SleepingAntLarva4.xml
+++ b/data/templates/npc/monster/30985-SleepingAntLarva4.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="30985" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/30986-SleepingAntLarva5.xml b/data/templates/npc/monster/30986-SleepingAntLarva5.xml
index 4477e4fca..ca475bdb7 100644
--- a/data/templates/npc/monster/30986-SleepingAntLarva5.xml
+++ b/data/templates/npc/monster/30986-SleepingAntLarva5.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="30986" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/30987-SleepingAntLarva6.xml b/data/templates/npc/monster/30987-SleepingAntLarva6.xml
index c4fba2efa..5addf7773 100644
--- a/data/templates/npc/monster/30987-SleepingAntLarva6.xml
+++ b/data/templates/npc/monster/30987-SleepingAntLarva6.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="30987" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31003-HereICome.xml b/data/templates/npc/monster/31003-HereICome.xml
index 540f31562..b30c8c11f 100644
--- a/data/templates/npc/monster/31003-HereICome.xml
+++ b/data/templates/npc/monster/31003-HereICome.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31003" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31004-HalfMoonLove.xml b/data/templates/npc/monster/31004-HalfMoonLove.xml
index 4e30c7fcd..627683132 100644
--- a/data/templates/npc/monster/31004-HalfMoonLove.xml
+++ b/data/templates/npc/monster/31004-HalfMoonLove.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31004" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31005-Everlasting.xml b/data/templates/npc/monster/31005-Everlasting.xml
index 91a618e85..f7b39051c 100644
--- a/data/templates/npc/monster/31005-Everlasting.xml
+++ b/data/templates/npc/monster/31005-Everlasting.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31005" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31006-DarkSideOfTheMoon.xml b/data/templates/npc/monster/31006-DarkSideOfTheMoon.xml
index d710fc115..552c68e6c 100644
--- a/data/templates/npc/monster/31006-DarkSideOfTheMoon.xml
+++ b/data/templates/npc/monster/31006-DarkSideOfTheMoon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31006" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31007-WindRider.xml b/data/templates/npc/monster/31007-WindRider.xml
index 2bf3b2019..1d23d0a3a 100644
--- a/data/templates/npc/monster/31007-WindRider.xml
+++ b/data/templates/npc/monster/31007-WindRider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31007" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31008-ShootingStar.xml b/data/templates/npc/monster/31008-ShootingStar.xml
index b91d5cfa8..46757724e 100644
--- a/data/templates/npc/monster/31008-ShootingStar.xml
+++ b/data/templates/npc/monster/31008-ShootingStar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31008" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31009-CycloneThunder.xml b/data/templates/npc/monster/31009-CycloneThunder.xml
index 0617519bb..e848d3e8e 100644
--- a/data/templates/npc/monster/31009-CycloneThunder.xml
+++ b/data/templates/npc/monster/31009-CycloneThunder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31009" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31010-HungryBaby.xml b/data/templates/npc/monster/31010-HungryBaby.xml
index 9ead5292f..ad493be10 100644
--- a/data/templates/npc/monster/31010-HungryBaby.xml
+++ b/data/templates/npc/monster/31010-HungryBaby.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31010" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31011-SaltyDog.xml b/data/templates/npc/monster/31011-SaltyDog.xml
index b1cb97692..84bc2ed07 100644
--- a/data/templates/npc/monster/31011-SaltyDog.xml
+++ b/data/templates/npc/monster/31011-SaltyDog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31011" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31012-RagingRevolution.xml b/data/templates/npc/monster/31012-RagingRevolution.xml
index 99f49735e..f5584e512 100644
--- a/data/templates/npc/monster/31012-RagingRevolution.xml
+++ b/data/templates/npc/monster/31012-RagingRevolution.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31012" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31013-ValentineBlue.xml b/data/templates/npc/monster/31013-ValentineBlue.xml
index 63bc29ff6..d72fabefb 100644
--- a/data/templates/npc/monster/31013-ValentineBlue.xml
+++ b/data/templates/npc/monster/31013-ValentineBlue.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31013" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31014-LightMyFire.xml b/data/templates/npc/monster/31014-LightMyFire.xml
index af1afc95f..4cf422e35 100644
--- a/data/templates/npc/monster/31014-LightMyFire.xml
+++ b/data/templates/npc/monster/31014-LightMyFire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31014" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31015-RedBullet.xml b/data/templates/npc/monster/31015-RedBullet.xml
index 2d5f939dc..bf2a17ccc 100644
--- a/data/templates/npc/monster/31015-RedBullet.xml
+++ b/data/templates/npc/monster/31015-RedBullet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31015" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31016-ShiningSilver.xml b/data/templates/npc/monster/31016-ShiningSilver.xml
index efbdf7e11..5ebbe5533 100644
--- a/data/templates/npc/monster/31016-ShiningSilver.xml
+++ b/data/templates/npc/monster/31016-ShiningSilver.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31016" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31017-OverTheTop.xml b/data/templates/npc/monster/31017-OverTheTop.xml
index 434bb5e54..2fc43c44b 100644
--- a/data/templates/npc/monster/31017-OverTheTop.xml
+++ b/data/templates/npc/monster/31017-OverTheTop.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31017" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31018-RoyalStraight.xml b/data/templates/npc/monster/31018-RoyalStraight.xml
index c0749d515..2cd8c862d 100644
--- a/data/templates/npc/monster/31018-RoyalStraight.xml
+++ b/data/templates/npc/monster/31018-RoyalStraight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31018" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31019-AllSeven.xml b/data/templates/npc/monster/31019-AllSeven.xml
index 69759bb4e..92d6ac0e0 100644
--- a/data/templates/npc/monster/31019-AllSeven.xml
+++ b/data/templates/npc/monster/31019-AllSeven.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31019" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31020-NastyGreen.xml b/data/templates/npc/monster/31020-NastyGreen.xml
index e9d2a06a0..7d2adc4e2 100644
--- a/data/templates/npc/monster/31020-NastyGreen.xml
+++ b/data/templates/npc/monster/31020-NastyGreen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31020" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31021-Shortcut.xml b/data/templates/npc/monster/31021-Shortcut.xml
index 6b0653cdd..8b54849c9 100644
--- a/data/templates/npc/monster/31021-Shortcut.xml
+++ b/data/templates/npc/monster/31021-Shortcut.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31021" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31022-TyphoonTiger.xml b/data/templates/npc/monster/31022-TyphoonTiger.xml
index 1eb27dfc1..7035789e7 100644
--- a/data/templates/npc/monster/31022-TyphoonTiger.xml
+++ b/data/templates/npc/monster/31022-TyphoonTiger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31022" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31023-RedHot.xml b/data/templates/npc/monster/31023-RedHot.xml
index bff05e537..9d63177f4 100644
--- a/data/templates/npc/monster/31023-RedHot.xml
+++ b/data/templates/npc/monster/31023-RedHot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31023" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31024-GalaxyExpress.xml b/data/templates/npc/monster/31024-GalaxyExpress.xml
index ef11787ca..e948051b1 100644
--- a/data/templates/npc/monster/31024-GalaxyExpress.xml
+++ b/data/templates/npc/monster/31024-GalaxyExpress.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31024" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31025-BestCondition.xml b/data/templates/npc/monster/31025-BestCondition.xml
index 09b7b4951..cd1096843 100644
--- a/data/templates/npc/monster/31025-BestCondition.xml
+++ b/data/templates/npc/monster/31025-BestCondition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31025" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31026-Albatross.xml b/data/templates/npc/monster/31026-Albatross.xml
index 942b5aa0e..6342e2f6a 100644
--- a/data/templates/npc/monster/31026-Albatross.xml
+++ b/data/templates/npc/monster/31026-Albatross.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31026" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31844-Aracna.xml b/data/templates/npc/monster/31844-Aracna.xml
index 13b7f8040..ae0dc4db4 100644
--- a/data/templates/npc/monster/31844-Aracna.xml
+++ b/data/templates/npc/monster/31844-Aracna.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31844" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31846-Satyros.xml b/data/templates/npc/monster/31846-Satyros.xml
index 217ecc0b8..9e180bdd1 100644
--- a/data/templates/npc/monster/31846-Satyros.xml
+++ b/data/templates/npc/monster/31846-Satyros.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31846" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31847-Pan.xml b/data/templates/npc/monster/31847-Pan.xml
index 1cde3bbeb..d39c76fbc 100644
--- a/data/templates/npc/monster/31847-Pan.xml
+++ b/data/templates/npc/monster/31847-Pan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31847" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/31849-RedArachne.xml b/data/templates/npc/monster/31849-RedArachne.xml
index 392957073..304d8aba7 100644
--- a/data/templates/npc/monster/31849-RedArachne.xml
+++ b/data/templates/npc/monster/31849-RedArachne.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="31849" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/32342-EvaSGiftBox.xml b/data/templates/npc/monster/32342-EvaSGiftBox.xml
index 1d57e22c2..26ed419f6 100644
--- a/data/templates/npc/monster/32342-EvaSGiftBox.xml
+++ b/data/templates/npc/monster/32342-EvaSGiftBox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="32342" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/32502-KetraOrcSupporter.xml b/data/templates/npc/monster/32502-KetraOrcSupporter.xml
index 1b86c35bb..cee3243b5 100644
--- a/data/templates/npc/monster/32502-KetraOrcSupporter.xml
+++ b/data/templates/npc/monster/32502-KetraOrcSupporter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="32502" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/32509-KetraOrcIntelligenceOfficer.xml b/data/templates/npc/monster/32509-KetraOrcIntelligenceOfficer.xml
index 2775ec839..44837d6f2 100644
--- a/data/templates/npc/monster/32509-KetraOrcIntelligenceOfficer.xml
+++ b/data/templates/npc/monster/32509-KetraOrcIntelligenceOfficer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="32509" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/32656.xml b/data/templates/npc/monster/32656.xml
index 99187982d..48218b81e 100644
--- a/data/templates/npc/monster/32656.xml
+++ b/data/templates/npc/monster/32656.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="32656" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35368-BloodyLordNurka.xml b/data/templates/npc/monster/35368-BloodyLordNurka.xml
index 140141427..d9d733059 100644
--- a/data/templates/npc/monster/35368-BloodyLordNurka.xml
+++ b/data/templates/npc/monster/35368-BloodyLordNurka.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35368" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35369-PartisanHealer.xml b/data/templates/npc/monster/35369-PartisanHealer.xml
index c6d2cd593..798b3480d 100644
--- a/data/templates/npc/monster/35369-PartisanHealer.xml
+++ b/data/templates/npc/monster/35369-PartisanHealer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35369" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35370-PartisanCourtGuard.xml b/data/templates/npc/monster/35370-PartisanCourtGuard.xml
index 69219e3a7..3055e6644 100644
--- a/data/templates/npc/monster/35370-PartisanCourtGuard.xml
+++ b/data/templates/npc/monster/35370-PartisanCourtGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35370" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35371-PartisanCourtGuard.xml b/data/templates/npc/monster/35371-PartisanCourtGuard.xml
index d90cec545..3cdd10f55 100644
--- a/data/templates/npc/monster/35371-PartisanCourtGuard.xml
+++ b/data/templates/npc/monster/35371-PartisanCourtGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35371" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35372-PartisanSoldier.xml b/data/templates/npc/monster/35372-PartisanSoldier.xml
index 08c90a15a..d2cfccbd3 100644
--- a/data/templates/npc/monster/35372-PartisanSoldier.xml
+++ b/data/templates/npc/monster/35372-PartisanSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35372" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35373-PartisanSorcerer.xml b/data/templates/npc/monster/35373-PartisanSorcerer.xml
index 4bf5b0534..fe3f098b8 100644
--- a/data/templates/npc/monster/35373-PartisanSorcerer.xml
+++ b/data/templates/npc/monster/35373-PartisanSorcerer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35373" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35374-PartisanArcher.xml b/data/templates/npc/monster/35374-PartisanArcher.xml
index 0dbaa9422..b731c0fbb 100644
--- a/data/templates/npc/monster/35374-PartisanArcher.xml
+++ b/data/templates/npc/monster/35374-PartisanArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35374" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35375-BloodyLordNurka.xml b/data/templates/npc/monster/35375-BloodyLordNurka.xml
index df35093a3..718be70ba 100644
--- a/data/templates/npc/monster/35375-BloodyLordNurka.xml
+++ b/data/templates/npc/monster/35375-BloodyLordNurka.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35375" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35376-PartisanHealer.xml b/data/templates/npc/monster/35376-PartisanHealer.xml
index a631aa7fe..d00b0c3f6 100644
--- a/data/templates/npc/monster/35376-PartisanHealer.xml
+++ b/data/templates/npc/monster/35376-PartisanHealer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35376" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35377-PartisanCourtGuard.xml b/data/templates/npc/monster/35377-PartisanCourtGuard.xml
index 51b6f336a..8c587572f 100644
--- a/data/templates/npc/monster/35377-PartisanCourtGuard.xml
+++ b/data/templates/npc/monster/35377-PartisanCourtGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35377" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35378-PartisanCourtGuard.xml b/data/templates/npc/monster/35378-PartisanCourtGuard.xml
index dcc4ccc8a..ae24c7da2 100644
--- a/data/templates/npc/monster/35378-PartisanCourtGuard.xml
+++ b/data/templates/npc/monster/35378-PartisanCourtGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35378" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35379-PartisanSoldier.xml b/data/templates/npc/monster/35379-PartisanSoldier.xml
index 5b696c654..3ad8f9728 100644
--- a/data/templates/npc/monster/35379-PartisanSoldier.xml
+++ b/data/templates/npc/monster/35379-PartisanSoldier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35379" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35380-PartisanSorcerer.xml b/data/templates/npc/monster/35380-PartisanSorcerer.xml
index c47fe3ddd..a9104693b 100644
--- a/data/templates/npc/monster/35380-PartisanSorcerer.xml
+++ b/data/templates/npc/monster/35380-PartisanSorcerer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35380" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35381-PartisanArcher.xml b/data/templates/npc/monster/35381-PartisanArcher.xml
index 892939d41..466b5498a 100644
--- a/data/templates/npc/monster/35381-PartisanArcher.xml
+++ b/data/templates/npc/monster/35381-PartisanArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35381" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35408-Dietrich.xml b/data/templates/npc/monster/35408-Dietrich.xml
index 4ce8eee72..59f68a487 100644
--- a/data/templates/npc/monster/35408-Dietrich.xml
+++ b/data/templates/npc/monster/35408-Dietrich.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35408" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35409-Mikhail.xml b/data/templates/npc/monster/35409-Mikhail.xml
index 2c6e1970c..97034e9f6 100644
--- a/data/templates/npc/monster/35409-Mikhail.xml
+++ b/data/templates/npc/monster/35409-Mikhail.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35409" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35410-Gustav.xml b/data/templates/npc/monster/35410-Gustav.xml
index 8a2602933..cc34977ee 100644
--- a/data/templates/npc/monster/35410-Gustav.xml
+++ b/data/templates/npc/monster/35410-Gustav.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35410" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35411-DoomServant.xml b/data/templates/npc/monster/35411-DoomServant.xml
index db5109e27..bd599374c 100644
--- a/data/templates/npc/monster/35411-DoomServant.xml
+++ b/data/templates/npc/monster/35411-DoomServant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35411" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35412-DoomGuard.xml b/data/templates/npc/monster/35412-DoomGuard.xml
index 849d81f52..448304eae 100644
--- a/data/templates/npc/monster/35412-DoomGuard.xml
+++ b/data/templates/npc/monster/35412-DoomGuard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35412" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35413-DoomArcher.xml b/data/templates/npc/monster/35413-DoomArcher.xml
index 45dd1eec9..8f79ee54d 100644
--- a/data/templates/npc/monster/35413-DoomArcher.xml
+++ b/data/templates/npc/monster/35413-DoomArcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35413" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35414-DoomTrooper.xml b/data/templates/npc/monster/35414-DoomTrooper.xml
index 2e29de71b..e9e5a2c03 100644
--- a/data/templates/npc/monster/35414-DoomTrooper.xml
+++ b/data/templates/npc/monster/35414-DoomTrooper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35414" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35415-DoomWarrior.xml b/data/templates/npc/monster/35415-DoomWarrior.xml
index 33a303f43..3ecb46dee 100644
--- a/data/templates/npc/monster/35415-DoomWarrior.xml
+++ b/data/templates/npc/monster/35415-DoomWarrior.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35415" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35416-DoomKnight.xml b/data/templates/npc/monster/35416-DoomKnight.xml
index d73a7e17f..875c419e4 100644
--- a/data/templates/npc/monster/35416-DoomKnight.xml
+++ b/data/templates/npc/monster/35416-DoomKnight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35416" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35417-DoormanOfHell.xml b/data/templates/npc/monster/35417-DoormanOfHell.xml
index f8f468de3..be7b30adc 100644
--- a/data/templates/npc/monster/35417-DoormanOfHell.xml
+++ b/data/templates/npc/monster/35417-DoormanOfHell.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35417" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35418-DoormanOfHell.xml b/data/templates/npc/monster/35418-DoormanOfHell.xml
index d8e761e1c..d0707fd76 100644
--- a/data/templates/npc/monster/35418-DoormanOfHell.xml
+++ b/data/templates/npc/monster/35418-DoormanOfHell.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35418" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="true" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35428-OelMahumBerserker.xml b/data/templates/npc/monster/35428-OelMahumBerserker.xml
index 6dbc6cd5c..653f2cdd6 100644
--- a/data/templates/npc/monster/35428-OelMahumBerserker.xml
+++ b/data/templates/npc/monster/35428-OelMahumBerserker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35428" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35429-OelMahumScout.xml b/data/templates/npc/monster/35429-OelMahumScout.xml
index c4c0de339..713d10212 100644
--- a/data/templates/npc/monster/35429-OelMahumScout.xml
+++ b/data/templates/npc/monster/35429-OelMahumScout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35429" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35430-OelMahumLeader.xml b/data/templates/npc/monster/35430-OelMahumLeader.xml
index 3e84154fb..35fe5ba00 100644
--- a/data/templates/npc/monster/35430-OelMahumLeader.xml
+++ b/data/templates/npc/monster/35430-OelMahumLeader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35430" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35431-OelMahumCleric.xml b/data/templates/npc/monster/35431-OelMahumCleric.xml
index 7c653544f..a26a3cf39 100644
--- a/data/templates/npc/monster/35431-OelMahumCleric.xml
+++ b/data/templates/npc/monster/35431-OelMahumCleric.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35431" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/35432-OelMahumThief.xml b/data/templates/npc/monster/35432-OelMahumThief.xml
index 5a757cae5..618255519 100644
--- a/data/templates/npc/monster/35432-OelMahumThief.xml
+++ b/data/templates/npc/monster/35432-OelMahumThief.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="35432" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36499-TerritoryCatapult.xml b/data/templates/npc/monster/36499-TerritoryCatapult.xml
index 22a26a98f..51f4a8ff9 100644
--- a/data/templates/npc/monster/36499-TerritoryCatapult.xml
+++ b/data/templates/npc/monster/36499-TerritoryCatapult.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36499" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36500-TerritoryCatapult.xml b/data/templates/npc/monster/36500-TerritoryCatapult.xml
index ee6998b0b..73bcd9bdc 100644
--- a/data/templates/npc/monster/36500-TerritoryCatapult.xml
+++ b/data/templates/npc/monster/36500-TerritoryCatapult.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36500" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36501-TerritoryCatapult.xml b/data/templates/npc/monster/36501-TerritoryCatapult.xml
index c44cbb72b..38fb47496 100644
--- a/data/templates/npc/monster/36501-TerritoryCatapult.xml
+++ b/data/templates/npc/monster/36501-TerritoryCatapult.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36501" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36502-TerritoryCatapult.xml b/data/templates/npc/monster/36502-TerritoryCatapult.xml
index d1e9b72d1..06a6bad84 100644
--- a/data/templates/npc/monster/36502-TerritoryCatapult.xml
+++ b/data/templates/npc/monster/36502-TerritoryCatapult.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36502" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36503-TerritoryCatapult.xml b/data/templates/npc/monster/36503-TerritoryCatapult.xml
index c0d9cd61d..3c796f62d 100644
--- a/data/templates/npc/monster/36503-TerritoryCatapult.xml
+++ b/data/templates/npc/monster/36503-TerritoryCatapult.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36503" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36504-TerritoryCatapult.xml b/data/templates/npc/monster/36504-TerritoryCatapult.xml
index d1b60fba6..ed3ff2048 100644
--- a/data/templates/npc/monster/36504-TerritoryCatapult.xml
+++ b/data/templates/npc/monster/36504-TerritoryCatapult.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36504" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36505-TerritoryCatapult.xml b/data/templates/npc/monster/36505-TerritoryCatapult.xml
index aad913701..874f6b310 100644
--- a/data/templates/npc/monster/36505-TerritoryCatapult.xml
+++ b/data/templates/npc/monster/36505-TerritoryCatapult.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36505" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36506-TerritoryCatapult.xml b/data/templates/npc/monster/36506-TerritoryCatapult.xml
index 4d798c8b3..c995f3463 100644
--- a/data/templates/npc/monster/36506-TerritoryCatapult.xml
+++ b/data/templates/npc/monster/36506-TerritoryCatapult.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36506" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36507-TerritoryCatapult.xml b/data/templates/npc/monster/36507-TerritoryCatapult.xml
index 56d8b8a02..434bb44e9 100644
--- a/data/templates/npc/monster/36507-TerritoryCatapult.xml
+++ b/data/templates/npc/monster/36507-TerritoryCatapult.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36507" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36591-SuppliesSafe.xml b/data/templates/npc/monster/36591-SuppliesSafe.xml
index afebbb398..3e786728d 100644
--- a/data/templates/npc/monster/36591-SuppliesSafe.xml
+++ b/data/templates/npc/monster/36591-SuppliesSafe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36591" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36592-SuppliesSafe.xml b/data/templates/npc/monster/36592-SuppliesSafe.xml
index 05fa06696..b6d08f4c1 100644
--- a/data/templates/npc/monster/36592-SuppliesSafe.xml
+++ b/data/templates/npc/monster/36592-SuppliesSafe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36592" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36593-SuppliesSafe.xml b/data/templates/npc/monster/36593-SuppliesSafe.xml
index 7cd1210de..e478b3125 100644
--- a/data/templates/npc/monster/36593-SuppliesSafe.xml
+++ b/data/templates/npc/monster/36593-SuppliesSafe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36593" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36594-SuppliesSafe.xml b/data/templates/npc/monster/36594-SuppliesSafe.xml
index 9f9ed0215..d4f0b06bf 100644
--- a/data/templates/npc/monster/36594-SuppliesSafe.xml
+++ b/data/templates/npc/monster/36594-SuppliesSafe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36594" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36595-SuppliesSafe.xml b/data/templates/npc/monster/36595-SuppliesSafe.xml
index d51e67ecd..0bfff82fd 100644
--- a/data/templates/npc/monster/36595-SuppliesSafe.xml
+++ b/data/templates/npc/monster/36595-SuppliesSafe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36595" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36596-SuppliesSafe.xml b/data/templates/npc/monster/36596-SuppliesSafe.xml
index e42b4da06..30f896f31 100644
--- a/data/templates/npc/monster/36596-SuppliesSafe.xml
+++ b/data/templates/npc/monster/36596-SuppliesSafe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36596" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36597-SuppliesSafe.xml b/data/templates/npc/monster/36597-SuppliesSafe.xml
index 7a791ca2c..abdc58d1f 100644
--- a/data/templates/npc/monster/36597-SuppliesSafe.xml
+++ b/data/templates/npc/monster/36597-SuppliesSafe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36597" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36598-SuppliesSafe.xml b/data/templates/npc/monster/36598-SuppliesSafe.xml
index 911bc4ce3..5081c1955 100644
--- a/data/templates/npc/monster/36598-SuppliesSafe.xml
+++ b/data/templates/npc/monster/36598-SuppliesSafe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36598" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/data/templates/npc/monster/36599-SuppliesSafe.xml b/data/templates/npc/monster/36599-SuppliesSafe.xml
index 8f7008ffb..6d3f1bfe8 100644
--- a/data/templates/npc/monster/36599-SuppliesSafe.xml
+++ b/data/templates/npc/monster/36599-SuppliesSafe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <npc
-    controller="com.l2jserver.model.world.npc.controller.NotImplementedNPCController"
+    controller="com.l2jserver.model.world.npc.controller.MonsterController"
     id="36599" xsi:schemaLocation="npc ../../npc.xsd"
     xsi:noNamespaceSchemaLocation="npc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <info aggressive="false" targetable="true" attackable="true">
diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java
index 02b958d7e..7ea7e42e4 100644
--- a/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java
+++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java
@@ -81,7 +81,6 @@ public class CM_ENTER_WORLD extends AbstractClientPacket {
 		try {
 			characterService.enterWorld(id.getObject());
 		} catch (SpawnPointNotFoundServiceException e) {
-
 		} catch (AlreadySpawnedServiceException e) {
 
 		}
diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java
index ec6b13182..92e8203df 100644
--- a/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java
+++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java
@@ -88,7 +88,7 @@ public class CM_PROTOCOL_VERSION extends AbstractClientPacket {
 		log.debug("Client protocol version: {}", version);
 		conn.setVersion(version);
 		if (L2JConstant.SUPPORTED_PROTOCOL != version) {
-			log.info("Incorrect protocol version: {}. Only {} is supported.",
+			log.warn("Incorrect protocol version: {}. Only {} is supported.",
 					version, L2JConstant.SUPPORTED_PROTOCOL);
 			// notify wrong protocol and close connection
 			conn.write(new SM_KEY(inKey, false)).addListener(
diff --git a/src/main/java/com/l2jserver/model/id/TemplateID.java b/src/main/java/com/l2jserver/model/id/TemplateID.java
index caead44c8..30e393420 100644
--- a/src/main/java/com/l2jserver/model/id/TemplateID.java
+++ b/src/main/java/com/l2jserver/model/id/TemplateID.java
@@ -16,6 +16,9 @@
  */
 package com.l2jserver.model.id;
 
+import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
+
 import com.l2jserver.model.template.Template;
 
 /**
@@ -25,6 +28,8 @@ import com.l2jserver.model.template.Template;
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  */
 public abstract class TemplateID<T extends Template<?>, I> extends ID<I> {
+	private Reference<T> cached;
+
 	/**
 	 * Creates a new instance
 	 * 
@@ -40,5 +45,16 @@ public abstract class TemplateID<T extends Template<?>, I> extends ID<I> {
 	 * 
 	 * @return the {@link Template} if existent, <tt>null</tt> otherwise
 	 */
-	public abstract T getTemplate();
+	public T getTemplate() {
+		if (cached == null || cached.get() == null)
+			cached = new SoftReference<T>(loadTemplate());
+		return cached.get();
+	}
+
+	/**
+	 * Returns the {@link Template} associated with this {@link ID}
+	 * 
+	 * @return the {@link Template} if existent, <tt>null</tt> otherwise
+	 */
+	protected abstract T loadTemplate();
 }
diff --git a/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java b/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java
index fb8141430..078be5a71 100644
--- a/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java
+++ b/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java
@@ -44,7 +44,7 @@ public class ActorTemplateID<T extends ActorTemplate<?>> extends
 
 	@Override
 	@XmlTransient
-	public T getTemplate() {
+	public T loadTemplate() {
 		return templateService.getTemplate(this);
 	}
 }
diff --git a/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java b/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java
index fcc4fa071..598a59906 100644
--- a/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java
+++ b/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java
@@ -44,7 +44,7 @@ public class ItemTemplateID extends TemplateID<ItemTemplate, Integer> {
 	}
 
 	@Override
-	public ItemTemplate getTemplate() {
+	public ItemTemplate loadTemplate() {
 		return templateService.getTemplate(this);
 	}
 }
diff --git a/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java b/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java
index 72e43fb18..550862d07 100644
--- a/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java
+++ b/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java
@@ -40,7 +40,7 @@ public class SkillTemplateID extends TemplateID<SkillTemplate, Integer> {
 	}
 
 	@Override
-	public SkillTemplate getTemplate() {
+	public SkillTemplate loadTemplate() {
 		return templateService.getTemplate(this);
 	}
 }
diff --git a/src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java b/src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java
index d858481da..3e74e1c6e 100644
--- a/src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java
+++ b/src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java
@@ -47,7 +47,7 @@ public class TeleportationTemplateID extends
 	}
 
 	@Override
-	public TeleportationTemplate getTemplate() {
+	public TeleportationTemplate loadTemplate() {
 		return templateService.getTemplate(this);
 	}
 }
diff --git a/src/main/java/com/l2jserver/model/world/npc/controller/MonsterController.java b/src/main/java/com/l2jserver/model/world/npc/controller/MonsterController.java
index 4b3695ba9..d0792661d 100644
--- a/src/main/java/com/l2jserver/model/world/npc/controller/MonsterController.java
+++ b/src/main/java/com/l2jserver/model/world/npc/controller/MonsterController.java
@@ -23,6 +23,7 @@ import com.l2jserver.game.net.packet.server.SM_STATUS_UPDATE.Stat;
 import com.l2jserver.model.world.L2Character;
 import com.l2jserver.model.world.NPC;
 import com.l2jserver.service.game.character.CharacterService;
+import com.l2jserver.service.game.npc.NPCService;
 import com.l2jserver.util.exception.L2Exception;
 
 /**
@@ -36,13 +37,23 @@ public class MonsterController extends BaseNPCController {
 	 */
 	@Inject
 	protected CharacterService charService;
+	/**
+	 * The {@link NPCService}
+	 */
+	@Inject
+	protected NPCService npcService;
 
 	@Override
-	public void action(NPC npc, Lineage2Connection conn, L2Character character,
+	public void action(NPC mob, Lineage2Connection conn, L2Character character,
 			String... args) throws L2Exception {
 		// send hp update
-		conn.write(new SM_STATUS_UPDATE(npc).add(Stat.MAX_HP,
-				(int) npc.getTemplate().getMaximumHP()).add(Stat.HP,
-				(int) npc.getHP()));
+		if (mob.getID().equals(character.getTargetID())) {
+			charService.attack(character, mob);
+		} else {
+			charService.target(character, mob);
+			conn.write(new SM_STATUS_UPDATE(mob).add(Stat.MAX_HP,
+					(int) mob.getTemplate().getMaximumHP()).add(Stat.HP,
+					(int) mob.getHP()));
+		}
 	}
 }
diff --git a/src/main/java/com/l2jserver/service/ServiceModule.java b/src/main/java/com/l2jserver/service/ServiceModule.java
index 547cf44b4..ef5fe60fd 100644
--- a/src/main/java/com/l2jserver/service/ServiceModule.java
+++ b/src/main/java/com/l2jserver/service/ServiceModule.java
@@ -20,7 +20,7 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Module;
 import com.google.inject.Scopes;
 import com.l2jserver.service.cache.CacheService;
-import com.l2jserver.service.cache.EhCacheService;
+import com.l2jserver.service.cache.SoftCacheService;
 import com.l2jserver.service.configuration.ConfigurationService;
 import com.l2jserver.service.configuration.ProxyConfigurationService;
 import com.l2jserver.service.core.Log4JLoggingService;
@@ -78,7 +78,8 @@ public class ServiceModule extends AbstractModule {
 				Scopes.SINGLETON);
 		bind(ConfigurationService.class).to(ProxyConfigurationService.class)
 				.in(Scopes.SINGLETON);
-		bind(CacheService.class).to(EhCacheService.class).in(Scopes.SINGLETON);
+		bind(CacheService.class).to(SoftCacheService.class)
+				.in(Scopes.SINGLETON);
 
 		bind(DatabaseService.class).to(JDBCDatabaseService.class).in(
 				Scopes.SINGLETON);
diff --git a/src/main/java/com/l2jserver/service/cache/WeakCacheService.java b/src/main/java/com/l2jserver/service/cache/WeakCacheService.java
index b5cca9590..34c016407 100644
--- a/src/main/java/com/l2jserver/service/cache/WeakCacheService.java
+++ b/src/main/java/com/l2jserver/service/cache/WeakCacheService.java
@@ -18,7 +18,6 @@ package com.l2jserver.service.cache;
 
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
-import java.lang.ref.SoftReference;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
@@ -31,7 +30,7 @@ import com.l2jserver.service.ServiceStartException;
 import com.l2jserver.service.ServiceStopException;
 
 /**
- * This {@link Cache} service implementation uses a {@link SoftReference} to
+ * This {@link Cache} service implementation uses a {@link WeakReference} to
  * store values.
  * 
  * @author <a href="http://www.rogiel.com">Rogiel</a>
diff --git a/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java b/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java
index 4d07b612e..ba707087b 100644
--- a/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java
+++ b/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java
@@ -162,9 +162,6 @@ public class CharacterServiceImpl extends AbstractService implements
 			}
 		};
 
-		// start broadcasting -- will broadcast all nearby objects
-		broadcastService.broadcast(conn);
-
 		// leave world event
 		eventDispatcher.addListener(id, new CharacterListener() {
 			@Override
@@ -205,6 +202,9 @@ public class CharacterServiceImpl extends AbstractService implements
 		conn.sendMessage("This an an development version for l2jserver 2.0");
 		conn.sendMessage("Please note that many of the features are not yet implemented.");
 
+		// start broadcasting -- will broadcast all nearby objects
+		broadcastService.broadcast(conn);
+
 		// characters start in run mode
 		try {
 			run(character);
@@ -282,9 +282,12 @@ public class CharacterServiceImpl extends AbstractService implements
 		// check if this Actor can be attacked
 		if (target instanceof NPC) {
 			final NPC npc = (NPC) target;
-			// first try to target this, if it is not already
-			target(character, target);
 
+			// first try to target this, if it is not already
+			if (!npc.getID().equals(character.getTargetID()))
+				target(character, target);
+
+			// now attack the npc
 			npcService.attack(npc, conn, character);
 		} else {
 			// TODO throw an exception
diff --git a/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java b/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java
index 0198fdfe3..539b04325 100644
--- a/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java
+++ b/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java
@@ -115,9 +115,6 @@ public class NPCServiceImpl extends AbstractService implements NPCService {
 		Preconditions.checkNotNull(character, "character");
 		Preconditions.checkNotNull(action, "action");
 
-		if (npc.getTemplate().isTargetable())
-			characterService.target(character, npc);
-
 		final Lineage2Connection conn = networkService.discover(character
 				.getID());
 		try {
@@ -136,9 +133,6 @@ public class NPCServiceImpl extends AbstractService implements NPCService {
 		if (args == null)
 			args = new String[0];
 
-		if (npc.getTemplate().isTargetable())
-			characterService.target(character, npc);
-
 		final Lineage2Connection conn = networkService.discover(character
 				.getID());
 		try {
diff --git a/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java b/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java
index 04d31cf90..2dd5a99d1 100644
--- a/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java
+++ b/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java
@@ -33,7 +33,7 @@ public class RangeFilter implements WorldObjectFilter<PositionableObject> {
 	/**
 	 * The desired maximum distance of the object
 	 */
-	private final int range;
+	private final double range;
 
 	/**
 	 * Creates a new instance
@@ -47,13 +47,14 @@ public class RangeFilter implements WorldObjectFilter<PositionableObject> {
 		Preconditions.checkNotNull(object, "object");
 		Preconditions.checkState(range >= 0, "range < 0");
 		this.object = object;
-		this.range = range;
+		this.range = Math.pow(range, 2);
 	}
 
 	@Override
 	public boolean accept(PositionableObject other) {
 		if (other == null)
 			return false;
-		return other.getPosition().getDistance(object.getPosition()) <= range;
+		
+		return other.getPosition().getDistanceSquared(object.getPosition()) <= range;
 	}
 }
diff --git a/src/main/java/com/l2jserver/service/game/world/filter/impl/RangePointFilter.java b/src/main/java/com/l2jserver/service/game/world/filter/impl/RangePointFilter.java
index e288ca00d..cb3fbf1d5 100644
--- a/src/main/java/com/l2jserver/service/game/world/filter/impl/RangePointFilter.java
+++ b/src/main/java/com/l2jserver/service/game/world/filter/impl/RangePointFilter.java
@@ -16,6 +16,8 @@
  */
 package com.l2jserver.service.game.world.filter.impl;
 
+import org.apache.commons.math.util.FastMath;
+
 import com.google.common.base.Preconditions;
 import com.l2jserver.model.world.PositionableObject;
 import com.l2jserver.service.game.world.filter.WorldObjectFilter;
@@ -34,7 +36,11 @@ public class RangePointFilter implements WorldObjectFilter<PositionableObject> {
 	/**
 	 * The desired maximum distance of the object
 	 */
-	private final int range;
+	private final double range;
+	/**
+	 * The <tt>range</tt> multiplied by two
+	 */
+	private final double doubleRange;
 
 	/**
 	 * Creates a new instance
@@ -48,13 +54,25 @@ public class RangePointFilter implements WorldObjectFilter<PositionableObject> {
 		Preconditions.checkNotNull(point, "point");
 		Preconditions.checkState(range >= 0, "range < 0");
 		this.point = point;
-		this.range = range;
+		this.range = Math.pow(range, 2);
+		this.doubleRange = range * 2;
 	}
 
 	@Override
 	public boolean accept(PositionableObject other) {
 		if (other == null)
 			return false;
-		return other.getPosition().getDistance(point.getCoordinate()) <= range;
+		final double dx = FastMath.abs(point.getX() - other.getPoint().getX());
+		final double dy = FastMath.abs(point.getY() - other.getPoint().getY());
+		final double dz = FastMath.abs(point.getZ() - other.getPoint().getZ());
+
+		if (dx > doubleRange)
+			return false;
+		if (dy > doubleRange)
+			return false;
+		if (dz > doubleRange)
+			return false;
+
+		return ((dx * dx) + (dy * dy) + (dz * dz)) <= range;
 	}
 }
diff --git a/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java b/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java
index 4de2cd490..96b930fda 100644
--- a/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java
+++ b/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java
@@ -76,7 +76,7 @@ public class BroadcastServiceImpl extends AbstractService implements
 		final CharacterID id = character.getID();
 
 		// broadcast everything nearby
-		broadcast(conn);
+		//broadcast(conn);
 
 		// event broadcast listener
 		// this listener will be filtered so that only interesting events are
diff --git a/src/main/java/com/l2jserver/util/geometry/Coordinate.java b/src/main/java/com/l2jserver/util/geometry/Coordinate.java
index b8dde8e2b..5c1124693 100644
--- a/src/main/java/com/l2jserver/util/geometry/Coordinate.java
+++ b/src/main/java/com/l2jserver/util/geometry/Coordinate.java
@@ -71,6 +71,19 @@ public class Coordinate {
 		return Vector3D.distance(vector, other.vector);
 	}
 
+	/**
+	 * Calculates the squared distance between <tt>this</tt> coordinate and
+	 * <tt>other</tt>. This method is slighter faster then
+	 * {@link #getDistance(Coordinate)}.
+	 * 
+	 * @param other
+	 *            the other coordinate
+	 * @return the calculated distance
+	 */
+	public double getDistanceSquared(Coordinate other) {
+		return Vector3D.distanceSq(vector, other.vector);
+	}
+
 	/**
 	 * Creates a new instance from the 3 points
 	 * 
diff --git a/src/tool/java/com/l2jserver/model/template/NPCTemplateConverter.java b/src/tool/java/com/l2jserver/model/template/NPCTemplateConverter.java
index e5c7b0342..48c297966 100644
--- a/src/tool/java/com/l2jserver/model/template/NPCTemplateConverter.java
+++ b/src/tool/java/com/l2jserver/model/template/NPCTemplateConverter.java
@@ -64,6 +64,7 @@ import com.l2jserver.model.template.NPCTemplate.TalkMetadata;
 import com.l2jserver.model.template.TeleportationTemplate.TeleportRestriction;
 import com.l2jserver.model.world.Actor.ActorSex;
 import com.l2jserver.model.world.npc.controller.BaseNPCController;
+import com.l2jserver.model.world.npc.controller.MonsterController;
 import com.l2jserver.model.world.npc.controller.NPCController;
 import com.l2jserver.model.world.npc.controller.NotImplementedNPCController;
 import com.l2jserver.model.world.npc.controller.TeleporterController;
@@ -92,6 +93,8 @@ public class NPCTemplateConverter {
 		controllers.put("L2Teleporter", TeleporterController.class);
 		controllers.put("L2CastleTeleporter", TeleporterController.class);
 		controllers.put("L2Npc", BaseNPCController.class);
+		controllers.put("L2Monster", MonsterController.class);
+		controllers.put("L2FlyMonster", MonsterController.class);
 		Class.forName("com.mysql.jdbc.Driver");
 
 		final File target = new File("data/templates");