diff --git a/Source/Framework/Constants/BattleGroundsConst.cs b/Source/Framework/Constants/BattleGroundsConst.cs
index 1027afc3e..ceb0a2dcb 100644
--- a/Source/Framework/Constants/BattleGroundsConst.cs
+++ b/Source/Framework/Constants/BattleGroundsConst.cs
@@ -134,7 +134,70 @@ namespace Framework.Constants
                    // 809 = "New Nagrand Arena (Legion)"
         AF = 816, // Ashamane'S Fall
                   // 844 = "New Blade'S Edge Arena (Legion)"
-        RandomEpic = 901,
+        BrawlTbg = 846, // Brawl - The Battle For Gilneas (Old City Map)
+        BrawlAbw = 847, // Brawl - Arathi Basin Winter
+                        // 848 = "Ai Test - Arathi Basin"
+        BrawlDd = 849, // Brawl - Deepwind Dunk
+        BrawlSps = 853, // Brawl - Shadow-Pan Showdown
+                        // 856 = "[Temp] Racetrackbg"
+        Br = 857, // Blackrock
+        BrawlTh = 858, // Brawl - Temple Of Hotmogu
+        BrawlGl = 859, // Brawl - Gravity Lapse
+        BrawlDd2 = 860, // Brawl - Deepwind Dunk
+        BrawlWs = 861, // Brawl - Warsong Scramble
+        BrawlEh = 862, // Brawl - Eye Of The Horn
+        BrawlAa = 866, // Brawl - All Arenas
+        Rl2 = 868, // Ruins Of Lordaeron
+        Ds2 = 869, // Dalaran Sewers
+        Tva2 = 870, // Tol'Viron Arena
+        Ttp2 = 871, // The Tiger'S Peak
+        Brha2 = 872, // Black Rook Hold Arena
+        Na2 = 873, // Nagrand Arena
+        Af2 = 874, // Ashamane'S Fall
+        Bea2 = 875, // Blade'S Edge Arena
+                    // 878 = "Ai Test - Warsong Gulch"
+        BrawlDs = 879, // Brawl - Deep Six
+        BrawlAb = 880, // Brawl - Arathi Basin
+        BrawlDg = 881, // Brawl - Deepwind Gorge
+        BrawlEs = 882, // Brawl - Eye Of The Storm
+        BrawlSm = 883, // Brawl - Silvershard Mines
+        BrawlTk = 884, // Brawl - Temple Of Kotmogue
+        BrawlTbg2 = 885, // Brawl - The Battle For Gilneas
+        BrawlWg = 886, // Brawl - Warsong Gulch
+        Ci = 887, // Cooking: Impossible
+        DomSs = 890, // Domination - Seething Strand
+                     // 893 = "8.0 Bg Temp"
+        Ss = 894, // Seething Shore
+        Hp = 897, // Hooking Point
+        RandomEpic = 901, // Random Epic Battleground
+        Ttp3 = 902, // The Tiger'S Peak
+        Mb = 903, // Mugambala
+        BrawlAa2 = 904, // Brawl - All Arenas
+        BrawlAash = 905, // Brawl - All Arenas - Stocked House
+        Af3 = 906, // Ashamane'S Fall
+        Bea3 = 907, // Blade'S Edge Arena
+        Be2 = 908, // Blade'S Edge
+        Ds3 = 909, // Dalaran Sewers
+        Na3 = 910, // Nagrand Arena
+        Rl3 = 911, // Ruins Of Lordaeron
+        Tva3 = 912, // Tol'Viron Arena
+        Brha3 = 913, // Black Rook Hold Arena
+        WgCtf = 1014,     // Warsong Gulch Capture The Flag
+        EbBw = 1017,     // Epic Battleground - Battle For Wintergrasp
+        DomAb = 1018,     // Domination - Arathi Basin
+        AbCs = 1019,     // Arathi Basin Comp Stomp
+        EbA = 1020,     // Epic Battleground - Ashran
+        Ca = 1021,     // Classic Ashran (Endless)
+        BrawlAb2 = 1022,     // Brawl - Arathi Basin
+        Tr = 1025,     // The Robodrome (Arena)
+        RandomBg = 1029,     // Random Battleground
+        EbBw2 = 1030,     // Epic Battleground - Battle For Wintergrasp
+                          // 1031 = "Programmer Map - Battlefield"
+        Kr = 1033,     // Korrak'S Revenge
+        EpicBgWf = 1036,     // Epic Battleground - Warfront Arathi (Pvp)
+        DomDg = 1037,     // Domination - Deepwind Gorge
+        DomDg2 = 1039,     // Domination - Deepwind Gorge
+        Ed = 1041,     // Empyrean Domain
         Max = 902
     }
 
