diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index d51844fbdd..2841c87620 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -53,17 +53,17 @@ public final class CallSkill extends AbstractEffect
 		Skill triggerSkill = null;
 		if (_skillLevelScaleTo <= 0)
 		{
-			// Mobius: Use 0 to trigger max learned skill level.
+			// Mobius: Use 0 to trigger max effector learned skill level.
 			if (_skill.getSkillLevel() == 0)
 			{
-				final int knownLevel = effected.getSkillLevel(_skill.getSkillId());
+				final int knownLevel = effector.getSkillLevel(_skill.getSkillId());
 				if (knownLevel > 0)
 				{
-					triggerSkill = new SkillHolder(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()).getSkill();
+					triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel());
 				}
 				else
 				{
-					LOGGER.warning("Player " + effected + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
 				}
 			}
 			else
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index d51844fbdd..2841c87620 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -53,17 +53,17 @@ public final class CallSkill extends AbstractEffect
 		Skill triggerSkill = null;
 		if (_skillLevelScaleTo <= 0)
 		{
-			// Mobius: Use 0 to trigger max learned skill level.
+			// Mobius: Use 0 to trigger max effector learned skill level.
 			if (_skill.getSkillLevel() == 0)
 			{
-				final int knownLevel = effected.getSkillLevel(_skill.getSkillId());
+				final int knownLevel = effector.getSkillLevel(_skill.getSkillId());
 				if (knownLevel > 0)
 				{
-					triggerSkill = new SkillHolder(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()).getSkill();
+					triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel());
 				}
 				else
 				{
-					LOGGER.warning("Player " + effected + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
 				}
 			}
 			else
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index d51844fbdd..2841c87620 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -53,17 +53,17 @@ public final class CallSkill extends AbstractEffect
 		Skill triggerSkill = null;
 		if (_skillLevelScaleTo <= 0)
 		{
-			// Mobius: Use 0 to trigger max learned skill level.
+			// Mobius: Use 0 to trigger max effector learned skill level.
 			if (_skill.getSkillLevel() == 0)
 			{
-				final int knownLevel = effected.getSkillLevel(_skill.getSkillId());
+				final int knownLevel = effector.getSkillLevel(_skill.getSkillId());
 				if (knownLevel > 0)
 				{
-					triggerSkill = new SkillHolder(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()).getSkill();
+					triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel());
 				}
 				else
 				{
-					LOGGER.warning("Player " + effected + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
 				}
 			}
 			else
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index d51844fbdd..2841c87620 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -53,17 +53,17 @@ public final class CallSkill extends AbstractEffect
 		Skill triggerSkill = null;
 		if (_skillLevelScaleTo <= 0)
 		{
-			// Mobius: Use 0 to trigger max learned skill level.
+			// Mobius: Use 0 to trigger max effector learned skill level.
 			if (_skill.getSkillLevel() == 0)
 			{
-				final int knownLevel = effected.getSkillLevel(_skill.getSkillId());
+				final int knownLevel = effector.getSkillLevel(_skill.getSkillId());
 				if (knownLevel > 0)
 				{
-					triggerSkill = new SkillHolder(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()).getSkill();
+					triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel());
 				}
 				else
 				{
-					LOGGER.warning("Player " + effected + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
 				}
 			}
 			else
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index d51844fbdd..2841c87620 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -53,17 +53,17 @@ public final class CallSkill extends AbstractEffect
 		Skill triggerSkill = null;
 		if (_skillLevelScaleTo <= 0)
 		{
-			// Mobius: Use 0 to trigger max learned skill level.
+			// Mobius: Use 0 to trigger max effector learned skill level.
 			if (_skill.getSkillLevel() == 0)
 			{
-				final int knownLevel = effected.getSkillLevel(_skill.getSkillId());
+				final int knownLevel = effector.getSkillLevel(_skill.getSkillId());
 				if (knownLevel > 0)
 				{
-					triggerSkill = new SkillHolder(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()).getSkill();
+					triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel());
 				}
 				else
 				{
-					LOGGER.warning("Player " + effected + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
 				}
 			}
 			else
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index d51844fbdd..2841c87620 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -53,17 +53,17 @@ public final class CallSkill extends AbstractEffect
 		Skill triggerSkill = null;
 		if (_skillLevelScaleTo <= 0)
 		{
-			// Mobius: Use 0 to trigger max learned skill level.
+			// Mobius: Use 0 to trigger max effector learned skill level.
 			if (_skill.getSkillLevel() == 0)
 			{
-				final int knownLevel = effected.getSkillLevel(_skill.getSkillId());
+				final int knownLevel = effector.getSkillLevel(_skill.getSkillId());
 				if (knownLevel > 0)
 				{
-					triggerSkill = new SkillHolder(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()).getSkill();
+					triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel());
 				}
 				else
 				{
-					LOGGER.warning("Player " + effected + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
 				}
 			}
 			else
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index d51844fbdd..2841c87620 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -53,17 +53,17 @@ public final class CallSkill extends AbstractEffect
 		Skill triggerSkill = null;
 		if (_skillLevelScaleTo <= 0)
 		{
-			// Mobius: Use 0 to trigger max learned skill level.
+			// Mobius: Use 0 to trigger max effector learned skill level.
 			if (_skill.getSkillLevel() == 0)
 			{
-				final int knownLevel = effected.getSkillLevel(_skill.getSkillId());
+				final int knownLevel = effector.getSkillLevel(_skill.getSkillId());
 				if (knownLevel > 0)
 				{
-					triggerSkill = new SkillHolder(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()).getSkill();
+					triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel());
 				}
 				else
 				{
-					LOGGER.warning("Player " + effected + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
 				}
 			}
 			else