diff --git a/Source/Framework/Constants/CliDBConst.cs b/Source/Framework/Constants/CliDBConst.cs
index 71db1c2e1..c8bc08124 100644
--- a/Source/Framework/Constants/CliDBConst.cs
+++ b/Source/Framework/Constants/CliDBConst.cs
@@ -1644,17 +1644,36 @@ namespace Framework.Constants
         DraenorMining = 45,
         LegionMining = 46,
         KulTiranMining = 47,
-        Skinning2 = 48,
-        Open2 = 149,
+        LegionSkinning = 48,
+        OpenItem = 149,
         Foraging = 150,
         JellyDeposit = 152,
-        ShadowlandHerbalism = 153,
-        ShadowlandMining = 155,
+        ShadowlandsHerbalism = 153,
+        ShadowlandsMining = 155,
         CovenantNightFae = 157,
         CovenantVenthyr = 158,
         CovenantKyrian = 159,
         CovenantNecrolord = 160,
-        ProfessionEngineering = 161
+        Engineering = 161,
+        DragonIslesHerbalism = 162,
+        Mining2 = 163,
+        ElusiveHerbalism = 166,
+        ElusiveMining = 167,
+        Enchanting = 169,
+        DragonIslesTreasure = 170,
+        DragonIslesAlchemy25 = 172,
+        DragonIslesBlacksmithing25 = 173,
+        DragonIslesEnchanting25 = 174,
+        DragonIslesEngineering25 = 175,
+        DragonIslesHerbalism25 = 176,
+        DragonIslesInscription25 = 177,
+        DragonIslesJewelcrafting25 = 178,
+        DragonIslesLeatherworking25 = 179,
+        DragonIslesMining25 = 180,
+        DragonIslesSkinning25 = 181,
+        DragonIslesTailoring25 = 182,
+        OpenKneelingPlant = 186,
+        DragonIslesMining = 188
     }
 
     public enum MapTypes : byte
diff --git a/Source/Framework/Constants/SharedConst.cs b/Source/Framework/Constants/SharedConst.cs
index 472c564a1..2df3a5112 100644
--- a/Source/Framework/Constants/SharedConst.cs
+++ b/Source/Framework/Constants/SharedConst.cs
@@ -314,6 +314,7 @@ namespace Framework.Constants
 
             return SpellSchools.Normal;
         }
+
         public static SkillType SkillByQuestSort(int sort)
         {
             switch ((QuestSort)sort)
@@ -343,57 +344,54 @@ namespace Framework.Constants
             }
             return SkillType.None;
         }
