diff --git a/csv/Cabinet.csv b/csv/Cabinet.csv
index 53fb4cd60..203d1ff7e 100644
--- a/csv/Cabinet.csv
+++ b/csv/Cabinet.csv
@@ -1,5 +1,5 @@
 key,0,1,2,3
-#,Item,Order,Category,
+#,Item,Order,Category,SortKey
 int32,Item,uint16,CabinetCategory,byte
 0,2897,1,1,1
 1,3220,2,1,1
diff --git a/csv/ContentFinderCondition.csv b/csv/ContentFinderCondition.csv
index a335bec8f..fce963f2b 100644
--- a/csv/ContentFinderCondition.csv
+++ b/csv/ContentFinderCondition.csv
@@ -1,6 +1,6 @@
 key,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97
-#,ShortCode,TerritoryType,ContentLinkType,Content,PvP,,,,,AcceptClassJobCategory,ContentMemberType,,,,UnlockQuest,,,ClassJobLevel{Required},ClassJobLevel{Sync},ItemLevel{Required},ItemLevel{Sync},,AllowUndersized,,AllowReplacement,,AllowExplorerMode,,,,,,HighEndDuty,,,,,DutyRecorderAllowed,,,,,Name,NameShort,ContentType,TransientKey,,Transient,SortKey,Image,Icon,,,,,LevelingRoulette,HighLevelRoulette,MSQRoulette,GuildHestRoulette,ExpertRoulette,TrialRoulette,DailyFrontlineChallenge,LevelCapRoulette,MentorRoulette,,,,,,AllianceRoulette,FeastTeamRoulette,NormalRaidRoulette,,,,,,,,,,,,,,,,,,,,,,,,,,
-int32,str,TerritoryType,byte,Row,bit&01,bit&02,byte,uint32,uint32,ClassJobCategory,ContentMemberType,byte,byte,byte,Quest,byte,uint32,byte,byte,uint16,uint16,bit&04,bit&08,bit&10,bit&20,bit&40,bit&80,bit&01,bit&02,bit&04,byte,bit&08,bit&10,bit&20,bit&40,byte,bit&80,bit&01,bit&02,bit&04,bit&08,bit&10,bit&20,str,ContentType,byte,byte,Row,uint32,Image,Image,uint32,sbyte,int32,bit&40,bit&80,byte,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool
+#,ShortCode,TerritoryType,ContentLinkType,Content,PvP,,,,,AcceptClassJobCategory,ContentMemberType,,,,UnlockQuest,,,ClassJobLevel{Required},ClassJobLevel{Sync},ItemLevel{Required},ItemLevel{Sync},,AllowUndersized,,,AllowReplacement,,AllowExplorerMode,,,,,HighEndDuty,,,,,,DutyRecorderAllowed,,,,,Name,NameShort,ContentType,TransientKey,,Transient,SortKey,Image,Icon,,,,,,LevelingRoulette,HighLevelRoulette,MSQRoulette,GuildHestRoulette,ExpertRoulette,TrialRoulette,DailyFrontlineChallenge,LevelCapRoulette,MentorRoulette,,,,,,AllianceRoulette,FeastTeamRoulette,NormalRaidRoulette,,,,,,,,,,,,,,,,,,,,,,,,
+int32,str,TerritoryType,byte,Row,bit&01,bit&02,byte,uint32,uint32,ClassJobCategory,ContentMemberType,byte,byte,byte,Quest,byte,uint32,byte,byte,uint16,uint16,bit&04,bit&08,bit&10,bit&20,bit&40,bit&80,bit&01,bit&02,bit&04,byte,bit&08,bit&10,bit&20,bit&40,byte,bit&80,bit&01,bit&02,bit&04,bit&08,bit&10,bit&20,str,str,ContentType,byte,uint32,Row,uint16,Image,Image,sbyte,int32,bit&40,bit&80,byte,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool,bool
 0,"",0,0,0,False,False,0,0,0,108,0,0,0,0,0,0,0,0,0,0,0,False,False,False,False,True,True,False,False,False,0,False,False,False,False,0,False,False,False,True,False,False,False,"","",0,0,0,0,0,0,0,-1,0,True,True,0,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False
 1,"f1r1_re",1039,1,1,False,False,0,0,0,108,2,0,0,0,0,0,0,24,27,0,0,False,True,True,False,True,True,True,False,False,1,True,True,False,True,0,False,False,False,True,False,False,False,"the Thousand Maws of Toto–Rak","",2,6,274,1,5,112005,0,-1,0,True,True,0,True,False,False,False,False,False,False,False,True,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False
 2,"f1d1_re",1037,1,2,False,False,0,0,0,108,2,0,0,0,0,0,0,16,19,0,0,False,True,True,False,True,True,True,False,False,1,True,True,False,True,0,False,False,False,True,False,False,False,"the Tam–Tara Deepcroft","",2,6,274,2,2,112002,0,-1,0,True,True,0,True,False,False,False,False,False,False,False,True,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False,False
diff --git a/csv/MirageStoreSetItem.csv b/csv/MirageStoreSetItem.csv
index 05b799262..fcf5675ab 100644
--- a/csv/MirageStoreSetItem.csv
+++ b/csv/MirageStoreSetItem.csv
@@ -1,6 +1,6 @@
 key,0,1,2,3,4,5,6,7,8,9,10