diff --git a/Source/Framework/Constants/CliDBConst.cs b/Source/Framework/Constants/CliDBConst.cs
index 805429c04..9e5456835 100644
--- a/Source/Framework/Constants/CliDBConst.cs
+++ b/Source/Framework/Constants/CliDBConst.cs
@@ -1244,7 +1244,7 @@ namespace Framework.Constants
         ReclinedMountPassenger = 546,
         OneshotQuestion_2 = 547,
         OneshotSpellChannelDirectedNosound = 549,
-        StateKneel2 = 550,
+        StateKneel_2 = 550,
         OneshotFlyattackunarmed = 551,
         OneshotFlycombatwound = 552,
         OneshotMountselfspecial = 553,
@@ -1291,7 +1291,146 @@ namespace Framework.Constants
         StateReadAndSit = 616,
         StateParryUnarmed = 619,
         StateBlockShield = 620,
-        StateSitGround2 = 621
+        StateSitGround2 = 621,
+        OneshotMountspecial = 628,
+        OneshotSettle = 636,
+        StateAttackUnarmedStill = 638,
+        StateReadBookAndTalk = 641,
+        OneshotSlam = 642,
+        OneshotGrabthrown = 643,
+        OneshotReadyspelldirectedNosound = 644,
+        StateReadyspellomniWithSound = 645,
+        OneshotTalkBarserver = 646,
+        OneshotWaveBarserver = 647,
+        StateWorkMining2 = 648,
+        StateReady2hlAllowMovement = 654,
+        StateUsestandingNosheatheStill = 655,
+        OneshotWorkStill = 657,
+        StateHoldThrownInterrupts = 658,
+        OneshotCannibalize = 659,
+        OneshotNoNotSwimming = 661,
+        StateReadyglv = 663,
+        OneshotCombatabilityglv01 = 664,
+        OneshotCombatabilityglvoff01 = 665,
+        OneshotCombatabilityglvbig02 = 666,
+        OneshotParryglv = 667,
+        StateWorkMining3 = 668,
+        OneshotTalkNosheathe = 669,
+        OneshotStandVar3 = 671,
+        StateKneel2 = 672,
+        OneshotCustom0 = 673,
+        OneshotCustom1 = 674,
+        OneshotCustom2 = 675,
+        OneshotCustom3 = 676,
+        StateFlyReadyUnarmed = 677,
+        OneshotCheerForthealliance = 679,
+        OneshotCheerForthehorde = 680,
+        OneshotStandVar4 = 690,
+        OneshotFlyemoteexclamation = 691,
+        StateEmoteeat = 700,
+        StateMonkhealChannelomni = 705,
+        StateMonkdefenseReadyunarmed = 706,
+        OneshotStand = 707,
+        StateWapourhold = 709,
+        StateReadyblowdart = 710,
+        StateWorkChopmeat = 711,
+        StateMonk2hlidle = 712,
+        StateWaperch = 713,
+        StateWaguardstand01 = 714,
+        StateReadAndSitChairMed = 715,
+        StateWaguardstand02 = 716,
+        StateWaguardstand03 = 717,
+        StateWaguardstand04 = 718,
+        StateWachant02 = 719,
+        StateWalean01 = 720,
+        StateDrunkwalk = 721,
+        StateWascrubbing = 722,
+        StateWachant01 = 723,
+        StateWachant03 = 724,
+        StateWasummon01 = 725,
+        StateWatrance01 = 726,
+        StateCustomspell05 = 727,
+        StateWahammerloop = 728,
+        StateWabound01 = 729,
+        StateWabound02 = 730,
+        StateWasackhold = 731,
+        StateWasit01 = 732,
+        StateWarowingstandleft = 733,
+        StateWarowingstandright = 734,
+        StateLootBiteSound = 735,
+        OneshotWasummon01 = 736,
+        OneshotStandVar22 = 737,
+        OneshotFalconeerStart = 738,
+        StateFalconeerLoop = 739,
+        OneshotFalconeerEnd = 740,
+        StateWaperchNointeract = 741,
+        OneshotWastanddrink = 742,
+        StateWalean02 = 743,
+        OneshotReadEnd = 744,
+        StateWaguardstand04AllowMovement = 745,
+        StateReadycrossbow = 747,
+        OneshotWastanddrinkNosheath = 748,
+        StateWahang01 = 749,
+        StateWabeggarstand = 750,
+        StateWadrunkstand = 751,
+        OneshotWacriertalk = 753,
+        StateHoldCrossbow = 754,
+        StateWasit02 = 757,
+        StateWacrankstand = 761,
+        OneshotReadStart = 762,
+        OneshotReadLoop = 763,
+        OneshotWadrunkdrink = 765,
+        StateSitChairMedEat = 766,
+        StateKneelCopy = 867,
+        StateWorkChopmeatNosheathe = 868,
+        OneshotBarpatronPoint = 870,
+        StateStandNosound = 871,
+        StateMountFlightIdleNosound = 872,
+        StateUsestandingLoop3 = 873,
+        OneshotVehiclegrab = 874,
+        StateUsestandingLoop4 = 875,
+        StateBarpatronStand = 876,
+        OneshotWabeggarpoint = 877,
+        StateWacrierstand01 = 878,
+        OneshotWabeggarbeg = 879,
+        StateWaboatwheelstand = 880,
+        StateWasit03 = 882,
+        StateBarsweepStand = 883,
+        StateWaguardstand05 = 884,
+        StateWaguardstand06 = 885,
+        StateBartendstand = 886,
+        StateWahammerloop2 = 887,
+        // StandStateStateReadythrown          = 890,  //< Doesn'T Work
+        StateWorkMiningNoCombat = 893,
+        OneshotCaststrong = 894,
+        StateCustomspell07 = 895,
+        StateWalk = 897,
+        OneshotClose = 898,
+        StateWacratehold = 900,
+        StateFlycustomspell02 = 901,
+        OneshotSleep = 902,
+        StateStandSetemotestate = 903,
+        OneshotWawalktalk = 904,
+        OneshotTakeOffFinish = 905,
+        OneshotAttack2h = 906,
+        StateWaBarrelHold = 908,
+        StateWaBarrelWalk = 909,
+        StateCustomspell04 = 910,
+        StateFlywaperch01 = 912,
+        OneshotPalspellcast1hup = 916,
+        OneshotReadyspellomni = 917,
+        OneshotSpellcastDirected = 961,
+        StateFlycustomspell07 = 977,
+        StateFlychannelcastomni = 978,
+        StateClosed = 979,
+        StateCustomspell10 = 980,
+        StateWawheelbarrowstand = 981,
+        StateCustomspell06 = 982,
+        StateCustom1 = 983,
+        StateWasit04 = 986,
+        OneshotBarsweepStand = 987,
+        TorghastTalkingHeadMawCastSound = 989,
+        TorghastTalkingHeadMawCastSound2 = 990
     }
 
     public enum GlyphSlotType
