diff --git a/WowPacketParser/App.config b/WowPacketParser/App.config
index a5414ae0d4..d3ec342f15 100644
--- a/WowPacketParser/App.config
+++ b/WowPacketParser/App.config
@@ -201,6 +201,8 @@
         <add key="hotfix_optional_data"                   value="false"/>
         <add key="hotfixes"                               value="false"/>
 
+        <add key="creature_movement"                      value="false"/>
+
 
         <!--
                  Option:      ParseAllHotfixes
@@ -245,11 +247,18 @@
         <add key="GenerateCreateObject2SpawnsOnly" value="false"/>
 
         <!--
+               Option:      SkipIntermediatePoints
+               Description: Skips intermediate points for waypoint paths
+               Default:     "true"
+        -->
+        <add key="SkipIntermediatePoints" value="false"/>
+
+      <!--
                Option:      SkipDuplicateSpawns
                Description: Skip generation of duplicate spawns (grouped by: entry, phases, position)
                Default:     "true"
         -->
-        <add key="SkipDuplicateSpawns" value="true"/>
+      <add key="SkipDuplicateSpawns" value="true"/>
 
         <!--
              Option:      SplitSQLFile
diff --git a/WowPacketParser/Enums/SQLOutput.cs b/WowPacketParser/Enums/SQLOutput.cs
index a24439a9d5..ca3142a687 100644
--- a/WowPacketParser/Enums/SQLOutput.cs
+++ b/WowPacketParser/Enums/SQLOutput.cs
@@ -19,6 +19,7 @@ public enum SQLOutput
         creature_addon,
         creature_equip_template,
         creature_model_info,
+        creature_movement,
         creature_queststarter,
         creature_questender,
         creature_template,
diff --git a/WowPacketParser/Misc/Settings.cs b/WowPacketParser/Misc/Settings.cs
index de1a704de3..0af3c6c56e 100644
--- a/WowPacketParser/Misc/Settings.cs
+++ b/WowPacketParser/Misc/Settings.cs
@@ -31,6 +31,7 @@ public static class Settings
         public static readonly bool ForcePhaseZero = Conf.GetBoolean("ForcePhaseZero", false);
         public static readonly bool GenerateCreateObject2SpawnsOnly = Conf.GetBoolean("GenerateCreateObject2SpawnsOnly", false);
         public static readonly bool SkipDuplicateSpawns = Conf.GetBoolean("SkipDuplicateSpawns", false);
+        public static readonly bool SkipIntermediatePoints = Conf.GetBoolean("SkipDuplicateSpawns", false);
         public static readonly string SQLFileName = Conf.GetString("SQLFileName", string.Empty);
         public static readonly bool SplitSQLFile = Conf.GetBoolean("SplitSQLFile", false);
         public static readonly bool ShowEndPrompt = Conf.GetBoolean("ShowEndPrompt", false);
