-void npc_escortAI::AddWaypoint(uint32 id, float x, float y, float z, uint32 waitTime /*= 0*/)
+void npc_escortAI::AddWaypoint(uint32 id, float x, float y, float z, uint32 waitTime)
 {
     Escort_Waypoint t(id, x, y, z, waitTime);

@@ -400,19 +396,13 @@ void npc_escortAI::AddWaypoint(uint32 id, float x, float y, float z, uint32 wait
     PointMovementMap[wp.m_uiCreatureEntry].push_back(wp);*/
 }

-void npc_escortAI::AddWaypoint(uint32 id, Position const& pos, uint32 waitTime /*= 0*/)
-{
-    AddWaypoint(id, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), waitTime);
-}
-
 void npc_escortAI::FillPointMovementListForCreature()
 {
-    ScriptPointVector const& movePoints = sScriptSystemMgr->GetPointMoveList(me->GetEntry());
-    if (movePoints.empty())
+    ScriptPointVector const* movePoints = sScriptSystemMgr->GetPointMoveList(me->GetEntry());
+    if (!movePoints)
         return;

-    ScriptPointVector::const_iterator itrEnd = movePoints.end();
-    for (ScriptPointVector::const_iterator itr = movePoints.begin(); itr != itrEnd; ++itr)
+    for (ScriptPointVector::const_iterator itr = movePoints->begin(); itr != movePoints->end(); ++itr)
     {
         Escort_Waypoint point(itr->uiPointId, itr->fX, itr->fY, itr->fZ, itr->uiWaitTime);
         WaypointList.push_back(point);
@@ -444,13 +434,13 @@ void npc_escortAI::Start(bool isActiveAttacker /* = true*/, bool run /* = false
 {
     if (me->GetVictim())
     {