@@ -1842,7 +1981,15 @@ namespace Framework.Constants
         Sweat = 451,
         Yw = 453,
         Read = 456,
-        Boot = 506
+        Boot = 506,
+        ForTheAlliance = 507,
+        ForTheHorde = 508,
+        Whoa = 517,
+        Oops = 518,
+        Alliance = 519,
+        Horde = 520,
+        Meow = 521,
+        Boop = 522
     }
 
     public enum ExpectedStatType : byte
diff --git a/Source/Framework/Constants/Language.cs b/Source/Framework/Constants/Language.cs
index 6cb659c4c..e72cbbc1d 100644
--- a/Source/Framework/Constants/Language.cs
+++ b/Source/Framework/Constants/Language.cs
@@ -49,7 +49,8 @@ namespace Framework.Constants
         Shalassian = 181,
         Thalassian2 = 182,
         Addon = 183,
-        AddonLogged = 184
+        AddonLogged = 184,
+        Vulpera = 285
     }
 
     public enum CypherStrings
diff --git a/Source/Framework/Constants/Spells/SkillConst.cs b/Source/Framework/Constants/Spells/SkillConst.cs
index a2b108e54..099fad8d6 100644
--- a/Source/Framework/Constants/Spells/SkillConst.cs
+++ b/Source/Framework/Constants/Spells/SkillConst.cs
@@ -328,7 +328,36 @@ namespace Framework.Constants
         PetExoticPterrordax = 2705,
         PetToad = 2706,
         PetExoticKrolusk = 2707,
-        SecondPetHunter = 2716
+        SecondPetHunter = 2716,
+        PetBloodBeast = 2719,
+        JunkyardTinkering = 2720,
+        RacialZandalariTroll = 2721,
+        RacialKulTiran = 2723,
+        AzeritePower = 2727,
+        MountEquipement = 2734,
+        ShadowlandsAlchemy = 2750,
+        ShadowlandsBlacksmithing = 2751,
+        ShadowlandsCooking = 2752,
+        ShadowlandsEnchanting = 2753,
+        ShadowlandsFishing = 2754,
+        ShadowlandsEngineering = 2755,
+        ShadowlandsInscription = 2756,
+        ShadowlandsJewelcrafting = 2757,
+        ShadowlandsLeatherworking = 2758,
+        ShadowlandsTailoring = 2759,
+        ShadowlandsHerbalism = 2760,
+        ShadowlandsMining = 2761,
+        ShadowlandsSkinning = 2762,
+        RacialDarkIronDwarf2 = 2773,
+        RacialMechagnome = 2774,
+        RacialVulpera = 2775,
+        LanguageVulpera = 2776,
+        SoulCyphering = 2777,
+        AbominableStitching = 2787,
+        AscensionCrafting = 2791,
+        PetMammoth = 2805,
+        PetCourser = 2806,
+        PetCamel = 2807
     }
 
     public enum SkillState