diff --git a/WowPacketParser/SQL/Builders/Movement.cs b/WowPacketParser/SQL/Builders/Movement.cs
new file mode 100644
index 0000000000..6517d56526
--- /dev/null
+++ b/WowPacketParser/SQL/Builders/Movement.cs
@@ -0,0 +1,118 @@
+using System;
+using WowPacketParser.Enums;
+using WowPacketParser.Misc;
+using WowPacketParser.Store;
+using WowPacketParser.SQL;
+using System.Linq;
+
+namespace WowPacketParser.SQL.Builders
+{
+    [BuilderClass]
+    public static class Movement
+    {
+        [BuilderMethod]
+        public static string MovementData()
+        {
+            if (Storage.CreatureMovement.IsEmpty())
+                return string.Empty;
+
+            if (!Settings.SQLOutputFlag.HasAnyFlagBit(SQLOutput.creature_movement))
+                return string.Empty;
+
+            string output = "SET @MOVID = 0;\n";
+            int pathIdCounter = 0;
+            if (Settings.TargetedProject == TargetedProject.Cmangos)
+            {
+                string nodeSql = "INSERT INTO waypoint_path (PathId, Point, PositionX, PositionY, PositionZ, Orientation, WaitTime, ScriptId, Comment) VALUES\n";
+                foreach (var data in Storage.CreatureMovement.ToList())
+                {
+                    var creatureMovement = data.Item1;
+                    if (creatureMovement.Waypoints.Count == 0)
+                        continue;
+
+                    string creatureName = SQLUtil.EscapeString(StoreGetters.GetName(Utilities.ObjectTypeToStore(creatureMovement.GUID.GetObjectType()), (int)creatureMovement.GUID.GetEntry()));
+                    output += "-- " + $"GUID: {creatureMovement.GUID} PathType: {creatureMovement.Type}" + "\n" + $"INSERT INTO waypoint_path_name(PathId, Name) VALUES(@MOVID + {pathIdCounter},'{creatureName}');\n" + nodeSql;
+
+                    int pointIdCounter = 1;
+                    int actualPoint = 1;
+                    foreach (var node in creatureMovement.Waypoints)
+                    {
+                        bool finalP = creatureMovement.Destination == null && creatureMovement.Waypoints.Count == actualPoint;
+                        ++actualPoint;
+                        float ori = finalP ? (creatureMovement.FinalOrientation != null ? creatureMovement.FinalOrientation.Value : 100f) : 100f;
+                        if (node.Point == false)
+                        {
+                            if (Settings.SkipIntermediatePoints == true)
+                                continue;
+                            output += "-- ";
+                        }
+
+                        output += $"(@MOVID + {pathIdCounter}, '{pointIdCounter}', '{node.Position.X}', '{node.Position.Y}', '{node.Position.Z}', '{ori}', '0', '0', NULL)";
+                        
+                        if (!finalP)
+                            output += ",\n";
+                        else
+                            output += ";\n\n";
+                        
+                        ++pointIdCounter;
+                    }
+
+                    if (creatureMovement.Destination != null)
+                    {
+                        float ori = creatureMovement.FinalOrientation != null ? creatureMovement.FinalOrientation.Value : 100f;
+                        output += $"(@MOVID + {pathIdCounter}, '{pointIdCounter}', '{creatureMovement.Destination.Position.X}', '{creatureMovement.Destination.Position.Y}', '{creatureMovement.Destination.Position.Z}', '{ori}', '0', '0', NULL);\n";
+                    }
+
+                    ++pathIdCounter;
+                }
+            }
+            else if (Settings.TargetedProject == TargetedProject.TrinityCore)
+            {
+                string nodeSql = "INSERT INTO waypoint_path_node (PathId, NodeId, PositionX, PositionY, PositionZ, Orientation, Delay) VALUES\n";
+                foreach (var data in Storage.CreatureMovement.ToList())
+                {
+                    var creatureMovement = data.Item1;
+                    if (creatureMovement.Waypoints.Count == 0)
+                        continue;
+
+                    string commentInformation = $"GUID: {creatureMovement.GUID} PathType: {creatureMovement.Type}";
+                    output += "-- " + commentInformation + "\n";
+                    output += nodeSql;
+
+                    int pointIdCounter = 1;
+                    int actualPoint = 1;
+                    foreach (var node in creatureMovement.Waypoints)
+                    {
+                        bool finalP = creatureMovement.Destination == null && creatureMovement.Waypoints.Count == actualPoint;
+                        ++actualPoint;
+                        float ori = finalP ? (creatureMovement.FinalOrientation != null ? creatureMovement.FinalOrientation.Value : 100f) : 100f;
+                        if (node.Point == false)
+                        {
+                            if (Settings.SkipIntermediatePoints == true)
+                                continue;
+                            output += "-- ";
+                        }
+                        output += $"(@MOVID + {pathIdCounter}, '{pointIdCounter}', '{node.Position.X}', '{node.Position.Y}', '{node.Position.Z}', '{ori}')";
+
+                        if (!finalP)
+                            output += ",\n";
+                        else
+                            output += ";\n\n";
+
+                        ++pointIdCounter;
+                    }
+
+                    if (creatureMovement.Destination != null)
+                    {
+                        float ori = creatureMovement.FinalOrientation != null ? creatureMovement.FinalOrientation.Value : 100f;
+                        output += $"(@MOVID + {pathIdCounter}, '{pointIdCounter}', '{creatureMovement.Destination.Position.X}', '{creatureMovement.Destination.Position.Y}', '{creatureMovement.Destination.Position.Z}', '{ori}', '0', '0', NULL);\n\n";
+                    }
+
+                    ++pathIdCounter;
+                }
+            }
+
+            return output;
+        }
+    }
+}
diff --git a/WowPacketParser/Store/Objects/Movement/CreatureMovement.cs b/WowPacketParser/Store/Objects/Movement/CreatureMovement.cs
new file mode 100644
index 0000000000..a19fda1ac8
--- /dev/null
+++ b/WowPacketParser/Store/Objects/Movement/CreatureMovement.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using WowPacketParser.Misc;
+
+namespace WowPacketParser.Store.Objects.Movement
+{
+    public class CreatureMovement
+    {
+        public CreatureMovementFlags Type { get; set; }
+        public WowGuid GUID { get; set; }
+        public int PathId { get; set; }
+        public int Id { get; set; }
+        public List<CreatureMovementNode> Waypoints { get; set; } = new();
+        public CreatureMovementNode? Destination { get; set; } = null;
+        public float? FinalOrientation { get; set; } = null; // signals end of current path and wait time
+    }
+}
diff --git a/WowPacketParser/Store/Objects/Movement/CreatureMovementFlags.cs b/WowPacketParser/Store/Objects/Movement/CreatureMovementFlags.cs
new file mode 100644
index 0000000000..2934fbd1b6
--- /dev/null
+++ b/WowPacketParser/Store/Objects/Movement/CreatureMovementFlags.cs
@@ -0,0 +1,12 @@
+namespace WowPacketParser.Store.Objects.Movement
+{
+    public enum CreatureMovementFlags
+    {
+        None                    = 0, // pathfinding
+        ExactPath               = 1, // sent fully
+        ExactPathFlying         = 2, // sent fully + flying flag
+        ExactPathFlyingCyclic   = 3, // sent fully + flying flag + cyclic flag
+        ExactPathAndJump        = 4, // sent fully + parabolic movement at the end
+        Invalid                 = 100,            
+    }
+}
diff --git a/WowPacketParser/Store/Objects/Movement/CreatureMovementNode.cs b/WowPacketParser/Store/Objects/Movement/CreatureMovementNode.cs
new file mode 100644
index 0000000000..1dd40323c3
--- /dev/null
+++ b/WowPacketParser/Store/Objects/Movement/CreatureMovementNode.cs
@@ -0,0 +1,10 @@
+using WowPacketParser.Misc;
+
+namespace WowPacketParser.Store.Objects.Movement
+{
+    public class CreatureMovementNode
+    {
+        public Vector3 Position { get; set; }
+        public bool Point { get; set; }
+    }
+}
diff --git a/WowPacketParser/Store/Storage.cs b/WowPacketParser/Store/Storage.cs
index 4903ed6037..aa7afe4136 100644
--- a/WowPacketParser/Store/Storage.cs
+++ b/WowPacketParser/Store/Storage.cs
@@ -3,6 +3,7 @@
 using WowPacketParser.Enums;
 using WowPacketParser.Misc;
 using WowPacketParser.Store.Objects;