-        public static SkillType SkillByLockType(LockType locktype)
+
+        public static SkillType SkillByLockType(LockType locktype) => locktype switch
         {
-            switch (locktype)
-            {
-                case LockType.Herbalism:
-                    return SkillType.Herbalism;
-                case LockType.Mining:
-                    return SkillType.Mining;
-                case LockType.Fishing:
-                    return SkillType.Fishing;
-                case LockType.Inscription:
-                    return SkillType.Inscription;
-                case LockType.Archaeology:
-                    return SkillType.Archaeology;
-                case LockType.LumberMill:
-                    return SkillType.Logging;
-                case LockType.ClassicHerbalism:
-                    return SkillType.ClassicHerbalism;
-                case LockType.OutlandHerbalism:
-                    return SkillType.OutlandHerbalism;
-                case LockType.NorthrendHerbalism:
-                    return SkillType.NorthrendHerbalism;
-                case LockType.CataclysmHerbalism:
-                    return SkillType.CataclysmHerbalism;
-                case LockType.PandariaHerbalism:
-                    return SkillType.PandariaHerbalism;
-                case LockType.DraenorHerbalism:
-                    return SkillType.DraenorHerbalism;
-                case LockType.LegionHerbalism:
-                    return SkillType.LegionHerbalism;
-                case LockType.KulTiranHerbalism:
-                    return SkillType.KulTiranHerbalism;
-                case LockType.ClassicMining:
-                    return SkillType.ClassicMining;
-                case LockType.OutlandMining:
-                    return SkillType.OutlandMining;
-                case LockType.NorthrendMining:
-                    return SkillType.NorthrendMining;
-                case LockType.CataclysmMining:
-                    return SkillType.CataclysmMining;
-                case LockType.PandariaMining:
-                    return SkillType.PandariaMining;
-                case LockType.DraenorMining:
-                    return SkillType.DraenorMining;
-                case LockType.LegionMining:
-                    return SkillType.LegionMining;
-                case LockType.KulTiranMining:
-                    return SkillType.KulTiranMining;
-            }
-            return SkillType.None;
-        }
+            LockType.Herbalism or LockType.ElusiveHerbalism => SkillType.Herbalism,
+            LockType.Mining or LockType.Mining2 or LockType.ElusiveMining => SkillType.Mining,
+            LockType.Fishing => SkillType.Fishing,
+            LockType.Inscription => SkillType.Inscription,
+            LockType.Archaeology => SkillType.Archaeology,
+            LockType.LumberMill => SkillType.Logging,
+            LockType.Skinning => SkillType.Skinning,
+            LockType.ClassicHerbalism => SkillType.ClassicHerbalism,
+            LockType.OutlandHerbalism => SkillType.OutlandHerbalism,
+            LockType.NorthrendHerbalism => SkillType.NorthrendHerbalism,
+            LockType.CataclysmHerbalism => SkillType.CataclysmHerbalism,
+            LockType.PandariaHerbalism => SkillType.PandariaHerbalism,
+            LockType.DraenorHerbalism => SkillType.DraenorHerbalism,
+            LockType.LegionHerbalism => SkillType.LegionHerbalism,
+            LockType.KulTiranHerbalism => SkillType.KulTiranHerbalism,
+            LockType.ClassicMining => SkillType.ClassicMining,
+            LockType.OutlandMining => SkillType.OutlandMining,
+            LockType.NorthrendMining => SkillType.NorthrendMining,
+            LockType.CataclysmMining => SkillType.CataclysmMining,
+            LockType.PandariaMining => SkillType.PandariaMining,
+            LockType.DraenorMining => SkillType.DraenorMining,
+            LockType.LegionMining => SkillType.LegionMining,
+            LockType.KulTiranMining => SkillType.KulTiranMining,
+            LockType.LegionSkinning => SkillType.LegionSkinning,
+            LockType.ShadowlandsHerbalism => SkillType.ShadowlandsHerbalism,
+            LockType.ShadowlandsMining => SkillType.ShadowlandsMining,
+            LockType.CovenantNightFae => SkillType.CovenantNightFae,
+            LockType.CovenantVenthyr => SkillType.CovenantVenthyr,
+            LockType.CovenantKyrian => SkillType.CovenantKyrian,
+            LockType.CovenantNecrolord => SkillType.CovenantNecrolord,
+            LockType.Engineering => SkillType.Engineering,
+            LockType.DragonIslesHerbalism or LockType.DragonIslesHerbalism25 => SkillType.DragonIslesHerbalism,
+            LockType.Enchanting => SkillType.Enchanting,
+            LockType.DragonIslesAlchemy25 => SkillType.DragonIslesAlchemy,
+            LockType.DragonIslesBlacksmithing25 => SkillType.DragonIslesBlacksmithing,
+            LockType.DragonIslesEnchanting25 => SkillType.DragonIslesEnchanting,
+            LockType.DragonIslesEngineering25 => SkillType.DragonIslesEngineering,
+            LockType.DragonIslesInscription25 => SkillType.DragonIslesInscription,
+            LockType.DragonIslesJewelcrafting25 => SkillType.DragonIslesJewelcrafting,
+            LockType.DragonIslesLeatherworking25 => SkillType.DragonIslesLeatherworking,
+            LockType.DragonIslesSkinning25 => SkillType.DragonIslesSkinning,
+            LockType.DragonIslesTailoring25 => SkillType.DragonIslesTailoring,
+            LockType.DragonIslesMining or LockType.DragonIslesMining25 => SkillType.DragonIslesMining,
+            _ => SkillType.None
+        };
 
         public static bool IsValidLocale(Locale locale)
         {
diff --git a/Source/Framework/Constants/Spells/SkillConst.cs b/Source/Framework/Constants/Spells/SkillConst.cs
index e075384c7..c95420720 100644
--- a/Source/Framework/Constants/Spells/SkillConst.cs
+++ b/Source/Framework/Constants/Spells/SkillConst.cs
@@ -306,7 +306,7 @@ namespace Framework.Constants
         CataclysmFishing = 2589,
         NorthrendFishing = 2590,
         OutlandFishing = 2591,
-        Fishing2 = 2592,
+        ClassicFishing = 2592,
         RacialDarkIronDwarf = 2597,
         RacialMagHarOrc = 2598,
         PetLizard = 2703,
@@ -320,6 +320,10 @@ namespace Framework.Constants
         RacialZandalariTroll = 2721,
         RacialKulTiran = 2723,
         AzeritePower = 2727,
+        CovenantKyrian = 2730,
+        CovenantVenthyr = 2731,
+        CovenantNightFae = 2732,
+        CovenantNecrolord = 2733,
         MountEquipement = 2734,
         ShadowlandsAlchemy = 2750,
         ShadowlandsBlacksmithing = 2751,
@@ -344,9 +348,28 @@ namespace Framework.Constants
         PetMammoth = 2805,
         PetCourser = 2806,
         PetCamel = 2807,
+        RacialDracthyr = 2808,
+        Evoker = 2810,
         StygiaCrafting = 2811,
         LanguageCypher = 2817,
         PhotoformSynthesis = 2819,
+        ArcanaManipulation = 2821,
+        DragonIslesBlacksmithing = 2822,
+        DragonIslesAlchemy = 2823,
+        DragonIslesCooking = 2824,
+        DragonIslesEnchanting = 2825,
+        DragonIslesFishing = 2826,
+        DragonIslesEngineering = 2827,
+        DragonIslesInscription = 2828,
+        DragonIslesJewelcrafting = 2829,
+        DragonIslesLeatherworking = 2830,
+        DragonIslesTailoring = 2831,
+        DragonIslesHerbalism = 2832,
+        DragonIslesMining = 2833,
+        DragonIslesSkinning = 2834,
+        Crafting = 2846,
+        TuskarrFishingGear = 2847,
+        PetLesserDragonkin = 2850
     }
 
     public enum SkillState