diff --git a/WowPacketParser/Enums/ClientVersionBuild.cs b/WowPacketParser/Enums/ClientVersionBuild.cs
index d0e3494f03..7d5f278a8a 100644
--- a/WowPacketParser/Enums/ClientVersionBuild.cs
+++ b/WowPacketParser/Enums/ClientVersionBuild.cs
@@ -1000,6 +1000,17 @@ public enum ClientVersionBuild
         V5_5_0_62422 = 62422, // both live and ptr
         V5_5_0_62518 = 62518, // live
         V5_5_0_62655 = 62655, // live
+        V5_5_0_62959 = 62959, // both live and ptr
+
+        V5_5_1_63311 = 63311, // both live and ptr
+        V5_5_1_63364 = 63364, // both live and ptr
+        V5_5_1_63393 = 63393, // both live and ptr
+        V5_5_1_63421 = 63421, // both live and ptr
+        V5_5_1_63449 = 63449, // both live and ptr
+        V5_5_1_63538 = 63538, // both live and ptr
+
+        V5_5_2_64068 = 64068, // both live and ptr
+        V5_5_2_64133 = 64133, // both live and ptr
 
         // Battle.net - should probably not mix this but oh well
         BattleNetV37165 = 37165,
diff --git a/WowPacketParser/Enums/Version/Opcodes.cs b/WowPacketParser/Enums/Version/Opcodes.cs
index e0cad4a3cf..59da3a4ad9 100644
--- a/WowPacketParser/Enums/Version/Opcodes.cs
+++ b/WowPacketParser/Enums/Version/Opcodes.cs
@@ -1167,7 +1167,18 @@ public static ClientVersionBuild GetOpcodeDefiningBuild(ClientVersionBuild build
                 case ClientVersionBuild.V5_5_0_62422:
                 case ClientVersionBuild.V5_5_0_62518:
                 case ClientVersionBuild.V5_5_0_62655:
+                case ClientVersionBuild.V5_5_0_62959:
                     return ClientVersionBuild.V5_5_0_61735;
+                case ClientVersionBuild.V5_5_1_63311:
+                case ClientVersionBuild.V5_5_1_63364:
+                case ClientVersionBuild.V5_5_1_63393:
+                case ClientVersionBuild.V5_5_1_63421:
+                case ClientVersionBuild.V5_5_1_63449:
+                case ClientVersionBuild.V5_5_1_63538:
+                    return ClientVersionBuild.V5_5_1_63311;
+                case ClientVersionBuild.V5_5_2_64068:
+                case ClientVersionBuild.V5_5_2_64133:
+                    return ClientVersionBuild.V5_5_2_64068;
                 default:
                     return ClientVersionBuild.V3_3_5a_12340;
             }
diff --git a/WowPacketParser/Enums/Version/UpdateFields.cs b/WowPacketParser/Enums/Version/UpdateFields.cs
index f839c45ccb..e9981a1cec 100644
--- a/WowPacketParser/Enums/Version/UpdateFields.cs
+++ b/WowPacketParser/Enums/Version/UpdateFields.cs
@@ -1402,9 +1402,24 @@ private static string GetUpdateFieldDictionaryBuildName(ClientVersionBuild build
                 case ClientVersionBuild.V5_5_0_62422:
                 case ClientVersionBuild.V5_5_0_62518:
                 case ClientVersionBuild.V5_5_0_62655:
-                {
+                case ClientVersionBuild.V5_5_0_62959:
+                    {
                     return "V5_5_0_61735";
-                }
+                    }
+                case ClientVersionBuild.V5_5_1_63311:
+                case ClientVersionBuild.V5_5_1_63364:
+                case ClientVersionBuild.V5_5_1_63393:
+                case ClientVersionBuild.V5_5_1_63421:
+                case ClientVersionBuild.V5_5_1_63449:
+                case ClientVersionBuild.V5_5_1_63538:
+                    {
+                        return "V5_5_0_61735"; // tmp
+                    }
+                case ClientVersionBuild.V5_5_2_64068:
+                case ClientVersionBuild.V5_5_2_64133:
+                    {
+                        return "V5_5_0_61735"; // tmp
+                    }
                 default:
                 {
                     return "V3_3_5a_12340";
diff --git a/WowPacketParser/Misc/ClientVersion.cs b/WowPacketParser/Misc/ClientVersion.cs
index e23b48f800..7154f5e862 100644
--- a/WowPacketParser/Misc/ClientVersion.cs
+++ b/WowPacketParser/Misc/ClientVersion.cs
@@ -1603,9 +1603,18 @@ public static ClientVersionBuild GetVersionDefiningBuild(ClientVersionBuild buil
                 case ClientVersionBuild.V5_5_0_62422:
                 case ClientVersionBuild.V5_5_0_62518:
                 case ClientVersionBuild.V5_5_0_62655:
+                case ClientVersionBuild.V5_5_0_62959:
+                case ClientVersionBuild.V5_5_1_63311:
+                case ClientVersionBuild.V5_5_1_63364:
+                case ClientVersionBuild.V5_5_1_63393:
+                case ClientVersionBuild.V5_5_1_63421:
+                case ClientVersionBuild.V5_5_1_63449:
+                case ClientVersionBuild.V5_5_1_63538:
                 case ClientVersionBuild.V1_15_8_63829:
                 case ClientVersionBuild.V1_15_8_64057:
+                case ClientVersionBuild.V5_5_2_64068:
                 case ClientVersionBuild.V1_15_8_64130:
+                case ClientVersionBuild.V5_5_2_64133:
                     return ClientVersionBuild.V5_5_0_61735;
                 case ClientVersionBuild.BattleNetV37165:
                     return ClientVersionBuild.BattleNetV37165;
@@ -2292,6 +2301,15 @@ public static bool IsMoPClassicClientVersionBuild(ClientVersionBuild build)
                 case ClientVersionBuild.V5_5_0_62422:
                 case ClientVersionBuild.V5_5_0_62518:
                 case ClientVersionBuild.V5_5_0_62655:
+                case ClientVersionBuild.V5_5_0_62959:
+                case ClientVersionBuild.V5_5_1_63311:
+                case ClientVersionBuild.V5_5_1_63364:
+                case ClientVersionBuild.V5_5_1_63393:
+                case ClientVersionBuild.V5_5_1_63421:
+                case ClientVersionBuild.V5_5_1_63449:
+                case ClientVersionBuild.V5_5_1_63538:
+                case ClientVersionBuild.V5_5_2_64068:
+                case ClientVersionBuild.V5_5_2_64133:
                     return true;
                 default:
                     return false;
diff --git a/WowPacketParserModule.V6_0_2_19033/Parsers/NpcHandler.cs b/WowPacketParserModule.V6_0_2_19033/Parsers/NpcHandler.cs
index 050495dacd..6c0086d643 100644
--- a/WowPacketParserModule.V6_0_2_19033/Parsers/NpcHandler.cs
+++ b/WowPacketParserModule.V6_0_2_19033/Parsers/NpcHandler.cs
@@ -426,7 +426,10 @@ public static void HandleServerTrainerList(Packet packet)
                     }
                 }
 
-            trainer.Type = packet.ReadInt32E<TrainerType>("TrainerType");
+            if (ClientVersion.AddedInVersion(ClientVersionBuild.V11_2_5_63704))
+                trainer.Type = packet.ReadByteE<TrainerType>("TrainerType");
+            else
+                trainer.Type = packet.ReadInt32E<TrainerType>("TrainerType");
             trainer.Id = packet.ReadUInt32("TrainerID");
 
             var count = packet.ReadUInt32("Spells");