-#,,,,,,,,,,,
-int32,uint32,uint32,uint32,uint32,uint32,uint32,uint32,uint32,uint32,uint32,uint32
+#,,,Item[0],Item[1],Item[2],Item[3],Item[4],Item[5],Item[6],Item[7],Item[8]
+int32,uint32,uint32,Item,Item,Item,Item,Item,Item,Item,Item,Item
 0,0,0,1,0,0,0,0,0,0,0,0
 41787,0,0,0,0,0,0,0,0,0,0,0
 41788,0,0,0,0,0,0,0,0,0,0,0
diff --git a/csv/MirageStoreSetItemLookup.csv b/csv/MirageStoreSetItemLookup.csv
index c0ac86451..9cf243daf 100644
--- a/csv/MirageStoreSetItemLookup.csv
+++ b/csv/MirageStoreSetItemLookup.csv
@@ -1,6 +1,6 @@
 key,0,1,2,3,4
-#,,,,,
-int32,uint32,uint32,uint32,uint32,uint32
+#,MirageStoreSetItem[0],MirageStoreSetItem[1],,,
+int32,MirageStoreSetItem,MirageStoreSetItem,uint32,uint32,uint32
 1,0,0,0,0,0
 2642,45094,0,0,0,0
 2643,45095,0,0,0,0
diff --git a/csv/Recipe.csv b/csv/Recipe.csv
index 3f8e152e1..e419b7c59 100644
--- a/csv/Recipe.csv
+++ b/csv/Recipe.csv
@@ -1,6 +1,6 @@
 key,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46
-#,Number,CraftType,RecipeLevelTable,Item{Result},Amount{Result},Item{Ingredient}[0],Amount{Ingredient}[0],Item{Ingredient}[1],Amount{Ingredient}[1],Item{Ingredient}[2],Amount{Ingredient}[2],Item{Ingredient}[3],Amount{Ingredient}[3],Item{Ingredient}[4],Amount{Ingredient}[4],Item{Ingredient}[5],Amount{Ingredient}[5],Item{Ingredient}[6],Amount{Ingredient}[6],Item{Ingredient}[7],Amount{Ingredient}[7],RecipeNotebookList,DisplayPriority,IsSecondary,MaterialQualityFactor,DifficultyFactor,QualityFactor,DurabilityFactor,RequiredQuality,RequiredCraftsmanship,RequiredControl,QuickSynthCraftsmanship,QuickSynthControl,SecretRecipeBook,Quest,CanQuickSynth,CanHq,ExpRewarded,Status{Required},Item{Required},IsSpecializationRequired,IsExpert,,,PatchNumber,,
-int32,int32,CraftType,RecipeLevelTable,Item,int32,Item,int32,Item,int32,Item,int32,Item,int32,Item,int32,Item,int32,Item,int32,Item,int32,RecipeNotebookList,uint16,uint16,bit&01,byte,uint16,uint16,uint16,uint32,uint16,uint16,uint16,SecretRecipeBook,Quest,uint32,bit&02,bit&04,Status,Item,int32,int32,bit&20,bit&40,byte,uint16,uint16
+#,Number,CraftType,RecipeLevelTable,,Item{Result},Amount{Result},Item{Ingredient}[0],Amount{Ingredient}[0],Item{Ingredient}[1],Amount{Ingredient}[1],Item{Ingredient}[2],Amount{Ingredient}[2],Item{Ingredient}[3],Amount{Ingredient}[3],Item{Ingredient}[4],Amount{Ingredient}[4],Item{Ingredient}[5],Amount{Ingredient}[5],Item{Ingredient}[6],Amount{Ingredient}[6],Item{Ingredient}[7],Amount{Ingredient}[7],RecipeNotebookList,DisplayPriority,IsSecondary,MaterialQualityFactor,DifficultyFactor,QualityFactor,DurabilityFactor,RequiredQuality,RequiredCraftsmanship,RequiredControl,QuickSynthCraftsmanship,QuickSynthControl,SecretRecipeBook,Quest,CanQuickSynth,CanHq,ExpRewarded,Status{Required},Item{Required},IsSpecializationRequired,IsExpert,,,PatchNumber,
+int32,int32,CraftType,RecipeLevelTable,uint16,Item,byte,Item,byte,Item,byte,Item,byte,Item,byte,Item,byte,Item,byte,Item,byte,Item,byte,RecipeNotebookList,uint16,bit&01,byte,uint16,uint16,uint16,uint32,uint16,uint16,uint16,uint16,SecretRecipeBook,Quest,bit&02,bit&04,bit&08,Status,Item,int32,bit&20,bit&40,byte,uint16,uint16
 0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,False,50,100,100,100,0,0,0,0,0,0,0,True,True,True,False,0,0,False,False,0,65535,0
 1,1,1,1,0,5056,1,5106,2,5107,1,0,0,0,0,0,0,0,0,2,1,-1,0,0,0,False,0,50,80,67,0,0,0,0,0,0,0,True,True,True,False,0,0,False,False,0,65535,0
 2,3,1,1,0,2546,1,5056,1,5361,1,0,0,0,0,0,0,0,0,2,1,5,1,0,0,True,50,100,100,100,0,0,0,0,0,0,0,True,True,True,False,0,0,False,False,0,65535,0