+using WowPacketParser.Store.Objects.Movement;
 
 namespace WowPacketParser.Store
 {
@@ -114,6 +115,9 @@ public static class Storage
         // Weather updates
         public static readonly DataBag<WeatherUpdate> WeatherUpdates = new DataBag<WeatherUpdate>(new List<SQLOutput> { SQLOutput.weather_updates });
 
+        // Movement
+        public static readonly StoreBag<CreatureMovement> CreatureMovement = new StoreBag<CreatureMovement>(new List<SQLOutput> { SQLOutput.creature_movement });
+
         // Npc Spell Click
         public static readonly StoreBag<WowGuid> NpcSpellClicks = new StoreBag<WowGuid>(new List<SQLOutput> { SQLOutput.npc_spellclick_spells });
         public static readonly DataBag<NpcSpellClick> SpellClicks = new DataBag<NpcSpellClick>(new List<SQLOutput> { SQLOutput.npc_spellclick_spells });
diff --git a/WowPacketParserModule.V2_5_1_38707/Parsers/UpdateHandler.cs b/WowPacketParserModule.V2_5_1_38707/Parsers/UpdateHandler.cs
index 7a2a341711..dde635f9d3 100644
--- a/WowPacketParserModule.V2_5_1_38707/Parsers/UpdateHandler.cs
+++ b/WowPacketParserModule.V2_5_1_38707/Parsers/UpdateHandler.cs
@@ -1,10 +1,13 @@
-using WowPacketParser.Enums;
+using System.Drawing;
+using System.Linq;
+using WowPacketParser.Enums;
 using WowPacketParser.Misc;
 using WowPacketParser.PacketStructures;
 using WowPacketParser.Parsing;
 using WowPacketParser.Proto;
 using WowPacketParser.Store;
 using WowPacketParser.Store.Objects;
+using WowPacketParser.Store.Objects.Movement;
 using WowPacketParser.Store.Objects.UpdateFields;
 using CoreFields = WowPacketParser.Enums.Version;
 using CoreParsers = WowPacketParser.Parsing.Parsers;
@@ -441,14 +444,35 @@ private static MovementInfo ReadMovementUpdateBlock(Packet packet, WowGuid guid,
                 {
                     packet.ResetBitReader();
                     packet.ReadInt32("ID", index);
-                    packet.ReadVector3("Destination", index);
+
+                    CreatureMovement movement = Storage.CreatureMovement.Where(p => p.Item1.GUID == guid).SingleOrDefault()?.Item1;
+                    bool add = false;
+                    if (movement == null)
+                    {
+                        movement = new CreatureMovement()
+                        {
+                            GUID = guid
+                        };
+                        add = true;
+                    }
+
+                    var destination = packet.ReadVector3("Destination", index);
 
                     var hasMovementSplineMove = packet.ReadBit("MovementSplineMove", index);
                     if (hasMovementSplineMove)
                     {
                         packet.ResetBitReader();
 
-                        packet.ReadUInt32E<SplineFlag>("SplineFlags", index);
+                        var splineFlag = packet.ReadUInt32E<SplineFlag>("SplineFlags", index);
+                        CreatureMovementFlags moveType = CreatureMovementFlags.None;
+
+                        if (splineFlag.HasFlag(SplineFlag.EnterCycle) || splineFlag.HasFlag(SplineFlag.Cyclic))
+                            moveType = CreatureMovementFlags.ExactPathFlyingCyclic;
+                        else if (splineFlag.HasFlag(SplineFlag.Flying))
+                            moveType = CreatureMovementFlags.ExactPathFlying;
+                        else if (splineFlag.HasFlag(SplineFlag.UncompressedPath))
+                            moveType = CreatureMovementFlags.ExactPath;
+
                         packet.ReadInt32("Elapsed", index);
                         packet.ReadUInt32("Duration", index);
                         packet.ReadSingle("DurationModifier", index);
@@ -493,6 +517,7 @@ private static MovementInfo ReadMovementUpdateBlock(Packet packet, WowGuid guid,
                                 break;
                             case 3:
                                 orientation = packet.ReadSingle("FaceDirection", index);
+                                moveType = CreatureMovementFlags.Invalid;
                                 break;
                             default:
                                 break;
@@ -504,13 +529,23 @@ private static MovementInfo ReadMovementUpdateBlock(Packet packet, WowGuid guid,
                         for (var i = 0; i < pointsCount; ++i)
                         {
                             var spot = packet.ReadVector3("Points", index, i);
+                            if (moveType != CreatureMovementFlags.Invalid)
+                                movement.Waypoints.Add(new CreatureMovementNode
+                                {
+                                    Position = spot,
+                                    Point = splineFlag.HasFlag(SplineFlag.EnterCycle) || splineFlag.HasFlag(SplineFlag.Cyclic)
+                                });
                         }
 
                         if (hasSpellEffectExtraData)
                             V8_0_1_27101.Parsers.MovementHandler.ReadMonsterSplineSpellEffectExtraData(packet, index);
 
                         if (hasJumpExtraData)
-                            V8_0_1_27101.Parsers.MovementHandler.ReadMonsterSplineJumpExtraData(packet, index);
+                        {
+                            var jumpData = V8_0_1_27101.Parsers.MovementHandler.ReadMonsterSplineJumpExtraData(packet, index);
+                            if (jumpData.StartTime > 0)
+                                moveType = CreatureMovementFlags.ExactPathAndJump;
+                        }
 
                         if (hasAnimationTierTransition)
                         {
@@ -531,6 +566,9 @@ private static MovementInfo ReadMovementUpdateBlock(Packet packet, WowGuid guid,
                             }
                         }
                     }
+
+                    if (movement.Type != CreatureMovementFlags.Invalid && add)
+                        Storage.CreatureMovement.Add(movement);
                 }
             }
 
diff --git a/WowPacketParserModule.V3_4_0_45166/Parsers/MovementHandler.cs b/WowPacketParserModule.V3_4_0_45166/Parsers/MovementHandler.cs
index 5577cea982..5c941689ef 100644
--- a/WowPacketParserModule.V3_4_0_45166/Parsers/MovementHandler.cs
+++ b/WowPacketParserModule.V3_4_0_45166/Parsers/MovementHandler.cs
@@ -8,8 +8,10 @@
 using WowPacketParser.PacketStructures;
 using WowPacketParser.Parsing;
 using WowPacketParser.Proto;
+using WowPacketParser.SQL.Builders;
 using WowPacketParser.Store;
 using WowPacketParser.Store.Objects;
+using WowPacketParser.Store.Objects.Movement;
 using CoreParsers = WowPacketParser.Parsing.Parsers;
 using MovementFlag = WowPacketParser.Enums.v4.MovementFlag;
 using MovementFlag2 = WowPacketParser.Enums.v4.MovementFlag2;
@@ -55,10 +57,21 @@ public static SplineJump ReadMonsterSplineJumpExtraData(Packet packet, params ob
             return jump;
         }
 
-        public static void ReadMovementSpline(Packet packet, Vector3 pos, params object[] indexes)
+        public static void ReadMovementSpline(Packet packet, Vector3 pos, CreatureMovement movement, params object[] indexes)
         {
             PacketMonsterMove monsterMove = packet.Holder.MonsterMove;
-            monsterMove.Flags = packet.ReadUInt32E<SplineFlag>("Flags", indexes).ToUniversal();
+            var splineFlag = packet.ReadUInt32E<SplineFlag>("Flags", indexes);
+            monsterMove.Flags = splineFlag.ToUniversal();
+
+            CreatureMovementFlags moveType = CreatureMovementFlags.None;
+
+            if (splineFlag.HasFlag(SplineFlag.EnterCicle) || splineFlag.HasFlag(SplineFlag.Cyclic))
+                moveType = CreatureMovementFlags.ExactPathFlyingCyclic;
+            else if (splineFlag.HasFlag(SplineFlag.Flying))
+                moveType = CreatureMovementFlags.ExactPathFlying;
+            else if (splineFlag.HasFlag(SplineFlag.UncompressedPath))
+                moveType = CreatureMovementFlags.ExactPath;
+
             if (ClientVersion.RemovedInVersion(ClientType.Shadowlands))
             {
                 packet.ReadByte("AnimTier", indexes);
@@ -109,6 +122,7 @@ public static void ReadMovementSpline(Packet packet, Vector3 pos, params object[
                     SplineLookTarget lookTarget = monsterMove.LookTarget = new();
                     lookTarget.Orientation = packet.ReadSingle("FaceDirection", indexes);
                     lookTarget.Target = packet.ReadPackedGuid128("FacingGUID", indexes);
+                    moveType = CreatureMovementFlags.Invalid;
                     break;
                 case SplineFacingType.Angle:
                     monsterMove.LookOrientation = packet.ReadSingle("FaceDirection", indexes);
@@ -148,7 +162,11 @@ public static void ReadMovementSpline(Packet packet, Vector3 pos, params object[
                 ReadMonsterSplineSpellEffectExtraData(packet, indexes, "MonsterSplineSpellEffectExtra");
 
             if (hasJumpExtraData)
+            {
                 monsterMove.Jump = ReadMonsterSplineJumpExtraData(packet, indexes, "MonsterSplineJumpExtraData");
+                if (monsterMove.Jump.StartTime > 0)
+                    moveType = CreatureMovementFlags.ExactPathAndJump;
+            }
 
             if (hasAnimTier)
             {
@@ -185,19 +203,48 @@ public static void ReadMovementSpline(Packet packet, Vector3 pos, params object[
                     Y = mid.Y - waypoints[i].Y,
                     Z = mid.Z - waypoints[i].Z
                 };
+                if (moveType != CreatureMovementFlags.Invalid)
+                    movement.Waypoints.Add(new CreatureMovementNode
+                    {
+                        Position = vec,
+                        Point = false
+                    });
                 monsterMove.PackedPoints.Add(vec);
                 packet.AddValue("WayPoints", vec, indexes, i);
             }
 
+            if (moveType != CreatureMovementFlags.Invalid)
+                foreach (var point in monsterMove.Points)
+                    movement.Waypoints.Add(new CreatureMovementNode
+                    {
+                        Position = point,
+                        Point = true
+                    });
+
             float moveTimeInSec = (float)monsterMove.MoveTime / 1000;
             float speedXY = (float)overallDist / moveTimeInSec;
             packet.AddValue("CalculatedSpeedXY", speedXY, indexes);
+            if (moveType != CreatureMovementFlags.Invalid)
+                movement.Type |= moveType;
         }
 
         public static void ReadMovementMonsterSpline(Packet packet, Vector3 pos, params object[] indexes)
         {
             PacketMonsterMove monsterMove = packet.Holder.MonsterMove;
             monsterMove.Id = packet.ReadUInt32("Id", indexes);
+
+            var guid = new WowGuid128(monsterMove.Mover.Guid128.Low, monsterMove.Mover.Guid128.High);
+            CreatureMovement movement = Storage.CreatureMovement.Where(p => p.Item1.GUID == guid).SingleOrDefault()?.Item1;
+            bool add = false;
+            if (movement == null)
+            {
+                movement = new CreatureMovement()
+                {
+                    GUID = guid
+                };
+                add = true;
+            }
+
             if (ClientVersion.RemovedInVersion(ClientBranch.Classic, ClientVersionBuild.V1_15_0_52302) || ClientVersion.Branch != ClientBranch.Classic)
                 monsterMove.Destination = packet.ReadVector3("Destination", indexes);
 
@@ -206,7 +253,10 @@ public static void ReadMovementMonsterSpline(Packet packet, Vector3 pos, params
             packet.ReadBit("CrzTeleport", indexes);
             packet.ReadBits("StopDistanceTolerance", 3, indexes);
 
-            ReadMovementSpline(packet, pos, indexes, "MovementSpline");
+            ReadMovementSpline(packet, pos, movement, indexes, "MovementSpline");
+
+            if (movement.Type != CreatureMovementFlags.Invalid && add)
+                Storage.CreatureMovement.Add(movement);
         }
 
         [Parser(Opcode.SMSG_LOGIN_SET_TIME_SPEED)]
diff --git a/WowPacketParserModule.V8_0_1_27101/Parsers/MovementHandler.cs b/WowPacketParserModule.V8_0_1_27101/Parsers/MovementHandler.cs
index aaac430d2a..80458027a4 100644
--- a/WowPacketParserModule.V8_0_1_27101/Parsers/MovementHandler.cs
+++ b/WowPacketParserModule.V8_0_1_27101/Parsers/MovementHandler.cs
@@ -6,6 +6,9 @@
 using WowPacketParser.Misc;
 using WowPacketParser.Parsing;
 using WowPacketParser.Proto;
+using WowPacketParser.Store;
+using WowPacketParser.Store.Objects.Movement;
+using WowPacketParserModule.V6_0_2_19033.Parsers;
 using WowPacketParserModule.V7_0_3_22248.Enums;
 using CoreParsers = WowPacketParser.Parsing.Parsers;
 using SplineFacingType = WowPacketParserModule.V6_0_2_19033.Enums.SplineFacingType;
@@ -51,10 +54,21 @@ public static SplineJump ReadMonsterSplineJumpExtraData(Packet packet, params ob
             return jump;
         }
 
-        public static void ReadMovementSpline(Packet packet, Vector3 pos, params object[] indexes)
+        public static void ReadMovementSpline(Packet packet, Vector3 pos, CreatureMovement movement, params object[] indexes)
         {
             PacketMonsterMove monsterMove = packet.Holder.MonsterMove;
-            monsterMove.Flags = packet.ReadUInt32E<SplineFlag>("Flags", indexes).ToUniversal();
+            var splineFlag = packet.ReadUInt32E<SplineFlag>("Flags", indexes);
+            monsterMove.Flags = splineFlag.ToUniversal();
+
+            CreatureMovementFlags moveType = CreatureMovementFlags.None;
+
+            if (splineFlag.HasFlag(SplineFlag.EnterCycle) || splineFlag.HasFlag(SplineFlag.Cyclic))
+                moveType = CreatureMovementFlags.ExactPathFlyingCyclic;
+            else if (splineFlag.HasFlag(SplineFlag.Flying))
+                moveType = CreatureMovementFlags.ExactPathFlying;
+            else if (splineFlag.HasFlag(SplineFlag.UncompressedPath))
+                moveType = CreatureMovementFlags.ExactPath;
+
             if (ClientVersion.RemovedInVersion(ClientType.Shadowlands))
             {
                 packet.ReadByte("AnimTier", indexes);
@@ -105,9 +119,11 @@ public static void ReadMovementSpline(Packet packet, Vector3 pos, params object[
                     SplineLookTarget lookTarget = monsterMove.LookTarget = new();
                     lookTarget.Orientation = packet.ReadSingle("FaceDirection", indexes);
                     lookTarget.Target = packet.ReadPackedGuid128("FacingGUID", indexes);
+                    moveType = CreatureMovementFlags.Invalid;
                     break;
                 case SplineFacingType.Angle:
                     monsterMove.LookOrientation = packet.ReadSingle("FaceDirection", indexes);
+                    movement.FinalOrientation = monsterMove.LookOrientation;
                     break;
                 default:
                     break;
@@ -144,7 +160,11 @@ public static void ReadMovementSpline(Packet packet, Vector3 pos, params object[
                 ReadMonsterSplineSpellEffectExtraData(packet, indexes, "MonsterSplineSpellEffectExtra");
 
             if (hasJumpExtraData)
+            {
                 monsterMove.Jump = ReadMonsterSplineJumpExtraData(packet, indexes, "MonsterSplineJumpExtraData");
+                if (monsterMove.Jump.StartTime > 0)
+                    moveType = CreatureMovementFlags.ExactPathAndJump;
+            }
 
             if (hasAnimTier)
             {
@@ -181,38 +201,76 @@ public static void ReadMovementSpline(Packet packet, Vector3 pos, params object[
                     Y = mid.Y - waypoints[i].Y,
                     Z = mid.Z - waypoints[i].Z
                 };
+                if (moveType != CreatureMovementFlags.Invalid)
+                    movement.Waypoints.Add(new CreatureMovementNode
+                    {
+                        Position = vec,
+                        Point = false
+                    });
                 monsterMove.PackedPoints.Add(vec);
                 packet.AddValue("WayPoints", vec, indexes, i);
             }
 
+            if (moveType != CreatureMovementFlags.Invalid)
+                foreach (var point in monsterMove.Points)
+                    movement.Waypoints.Add(new CreatureMovementNode
+                    {
+                        Position = point,
+                        Point = true
+                    });
+
             float moveTimeInSec = (float)monsterMove.MoveTime / 1000;
             float speedXY = (float)overallDist / moveTimeInSec;
             packet.AddValue("CalculatedSpeedXY", speedXY, indexes);
+            if (moveType != CreatureMovementFlags.Invalid)
+                movement.Type |= moveType;
         }
 
-        public static void ReadMovementMonsterSpline(Packet packet, Vector3 pos, params object[] indexes)
+        public static void ReadMovementMonsterSpline(Packet packet, Vector3 pos, WowGuid guid, params object[] indexes)
         {
             PacketMonsterMove monsterMove = packet.Holder.MonsterMove;
+            CreatureMovement movement = Storage.CreatureMovement.Where(p => p.Item1.GUID == guid).SingleOrDefault()?.Item1;
+            bool add = false;
+            if (movement == null)
+            {
+                movement = new CreatureMovement()
+                {
+                    GUID = guid
+                };
+                add = true;
+            }
             monsterMove.Id = packet.ReadUInt32("Id", indexes);
             if (ClientVersion.RemovedInVersion(ClientBranch.Retail, ClientVersionBuild.V10_2_0_52038) || ClientVersion.Branch != ClientBranch.Retail)
-                monsterMove.Destination = packet.ReadVector3("Destination", indexes);
+            {
+                var destination = packet.ReadVector3("Destination", indexes);
+                monsterMove.Destination = destination;
+                if (destination.X != 0 || destination.Y != 0 || destination.Z != 0)
+                {
+                    movement.Destination = new CreatureMovementNode();
+                    movement.Destination.Position = destination;
+                }
+            }
 
             packet.ResetBitReader();
 
             packet.ReadBit("CrzTeleport", indexes);
             packet.ReadBits("StopDistanceTolerance", 3, indexes);
 
-            ReadMovementSpline(packet, pos, indexes, "MovementSpline");
+            ReadMovementSpline(packet, pos, movement, indexes, "MovementSpline");
+
+            if (movement.Type != CreatureMovementFlags.Invalid && add)
+                Storage.CreatureMovement.Add(movement);
         }
 
         [Parser(Opcode.SMSG_ON_MONSTER_MOVE)]
         public static void HandleOnMonsterMove(Packet packet)
         {
             PacketMonsterMove monsterMove = packet.Holder.MonsterMove = new();
-            monsterMove.Mover = packet.ReadPackedGuid128("MoverGUID");
+            var moverGuid = packet.ReadPackedGuid128("MoverGUID");
+            monsterMove.Mover = moverGuid;
             Vector3 pos = monsterMove.Position = packet.ReadVector3("Position");
 
-            ReadMovementMonsterSpline(packet, pos, "MovementMonsterSpline");
+            ReadMovementMonsterSpline(packet, pos, moverGuid, "MovementMonsterSpline");
         }
 
         [Parser(Opcode.SMSG_PHASE_SHIFT_CHANGE)]