415 files changed, 1184 insertions, 622 deletions

diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake
index 55042af930e..857ef470ce8 100644
--- a/revision_data.h.in.cmake
+++ b/revision_data.h.in.cmake
@@ -7,8 +7,8 @@
  #define _SOURCE_DIRECTORY          R"(@CMAKE_SOURCE_DIR@)"
  #define _BUILD_DIRECTORY           R"(@BUILDDIR@)"
  #define _MYSQL_EXECUTABLE          R"(@MYSQL_EXECUTABLE@)"
- #define _FULL_DATABASE             "TDB_world_720.00_2017_04_18.sql"
- #define _HOTFIXES_DATABASE         "TDB_hotfixes_720.00_2017_04_18.sql"
+ #define _FULL_DATABASE             "TDB_world_735.00_2018_02_19.sql"
+ #define _HOTFIXES_DATABASE         "TDB_hotfixes_735.00_2018_02_19.sql"
  #define VER_COMPANYNAME_STR        "TrinityCore Developers"
  #define VER_LEGALCOPYRIGHT_STR     "(c)2008-2018 TrinityCore"
  #define VER_FILEVERSION            0,0,0
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 7eb491539ff..b8c9dc2a2ba 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1,8 +1,8 @@
 -- MySQL dump 10.16  Distrib 10.1.6-MariaDB, for Win64 (AMD64)
 --
--- Host: localhost    Database: auth6
+-- Host: localhost    Database: auth
 -- ------------------------------------------------------
--- Server version	5.7.14-log
+-- Server version	10.1.6-MariaDB
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -38,7 +38,7 @@ CREATE TABLE `account` (
   `failed_logins` int(10) unsigned NOT NULL DEFAULT '0',
   `locked` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `lock_country` varchar(2) NOT NULL DEFAULT '00',
-  `last_login` timestamp NULL,
+  `last_login` timestamp NULL DEFAULT NULL,
   `online` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `expansion` tinyint(3) unsigned NOT NULL DEFAULT '6',
   `mutetime` bigint(20) NOT NULL DEFAULT '0',
@@ -365,13 +365,13 @@ CREATE TABLE `battlenet_accounts` (
   `failed_logins` int(10) unsigned NOT NULL DEFAULT '0',
   `locked` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `lock_country` varchar(2) NOT NULL DEFAULT '00',
-  `last_login` timestamp NULL,
+  `last_login` timestamp NULL DEFAULT NULL,
   `online` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `locale` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `os` varchar(4) NOT NULL DEFAULT '',
   `LastCharacterUndelete` int(10) unsigned NOT NULL DEFAULT '0',
-  `LoginTicket` varchar(64),
-  `LoginTicketExpiry` int(10) unsigned,
+  `LoginTicket` varchar(64) DEFAULT NULL,
+  `LoginTicketExpiry` int(10) unsigned DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Account System';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -619,10 +619,10 @@ CREATE TABLE `rbac_default_permissions` (
 LOCK TABLES `rbac_default_permissions` WRITE;
 /*!40000 ALTER TABLE `rbac_default_permissions` DISABLE KEYS */;
 INSERT INTO `rbac_default_permissions` VALUES
-(3,192,-1),
-(2,193,-1),
+(0,195,-1),
 (1,194,-1),
-(0,195,-1);
+(2,193,-1),
+(3,192,-1);
 /*!40000 ALTER TABLE `rbac_default_permissions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2088,7 +2088,8 @@ CREATE TABLE `realmlist` (
 
 LOCK TABLES `realmlist` WRITE;
 /*!40000 ALTER TABLE `realmlist` DISABLE KEYS */;
-INSERT INTO `realmlist` VALUES (1,'Trinity','127.0.0.1','127.0.0.1','255.255.255.0',8085,0,2,1,0,0,25996,2,1);
+INSERT INTO `realmlist` VALUES
+(1,'Trinity','127.0.0.1','127.0.0.1','255.255.255.0',8085,0,0,1,0,0,25996,2,1);
 /*!40000 ALTER TABLE `realmlist` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2213,24 +2214,25 @@ INSERT INTO `updates` VALUES
 ('2017_03_11_00_auth.sql','2F2F67E51439346B212C27B7224E4614C00E1AEB','ARCHIVED','2017-03-11 00:00:00',0),
 ('2017_03_17_00_auth.sql','4902E9B1B063F399F928C2DD7AFD60427738E227','ARCHIVED','2017-03-17 18:58:01',0),
 ('2017_04_17_00_auth.sql','86299FAB21D895E84272286309CC8EE80F9DA8C7','ARCHIVED','2017-04-17 00:00:00',0),
-('2017_04_19_00_auth.sql','9903AAF50DF384F52E81F7E2892FE5271E000490','RELEASED','2017-04-18 23:16:18',32),
-('2017_04_22_00_auth.sql','843663B18D28FBA1EB12548500EC93953881E5F0','RELEASED','2017-04-22 19:28:22',0),
-('2017_04_27_00_auth.sql','308B797B47FA803D492C9C9A4C26DBEC546DBBD9','RELEASED','2017-04-28 09:10:11',0),
-('2017_05_14_00_auth.sql','B7E76CCDCC9A2C8103427DA4C43C7B0366ECE8B4','RELEASED','2017-05-14 12:00:00',0),
-('2017_06_15_00_auth.sql','DD71F25C1E61FD5F836931B02703BE3BD1B4F156','RELEASED','2017-06-15 15:20:50',0),
-('2017_06_18_00_auth.sql','7200968BFC2D76499149937B19F2153FD2ABC397','RELEASED','2017-06-18 22:13:37',0),
-('2017_06_25_00_auth.sql','A2DA6A64D4217992EF766915DEBD517DB0834E01','RELEASED','2017-06-25 00:54:10',0),
-('2017_06_28_00_auth.sql','6E58300D4D4DAAEE89107ECB3CB7DA8529DA738F','RELEASED','2017-06-28 19:11:09',0),
-('2017_06_30_00_auth.sql','C73BD277D211DBE1BB86BB1B443CA8F292D8ADEE','RELEASED','2017-06-30 16:18:51',0),
-('2017_08_04_00_auth.sql','2E994A704C64FECE3CE0883ED0CAC5E5A0E3A36C','RELEASED','2017-08-04 23:46:32',0),
-('2017_08_13_00_auth_2016_09_22_00_auth.sql','70047954E3556BFA430ADD5680EF8797F74A4B9E','RELEASED','2017-08-13 12:00:00',0),
-('2017_09_22_00_auth.sql','9313CCE80A18212E6F0C78D83316DE8582AE8084','RELEASED','2017-09-22 18:05:17',0),
-('2017_11_11_01_auth.sql','0D6EDB6B2FC8B9FBDF11ECD79B4B8E943328B6A9','RELEASED','2017-11-11 18:49:45',0),
-('2017_12_30_00_auth.sql','F360E9555AC68E28834E3FF807E4E37A090EF363','RELEASED','2017-12-30 00:23:32',0),
-('2017_12_30_01_auth.sql','1E11C78BA6D1D8E8CED7423DF92D1D197D6061EE','RELEASED','2017-12-30 23:00:00',0),
-('2017_12_31_00_auth.sql','1721ACBD35EB95FAE33B9E95F8C4E4B1FB70A5E4','RELEASED','2017-12-31 20:15:23',0),
-('2018_01_02_00_auth.sql','CD9B826B9D95697DC412DEF780E814FA3991D6CD','RELEASED','2018-01-02 20:40:37',0),
-('2018_02_18_00_auth.sql','8489DD3EFFE14A7486B593435F0BA2BC69B6EABF','RELEASED','2018-02-18 16:35:55',0);
+('2017_04_19_00_auth.sql','9903AAF50DF384F52E81F7E2892FE5271E000490','ARCHIVED','2017-04-18 23:16:18',32),
+('2017_04_22_00_auth.sql','843663B18D28FBA1EB12548500EC93953881E5F0','ARCHIVED','2017-04-22 19:28:22',0),
+('2017_04_27_00_auth.sql','308B797B47FA803D492C9C9A4C26DBEC546DBBD9','ARCHIVED','2017-04-28 09:10:11',0),
+('2017_05_14_00_auth.sql','B7E76CCDCC9A2C8103427DA4C43C7B0366ECE8B4','ARCHIVED','2017-05-14 12:00:00',0),
+('2017_06_15_00_auth.sql','DD71F25C1E61FD5F836931B02703BE3BD1B4F156','ARCHIVED','2017-06-15 15:20:50',0),
+('2017_06_18_00_auth.sql','7200968BFC2D76499149937B19F2153FD2ABC397','ARCHIVED','2017-06-18 22:13:37',0),
+('2017_06_25_00_auth.sql','A2DA6A64D4217992EF766915DEBD517DB0834E01','ARCHIVED','2017-06-25 00:54:10',0),
+('2017_06_28_00_auth.sql','6E58300D4D4DAAEE89107ECB3CB7DA8529DA738F','ARCHIVED','2017-06-28 19:11:09',0),
+('2017_06_30_00_auth.sql','C73BD277D211DBE1BB86BB1B443CA8F292D8ADEE','ARCHIVED','2017-06-30 16:18:51',0),
+('2017_08_04_00_auth.sql','2E994A704C64FECE3CE0883ED0CAC5E5A0E3A36C','ARCHIVED','2017-08-04 23:46:32',0),
+('2017_08_13_00_auth_2016_09_22_00_auth.sql','70047954E3556BFA430ADD5680EF8797F74A4B9E','ARCHIVED','2017-08-13 12:00:00',0),
+('2017_09_22_00_auth.sql','9313CCE80A18212E6F0C78D83316DE8582AE8084','ARCHIVED','2017-09-22 18:05:17',0),
+('2017_11_11_01_auth.sql','0D6EDB6B2FC8B9FBDF11ECD79B4B8E943328B6A9','ARCHIVED','2017-11-11 18:49:45',0),
+('2017_12_30_00_auth.sql','F360E9555AC68E28834E3FF807E4E37A090EF363','ARCHIVED','2017-12-30 00:23:32',0),
+('2017_12_30_01_auth.sql','1E11C78BA6D1D8E8CED7423DF92D1D197D6061EE','ARCHIVED','2017-12-30 23:00:00',0),
+('2017_12_31_00_auth.sql','1721ACBD35EB95FAE33B9E95F8C4E4B1FB70A5E4','ARCHIVED','2017-12-31 20:15:23',0),
+('2018_01_02_00_auth.sql','CD9B826B9D95697DC412DEF780E814FA3991D6CD','ARCHIVED','2018-01-02 20:40:37',0),
+('2018_02_18_00_auth.sql','8489DD3EFFE14A7486B593435F0BA2BC69B6EABF','ARCHIVED','2018-02-18 16:35:55',0),
+('2018_02_19_00_auth.sql','07CE658C5EF88693D3C047EF8E724F94ADA74C15','RELEASED','2018-02-19 22:33:32',233);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2297,4 +2299,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2017-04-19  0:17:38
+-- Dump completed on 2018-02-19 22:43:07
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index f407dd0afef..55abfac06c7 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2,7 +2,7 @@
 --
 -- Host: localhost    Database: characters
 -- ------------------------------------------------------
--- Server version	5.7.14-log
+-- Server version	10.1.6-MariaDB
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -1705,11 +1705,11 @@ CREATE TABLE `characters` (
   `deleteInfos_Account` int(10) unsigned DEFAULT NULL,
   `deleteInfos_Name` varchar(12) DEFAULT NULL,
   `deleteDate` int(10) unsigned DEFAULT NULL,
-  `honor` INT(10) unsigned NOT NULL DEFAULT '0',
-  `honorLevel` INT(10) unsigned NOT NULL DEFAULT '1',
-  `prestigeLevel` INT(10) unsigned NOT NULL DEFAULT '0',
-  `honorRestState` TINYINT unsigned NOT NULL DEFAULT '2',
-  `honorRestBonus` FLOAT NOT NULL DEFAULT '0',
+  `honor` int(10) unsigned NOT NULL DEFAULT '0',
+  `honorLevel` int(10) unsigned NOT NULL DEFAULT '1',
+  `prestigeLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `honorRestState` tinyint(3) unsigned NOT NULL DEFAULT '2',
+  `honorRestBonus` float NOT NULL DEFAULT '0',
   `lastLoginBuild` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`),
   KEY `idx_account` (`account`),
@@ -3535,8 +3535,9 @@ INSERT INTO `updates` VALUES
 ('2017_08_20_00_characters.sql','8C5BBF6AEAA6C7DE2F40A7D3878C8187A4729F13','ARCHIVED','2017-08-20 17:00:00',0),
 ('2017_08_20_01_characters.sql','2F50D5E6BF3888B8C5270D79228A1D0601FAFF1D','ARCHIVED','2017-08-20 17:52:21',0),
 ('2017_10_29_00_characters.sql','8CFC473E7E87E58C317A72016BF69E9050D3BC83','ARCHIVED','2017-04-19 00:07:40',25),
-('2018_02_03_00_characters.sql','73E9BFD848D7A22F2A7DD89CF64E30E3A8689512','RELEASED','2018-02-03 23:52:42',0),
-('2018_02_08_00_characters.sql','75FA162A9B85D678B26F972371265F1EC2C75187','RELEASED','2018-02-08 22:23:28',0);
+('2018_02_03_00_characters.sql','73E9BFD848D7A22F2A7DD89CF64E30E3A8689512','ARCHIVED','2018-02-03 23:52:42',0),
+('2018_02_08_00_characters.sql','75FA162A9B85D678B26F972371265F1EC2C75187','ARCHIVED','2018-02-08 22:23:28',0),
+('2018_02_19_00_characters.sql','75A0FFAFD0633921708DB0F72F9CC9796ACB960B','RELEASED','2018-02-19 22:33:32',117);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3629,4 +3630,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2017-04-19  0:17:39
+-- Dump completed on 2018-02-19 22:43:09
diff --git a/sql/base/dev/hotfixes_database.sql b/sql/base/dev/hotfixes_database.sql
index 6f4fb59d5a7..95c92321a59 100644
--- a/sql/base/dev/hotfixes_database.sql
+++ b/sql/base/dev/hotfixes_database.sql
@@ -1,8 +1,8 @@
 -- MySQL dump 10.16  Distrib 10.1.6-MariaDB, for Win64 (AMD64)
 --
--- Host: localhost    Database: hotfixes6
+-- Host: localhost    Database: hotfixes
 -- ------------------------------------------------------
--- Server version	5.7.14-log
+-- Server version	10.1.6-MariaDB
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -25,19 +25,19 @@ DROP TABLE IF EXISTS `achievement`;
 CREATE TABLE `achievement` (
   `Title` text,
   `Description` text,
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `Reward` text,
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `MapID` smallint(6) NOT NULL DEFAULT '0',
   `Supercedes` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Category` smallint(5) unsigned NOT NULL DEFAULT '0',
   `UIOrder` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SharesCriteria` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CriteriaTree` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Faction` tinyint(4) NOT NULL DEFAULT '0',
   `Points` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MinimumCriteria` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CriteriaTree` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -87,60 +87,14 @@ DROP TABLE IF EXISTS `area_group_member`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `area_group_member` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `AreaGroupID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `AreaID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AreaGroupID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `area_poi`
---
-
-DROP TABLE IF EXISTS `area_poi`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `area_poi` (
-  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Flags` mediumint(8) NOT NULL DEFAULT '0',
-  `Importance` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `FactionID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `MapID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `AreaID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Icon` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `PositionX` float NOT NULL DEFAULT '0',
-  `PositionY` float NOT NULL DEFAULT '0',
-  `Name` text NOT NULL,
-  `Description` text NOT NULL,
-  `WorldStateID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `PlayerConditionID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `WorldMapLink` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `PortLocID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`ID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `area_poi_state`
---
-
-DROP TABLE IF EXISTS `area_poi_state`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `area_poi_state` (
-  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `AreaPOIID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `State` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Icon` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Description` text NOT NULL,
-  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`ID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `area_table`
 --
 
@@ -149,11 +103,11 @@ DROP TABLE IF EXISTS `area_table`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `area_table` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ZoneName` text,
+  `AreaName` text,
   `Flags1` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags2` int(10) unsigned NOT NULL DEFAULT '0',
-  `ZoneName` text,
   `AmbientMultiplier` float NOT NULL DEFAULT '0',
-  `AreaName` text,
   `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ParentAreaID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `AreaBit` smallint(6) NOT NULL DEFAULT '0',
@@ -326,11 +280,11 @@ CREATE TABLE `artifact_appearance_set` (
   `Name2` text,
   `UiCameraID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `AltHandUICameraID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `ArtifactID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `DisplayIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `AttachmentPoint` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ArtifactID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -423,6 +377,21 @@ CREATE TABLE `artifact_power_link` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `artifact_power_picker`
+--
+
+DROP TABLE IF EXISTS `artifact_power_picker`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `artifact_power_picker` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `artifact_power_rank`
 --
 
@@ -433,9 +402,9 @@ CREATE TABLE `artifact_power_rank` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `Value` float NOT NULL DEFAULT '0',
-  `ArtifactPowerID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Unknown` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Rank` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ArtifactPowerID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -595,8 +564,8 @@ DROP TABLE IF EXISTS `battle_pet_breed_state`;
 CREATE TABLE `battle_pet_breed_state` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Value` smallint(6) NOT NULL DEFAULT '0',
-  `BreedID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `State` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `BreedID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -610,11 +579,11 @@ DROP TABLE IF EXISTS `battle_pet_species`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `battle_pet_species` (
+  `SourceText` text,
+  `Description` text,
   `CreatureID` int(10) unsigned NOT NULL DEFAULT '0',
   `IconFileID` int(10) unsigned NOT NULL DEFAULT '0',
   `SummonSpellID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SourceText` text,
-  `Description` text,
   `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
   `PetType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Source` tinyint(4) NOT NULL DEFAULT '0',
@@ -653,8 +622,8 @@ DROP TABLE IF EXISTS `battle_pet_species_state`;
 CREATE TABLE `battle_pet_species_state` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Value` int(11) NOT NULL DEFAULT '0',
-  `SpeciesID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `State` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpeciesID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -670,10 +639,10 @@ DROP TABLE IF EXISTS `battlemaster_list`;
 CREATE TABLE `battlemaster_list` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
-  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `GameType` text,
   `ShortDescription` text,
   `LongDescription` text,
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `MapID1` smallint(6) NOT NULL DEFAULT '0',
   `MapID2` smallint(6) NOT NULL DEFAULT '0',
   `MapID3` smallint(6) NOT NULL DEFAULT '0',
@@ -745,9 +714,9 @@ CREATE TABLE `broadcast_text` (
   `UnkEmoteID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Language` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
   `SoundID1` int(10) unsigned NOT NULL DEFAULT '0',
   `SoundID2` int(10) unsigned NOT NULL DEFAULT '0',
-  `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -771,6 +740,23 @@ CREATE TABLE `broadcast_text_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `char_base_section`
+--
+
+DROP TABLE IF EXISTS `char_base_section`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `char_base_section` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Variation` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ResolutionVariation` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Resolution` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `char_sections`
 --
 
@@ -783,11 +769,11 @@ CREATE TABLE `char_sections` (
   `TextureFileDataID2` int(10) unsigned NOT NULL DEFAULT '0',
   `TextureFileDataID3` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `Race` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `Gender` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `GenType` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `Color` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RaceID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SexID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `BaseSection` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `VariationIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ColorIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -827,11 +813,11 @@ CREATE TABLE `char_start_outfit` (
   `ItemID23` int(11) NOT NULL DEFAULT '0',
   `ItemID24` int(11) NOT NULL DEFAULT '0',
   `PetDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
-  `RaceID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ClassID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `GenderID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `OutfitID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `PetFamilyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RaceID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -873,6 +859,28 @@ CREATE TABLE `char_titles_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `character_facial_hair_styles`
+--
+
+DROP TABLE IF EXISTS `character_facial_hair_styles`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_facial_hair_styles` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Geoset1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Geoset2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Geoset3` int(10) unsigned NOT NULL DEFAULT '0',
+  `Geoset4` int(10) unsigned NOT NULL DEFAULT '0',
+  `Geoset5` int(10) unsigned NOT NULL DEFAULT '0',
+  `RaceID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SexID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `VariationID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `chat_channels`
 --
 
@@ -881,9 +889,9 @@ DROP TABLE IF EXISTS `chat_channels`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `chat_channels` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
   `Shortcut` text,
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `FactionGroup` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -924,6 +932,7 @@ CREATE TABLE `chr_classes` (
   `SelectScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `LowResScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `StartingLevel` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CinematicSequenceID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `DefaultSpec` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -966,8 +975,8 @@ DROP TABLE IF EXISTS `chr_classes_x_power_types`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `chr_classes_x_power_types` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ClassID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `PowerType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ClassID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -981,16 +990,15 @@ DROP TABLE IF EXISTS `chr_races`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `chr_races` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `ClientPrefix` text,
   `ClientFileString` text,
   `Name` text,
   `NameFemale` text,
-  `NameMale` text,
-  `FacialHairCustomization1` text,
-  `FacialHairCustomization2` text,
-  `HairCustomization` text,
+  `LowercaseName` text,
+  `LowercaseNameFemale` text,
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaleDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
+  `FemaleDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
   `CreateScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `SelectScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `MaleCustomizeOffset1` float NOT NULL DEFAULT '0',
@@ -1000,9 +1008,9 @@ CREATE TABLE `chr_races` (
   `FemaleCustomizeOffset2` float NOT NULL DEFAULT '0',
   `FemaleCustomizeOffset3` float NOT NULL DEFAULT '0',
   `LowResScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `StartingLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `UIDisplayOrder` int(10) unsigned NOT NULL DEFAULT '0',
   `FactionID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `MaleDisplayID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `FemaleDisplayID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ResSicknessSpellID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SplashSoundID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CinematicSequenceID` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -1016,11 +1024,18 @@ CREATE TABLE `chr_races` (
   `NeutralRaceID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ItemAppearanceFrameRaceID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `CharComponentTexLayoutHiResID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `HighResMaleDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
   `HighResFemaleDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Unk1` int(10) unsigned NOT NULL DEFAULT '0',
-  `Unk2` int(10) unsigned NOT NULL DEFAULT '0',
-  `Unk3` int(10) unsigned NOT NULL DEFAULT '0',
+  `HeritageArmorAchievementID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaleCorpseBonesModelFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `FemaleCorpseBonesModelFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `AlteredFormTransitionSpellVisualID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `AlteredFormTransitionSpellVisualID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `AlteredFormTransitionSpellVisualID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `AlteredFormTransitionSpellVisualKitID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `AlteredFormTransitionSpellVisualKitID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `AlteredFormTransitionSpellVisualKitID3` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1038,7 +1053,8 @@ CREATE TABLE `chr_races_locale` (
   `locale` varchar(4) NOT NULL,
   `Name_lang` text,
   `NameFemale_lang` text,
-  `NameMale_lang` text,
+  `LowercaseName_lang` text,
+  `LowercaseNameFemale_lang` text,
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1052,11 +1068,11 @@ DROP TABLE IF EXISTS `chr_specialization`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `chr_specialization` (
-  `MasterySpellID1` int(10) unsigned NOT NULL DEFAULT '0',
-  `MasterySpellID2` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
   `Name2` text,
   `Description` text,
+  `MasterySpellID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `MasterySpellID2` int(10) unsigned NOT NULL DEFAULT '0',
   `ClassID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `OrderIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `PetTalentType` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -1090,55 +1106,6 @@ CREATE TABLE `chr_specialization_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `chr_upgrade_bucket`
---
-
-DROP TABLE IF EXISTS `chr_upgrade_bucket`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `chr_upgrade_bucket` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `TierID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpecializationID` int(10) unsigned NOT NULL DEFAULT '0',
-  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`ID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `chr_upgrade_bucket_spell`
---
-
-DROP TABLE IF EXISTS `chr_upgrade_bucket_spell`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `chr_upgrade_bucket_spell` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `BucketID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
-  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`ID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `chr_upgrade_tier`
---
-
-DROP TABLE IF EXISTS `chr_upgrade_tier`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `chr_upgrade_tier` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `TierIndex` int(10) unsigned NOT NULL DEFAULT '0',
-  `Name` text,
-  `TalentTier` int(10) unsigned NOT NULL DEFAULT '0',
-  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`ID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `cinematic_camera`
 --
 
@@ -1182,6 +1149,28 @@ CREATE TABLE `cinematic_sequences` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `conversation_line`
+--
+
+DROP TABLE IF EXISTS `conversation_line`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `conversation_line` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `BroadcastTextID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellVisualKitID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Duration` int(10) unsigned NOT NULL DEFAULT '0',
+  `NextLineID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Unk1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Yell` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Unk2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Unk3` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `creature`
 --
 
@@ -1257,9 +1246,6 @@ CREATE TABLE `creature_display_info` (
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Gender` tinyint(4) NOT NULL DEFAULT '0',
   `ExtendedDisplayInfoID` int(10) unsigned NOT NULL DEFAULT '0',
-  `TextureVariation1` int(10) unsigned NOT NULL DEFAULT '0',
-  `TextureVariation2` int(10) unsigned NOT NULL DEFAULT '0',
-  `TextureVariation3` int(10) unsigned NOT NULL DEFAULT '0',
   `PortraitTextureFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `CreatureModelAlpha` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SoundID` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -1274,6 +1260,9 @@ CREATE TABLE `creature_display_info` (
   `StateSpellVisualKitID` int(10) unsigned NOT NULL DEFAULT '0',
   `InstanceOtherPlayerPetScale` float NOT NULL DEFAULT '0',
   `MountSpellVisualKitID` int(10) unsigned NOT NULL DEFAULT '0',
+  `TextureVariation1` int(10) unsigned NOT NULL DEFAULT '0',
+  `TextureVariation2` int(10) unsigned NOT NULL DEFAULT '0',
+  `TextureVariation3` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1316,9 +1305,9 @@ DROP TABLE IF EXISTS `creature_family`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `creature_family` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
   `MinScale` float NOT NULL DEFAULT '0',
   `MaxScale` float NOT NULL DEFAULT '0',
-  `Name` text,
   `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `SkillLine1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SkillLine2` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -1438,8 +1427,8 @@ CREATE TABLE `criteria` (
   `Asset` int(10) unsigned NOT NULL DEFAULT '0',
   `StartAsset` int(10) unsigned NOT NULL DEFAULT '0',
   `FailAsset` int(10) unsigned NOT NULL DEFAULT '0',
+  `ModifierTreeId` int(10) unsigned NOT NULL DEFAULT '0',
   `StartTimer` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `ModifierTreeId` smallint(5) unsigned NOT NULL DEFAULT '0',
   `EligibilityWorldStateID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `StartEvent` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -1460,12 +1449,12 @@ DROP TABLE IF EXISTS `criteria_tree`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `criteria_tree` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Amount` int(10) unsigned NOT NULL DEFAULT '0',
   `Description` text,
-  `Parent` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Amount` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Operator` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `CriteriaID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Parent` int(10) unsigned NOT NULL DEFAULT '0',
   `OrderIndex` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -1498,15 +1487,14 @@ DROP TABLE IF EXISTS `currency_types`;
 CREATE TABLE `currency_types` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
-  `InventoryIcon1` text,
-  `InventoryIcon2` text,
+  `Description` text,
   `MaxQty` int(10) unsigned NOT NULL DEFAULT '0',
   `MaxEarnablePerWeek` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `Description` text,
   `CategoryID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SpellCategory` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Quality` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `InventoryIconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellWeight` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -1748,6 +1736,7 @@ DROP TABLE IF EXISTS `emotes`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `emotes` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `RaceMask` bigint(20) NOT NULL DEFAULT '0',
   `EmoteSlashCommand` text,
   `SpellVisualKitID` int(10) unsigned NOT NULL DEFAULT '0',
   `EmoteFlags` int(10) unsigned NOT NULL DEFAULT '0',
@@ -1756,7 +1745,6 @@ CREATE TABLE `emotes` (
   `EmoteSpecProcParam` int(10) unsigned NOT NULL DEFAULT '0',
   `EmoteSoundID` int(10) unsigned NOT NULL DEFAULT '0',
   `ClassMask` int(11) NOT NULL DEFAULT '0',
-  `RaceMask` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1803,11 +1791,11 @@ DROP TABLE IF EXISTS `emotes_text_sound`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `emotes_text_sound` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `EmotesTextId` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RaceId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SexId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ClassId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SoundId` int(10) unsigned NOT NULL DEFAULT '0',
+  `EmotesTextId` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1821,19 +1809,19 @@ DROP TABLE IF EXISTS `faction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `faction` (
+  `ReputationRaceMask1` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `ReputationRaceMask2` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `ReputationRaceMask3` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `ReputationRaceMask4` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `Description` text,
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ReputationRaceMask1` int(10) unsigned NOT NULL DEFAULT '0',
-  `ReputationRaceMask2` int(10) unsigned NOT NULL DEFAULT '0',
-  `ReputationRaceMask3` int(10) unsigned NOT NULL DEFAULT '0',
-  `ReputationRaceMask4` int(10) unsigned NOT NULL DEFAULT '0',
   `ReputationBase1` int(11) NOT NULL DEFAULT '0',
   `ReputationBase2` int(11) NOT NULL DEFAULT '0',
   `ReputationBase3` int(11) NOT NULL DEFAULT '0',
   `ReputationBase4` int(11) NOT NULL DEFAULT '0',
   `ParentFactionModIn` float NOT NULL DEFAULT '0',
   `ParentFactionModOut` float NOT NULL DEFAULT '0',
-  `Name` text,
-  `Description` text,
   `ReputationMax1` int(10) unsigned NOT NULL DEFAULT '0',
   `ReputationMax2` int(10) unsigned NOT NULL DEFAULT '0',
   `ReputationMax3` int(10) unsigned NOT NULL DEFAULT '0',
@@ -1935,6 +1923,7 @@ DROP TABLE IF EXISTS `gameobjects`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `gameobjects` (
+  `Name` text,
   `PositionX` float NOT NULL DEFAULT '0',
   `PositionY` float NOT NULL DEFAULT '0',
   `PositionZ` float NOT NULL DEFAULT '0',
@@ -1951,7 +1940,6 @@ CREATE TABLE `gameobjects` (
   `Data6` int(11) NOT NULL DEFAULT '0',
   `Data7` int(11) NOT NULL DEFAULT '0',
   `Data8` int(11) NOT NULL DEFAULT '0',
-  `Name` text,
   `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `DisplayID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `PhaseID` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2027,12 +2015,12 @@ DROP TABLE IF EXISTS `garr_building`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `garr_building` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `HordeGameObjectID` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllianceGameObjectID` int(10) unsigned NOT NULL DEFAULT '0',
   `NameAlliance` text,
   `NameHorde` text,
   `Description` text,
   `Tooltip` text,
+  `HordeGameObjectID` int(10) unsigned NOT NULL DEFAULT '0',
+  `AllianceGameObjectID` int(10) unsigned NOT NULL DEFAULT '0',
   `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `CostCurrencyID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `HordeTexPrefixKitID` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2141,15 +2129,15 @@ DROP TABLE IF EXISTS `garr_follower`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `garr_follower` (
-  `HordeCreatureID` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllianceCreatureID` int(10) unsigned NOT NULL DEFAULT '0',
   `HordeSourceText` text,
   `AllianceSourceText` text,
+  `Name` text,
+  `HordeCreatureID` int(10) unsigned NOT NULL DEFAULT '0',
+  `AllianceCreatureID` int(10) unsigned NOT NULL DEFAULT '0',
   `HordePortraitIconID` int(10) unsigned NOT NULL DEFAULT '0',
   `AlliancePortraitIconID` int(10) unsigned NOT NULL DEFAULT '0',
   `HordeAddedBroadcastTextID` int(10) unsigned NOT NULL DEFAULT '0',
   `AllianceAddedBroadcastTextID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Name` text,
   `HordeGarrFollItemSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `AllianceGarrFollItemSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ItemLevelWeapon` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2205,9 +2193,9 @@ DROP TABLE IF EXISTS `garr_follower_x_ability`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `garr_follower_x_ability` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `GarrFollowerID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `GarrAbilityID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `FactionIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `GarrFollowerID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2402,8 +2390,8 @@ DROP TABLE IF EXISTS `glyph_required_spec`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `glyph_required_spec` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `GlyphPropertiesID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ChrSpecializationID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `GlyphPropertiesID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2483,15 +2471,17 @@ DROP TABLE IF EXISTS `heirloom`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `heirloom` (
-  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `SourceText` text,
+  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `OldItem1` int(10) unsigned NOT NULL DEFAULT '0',
   `OldItem2` int(10) unsigned NOT NULL DEFAULT '0',
   `NextDifficultyItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `UpgradeItemID1` int(10) unsigned NOT NULL DEFAULT '0',
   `UpgradeItemID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `UpgradeItemID3` int(10) unsigned NOT NULL DEFAULT '0',
   `ItemBonusListID1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ItemBonusListID2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemBonusListID3` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Source` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
@@ -2541,7 +2531,6 @@ CREATE TABLE `holidays` (
   `Date14` int(10) unsigned NOT NULL DEFAULT '0',
   `Date15` int(10) unsigned NOT NULL DEFAULT '0',
   `Date16` int(10) unsigned NOT NULL DEFAULT '0',
-  `TextureFilename` text,
   `Duration1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Duration2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Duration3` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2569,6 +2558,9 @@ CREATE TABLE `holidays` (
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `HolidayNameID` int(10) unsigned NOT NULL DEFAULT '0',
   `HolidayDescriptionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `TextureFileDataID1` int(11) NOT NULL DEFAULT '0',
+  `TextureFileDataID2` int(11) NOT NULL DEFAULT '0',
+  `TextureFileDataID3` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2582,11 +2574,11 @@ DROP TABLE IF EXISTS `hotfix_data`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `hotfix_data` (
-  `TableHash` int(10) unsigned NOT NULL DEFAULT '0',
-  `RecordID` int(10) NOT NULL,
-  `Timestamp` int(10) unsigned NOT NULL DEFAULT '0',
-  `Deleted` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`TableHash`,`RecordID`,`Timestamp`)
+  `Id` int(11) NOT NULL,
+  `TableHash` int(10) unsigned NOT NULL,
+  `RecordId` int(11) NOT NULL,
+  `Deleted` tinyint(3) unsigned DEFAULT '0',
+  PRIMARY KEY (`Id`,`TableHash`,`RecordId`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2798,6 +2790,7 @@ CREATE TABLE `item_bonus` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Value1` int(11) NOT NULL DEFAULT '0',
   `Value2` int(11) NOT NULL DEFAULT '0',
+  `Value3` int(11) NOT NULL DEFAULT '0',
   `BonusListID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Index` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -2830,11 +2823,11 @@ DROP TABLE IF EXISTS `item_bonus_tree_node`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_bonus_tree_node` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `BonusTreeID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SubTreeID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `BonusListID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ItemLevelSelectorID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `BonusTreeModID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `BonusTreeID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2849,9 +2842,9 @@ DROP TABLE IF EXISTS `item_child_equipment`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_child_equipment` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `AltItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `AltEquipmentSlot` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2866,8 +2859,8 @@ DROP TABLE IF EXISTS `item_class`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_class` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `PriceMod` float NOT NULL DEFAULT '0',
   `Name` text,
+  `PriceMod` float NOT NULL DEFAULT '0',
   `OldEnumValue` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
@@ -3028,9 +3021,10 @@ CREATE TABLE `item_disenchant_loot` (
   `MinItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MaxItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredDisenchantSkill` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `ItemClass` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ItemSubClass` tinyint(4) NOT NULL DEFAULT '0',
   `ItemQuality` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Expansion` tinyint(4) NOT NULL DEFAULT '0',
+  `ItemClass` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3045,7 +3039,6 @@ DROP TABLE IF EXISTS `item_effect`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_effect` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `Cooldown` int(11) NOT NULL DEFAULT '0',
   `CategoryCooldown` int(11) NOT NULL DEFAULT '0',
@@ -3054,6 +3047,7 @@ CREATE TABLE `item_effect` (
   `ChrSpecializationID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `OrderIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Trigger` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3100,6 +3094,55 @@ CREATE TABLE `item_extended_cost` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `item_level_selector`
+--
+
+DROP TABLE IF EXISTS `item_level_selector`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_level_selector` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemLevelSelectorQualitySetID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `item_level_selector_quality`
+--
+
+DROP TABLE IF EXISTS `item_level_selector_quality`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_level_selector_quality` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemBonusListID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Quality` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ItemLevelSelectorQualitySetID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `item_level_selector_quality_set`
+--
+
+DROP TABLE IF EXISTS `item_level_selector_quality_set`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_level_selector_quality_set` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemLevelMin` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemLevelMax` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `item_limit_category`
 --
 
@@ -3141,11 +3184,11 @@ DROP TABLE IF EXISTS `item_modified_appearance`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_modified_appearance` (
   `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
-  `AppearanceID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `AppearanceModID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `AppearanceID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Index` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SourceType` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3253,22 +3296,22 @@ DROP TABLE IF EXISTS `item_search_name`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_search_name` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `AllowableRace` bigint(20) unsigned NOT NULL DEFAULT '0',
   `Name` text,
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags1` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags2` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags3` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllowableRace` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredSpell` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredReputationFaction` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredSkill` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredSkillRank` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Quality` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RequiredExpansion` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RequiredReputationRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RequiredLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RequiredReputationFaction` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredReputationRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `AllowableClass` int(11) NOT NULL DEFAULT '0',
+  `RequiredSkill` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredSkillRank` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredSpell` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3351,9 +3394,9 @@ DROP TABLE IF EXISTS `item_set_spell`;
 CREATE TABLE `item_set_spell` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ChrSpecID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Threshold` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ItemSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3368,15 +3411,21 @@ DROP TABLE IF EXISTS `item_sparse`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_sparse` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `AllowableRace` bigint(20) NOT NULL DEFAULT '0',
+  `Name` text,
+  `Name2` text,
+  `Name3` text,
+  `Name4` text,
+  `Description` text,
   `Flags1` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags2` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags3` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags4` int(10) unsigned NOT NULL DEFAULT '0',
   `Unk1` float NOT NULL DEFAULT '0',
   `Unk2` float NOT NULL DEFAULT '0',
   `BuyCount` int(10) unsigned NOT NULL DEFAULT '0',
   `BuyPrice` int(10) unsigned NOT NULL DEFAULT '0',
   `SellPrice` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllowableRace` int(11) NOT NULL DEFAULT '0',
   `RequiredSpell` int(10) unsigned NOT NULL DEFAULT '0',
   `MaxCount` int(10) unsigned NOT NULL DEFAULT '0',
   `Stackable` int(10) unsigned NOT NULL DEFAULT '0',
@@ -3401,11 +3450,6 @@ CREATE TABLE `item_sparse` (
   `ItemStatSocketCostMultiplier9` float NOT NULL DEFAULT '0',
   `ItemStatSocketCostMultiplier10` float NOT NULL DEFAULT '0',
   `RangedModRange` float NOT NULL DEFAULT '0',
-  `Name` text,
-  `Name2` text,
-  `Name3` text,
-  `Name4` text,
-  `Description` text,
   `BagFamily` int(10) unsigned NOT NULL DEFAULT '0',
   `ArmorDamageModifier` float NOT NULL DEFAULT '0',
   `Duration` int(10) unsigned NOT NULL DEFAULT '0',
@@ -3526,8 +3570,8 @@ DROP TABLE IF EXISTS `item_spec_override`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_spec_override` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `SpecID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3561,21 +3605,21 @@ DROP TABLE IF EXISTS `item_x_bonus_tree`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_x_bonus_tree` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `BonusTreeID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `key_chain`
+-- Table structure for table `keychain`
 --
 
-DROP TABLE IF EXISTS `key_chain`;
+DROP TABLE IF EXISTS `keychain`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `key_chain` (
+CREATE TABLE `keychain` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Key1` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Key2` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -3622,10 +3666,10 @@ DROP TABLE IF EXISTS `lfg_dungeons`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `lfg_dungeons` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `TextureFilename` text,
   `Description` text,
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `MinItemLevel` float NOT NULL DEFAULT '0',
   `MaxLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
   `TargetLevelMax` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -3653,7 +3697,9 @@ CREATE TABLE `lfg_dungeons` (
   `MinCountDamage` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SubType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MentorCharLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `TextureFileDataID` int(11) NOT NULL DEFAULT '0',
+  `RewardIconFileDataID` int(11) NOT NULL DEFAULT '0',
+  `ProposalTextureFileDataID` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3714,18 +3760,18 @@ DROP TABLE IF EXISTS `liquid_type`;
 CREATE TABLE `liquid_type` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
-  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
-  `MaxDarkenDepth` float NOT NULL DEFAULT '0',
-  `FogDarkenIntensity` float NOT NULL DEFAULT '0',
-  `AmbDarkenIntensity` float NOT NULL DEFAULT '0',
-  `DirDarkenIntensity` float NOT NULL DEFAULT '0',
-  `ParticleScale` float NOT NULL DEFAULT '0',
   `Texture1` text,
   `Texture2` text,
   `Texture3` text,
   `Texture4` text,
   `Texture5` text,
   `Texture6` text,
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxDarkenDepth` float NOT NULL DEFAULT '0',
+  `FogDarkenIntensity` float NOT NULL DEFAULT '0',
+  `AmbDarkenIntensity` float NOT NULL DEFAULT '0',
+  `DirDarkenIntensity` float NOT NULL DEFAULT '0',
+  `ParticleScale` float NOT NULL DEFAULT '0',
   `Color1` int(10) unsigned NOT NULL DEFAULT '0',
   `Color2` int(10) unsigned NOT NULL DEFAULT '0',
   `Float1` float NOT NULL DEFAULT '0',
@@ -3871,16 +3917,16 @@ DROP TABLE IF EXISTS `map`;
 CREATE TABLE `map` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Directory` text,
-  `Flags1` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags2` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinimapIconScale` float NOT NULL DEFAULT '0',
-  `CorpsePosX` float NOT NULL DEFAULT '0',
-  `CorpsePosY` float NOT NULL DEFAULT '0',
   `MapName` text,
   `MapDescription0` text,
   `MapDescription1` text,
   `ShortDescription` text,
   `LongDescription` text,
+  `Flags1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags2` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinimapIconScale` float NOT NULL DEFAULT '0',
+  `CorpsePosX` float NOT NULL DEFAULT '0',
+  `CorpsePosY` float NOT NULL DEFAULT '0',
   `AreaTableID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `LoadingScreenID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CorpseMapID` smallint(6) NOT NULL DEFAULT '0',
@@ -3908,13 +3954,14 @@ DROP TABLE IF EXISTS `map_difficulty`;
 CREATE TABLE `map_difficulty` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Message` text,
-  `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RaidDurationType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MaxPlayers` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `LockID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ItemBonusTreeModID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Context` int(10) unsigned NOT NULL DEFAULT '0',
+  `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3967,7 +4014,7 @@ CREATE TABLE `modifier_tree` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Asset1` int(10) unsigned NOT NULL DEFAULT '0',
   `Asset2` int(10) unsigned NOT NULL DEFAULT '0',
-  `Parent` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Parent` int(10) unsigned NOT NULL DEFAULT '0',
   `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Unk700` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Operator` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -3985,10 +4032,10 @@ DROP TABLE IF EXISTS `mount`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `mount` (
-  `SpellId` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
   `Description` text,
   `SourceDescription` text,
+  `SpellId` int(10) unsigned NOT NULL DEFAULT '0',
   `CameraPivotMultiplier` float NOT NULL DEFAULT '0',
   `MountTypeId` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -4066,9 +4113,9 @@ DROP TABLE IF EXISTS `mount_x_display`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `mount_x_display` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `MountID` int(10) unsigned NOT NULL DEFAULT '0',
   `DisplayID` int(10) unsigned NOT NULL DEFAULT '0',
   `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MountID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -4237,41 +4284,81 @@ DROP TABLE IF EXISTS `player_condition`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `player_condition` (
+  `RaceMask` bigint(20) NOT NULL DEFAULT '0',
+  `FailureDescription` text,
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `RaceMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MinLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MaxLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ClassMask` int(11) NOT NULL DEFAULT '0',
+  `Gender` tinyint(4) NOT NULL DEFAULT '0',
+  `NativeGender` tinyint(4) NOT NULL DEFAULT '0',
   `SkillLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `LanguageID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MinLanguage` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaxLanguage` int(11) NOT NULL DEFAULT '0',
+  `MaxFactionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MaxReputation` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ReputationLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `Unknown1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MinPVPRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaxPVPRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PvpMedal` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `PrevQuestLogic` int(10) unsigned NOT NULL DEFAULT '0',
   `CurrQuestLogic` int(10) unsigned NOT NULL DEFAULT '0',
   `CurrentCompletedQuestLogic` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellLogic` int(10) unsigned NOT NULL DEFAULT '0',
   `ItemLogic` int(10) unsigned NOT NULL DEFAULT '0',
-  `Time1` int(10) unsigned NOT NULL DEFAULT '0',
-  `Time2` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `AuraSpellLogic` int(10) unsigned NOT NULL DEFAULT '0',
-  `AuraSpellID1` int(10) unsigned NOT NULL DEFAULT '0',
-  `AuraSpellID2` int(10) unsigned NOT NULL DEFAULT '0',
-  `AuraSpellID3` int(10) unsigned NOT NULL DEFAULT '0',
-  `AuraSpellID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `WorldStateExpressionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeatherID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PartyStatus` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `LifetimeMaxPVPRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `AchievementLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `LfgLogic` int(10) unsigned NOT NULL DEFAULT '0',
   `AreaLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `QuestKillID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `QuestKillLogic` int(10) unsigned NOT NULL DEFAULT '0',
-  `FailureDescription` text,
-  `MinLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `MaxLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MinExpansionLevel` tinyint(4) NOT NULL DEFAULT '0',
+  `MaxExpansionLevel` tinyint(4) NOT NULL DEFAULT '0',
+  `MinExpansionTier` tinyint(4) NOT NULL DEFAULT '0',
+  `MaxExpansionTier` tinyint(4) NOT NULL DEFAULT '0',
+  `MinGuildLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaxGuildLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PhaseUseFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PhaseID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PhaseGroupID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinAvgItemLevel` int(11) NOT NULL DEFAULT '0',
+  `MaxAvgItemLevel` int(11) NOT NULL DEFAULT '0',
+  `MinAvgEquippedItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MaxAvgEquippedItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ChrSpecializationIndex` tinyint(4) NOT NULL DEFAULT '0',
+  `ChrSpecializationRole` tinyint(4) NOT NULL DEFAULT '0',
+  `PowerType` tinyint(4) NOT NULL DEFAULT '0',
+  `PowerTypeComp` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PowerTypeValue` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ModifierTreeID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MainHandItemSubclassMask` int(11) NOT NULL DEFAULT '0',
   `SkillID1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SkillID2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SkillID3` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SkillID4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `MinSkill1` smallint(6) NOT NULL DEFAULT '0',
-  `MinSkill2` smallint(6) NOT NULL DEFAULT '0',
-  `MinSkill3` smallint(6) NOT NULL DEFAULT '0',
-  `MinSkill4` smallint(6) NOT NULL DEFAULT '0',
-  `MaxSkill1` smallint(6) NOT NULL DEFAULT '0',
-  `MaxSkill2` smallint(6) NOT NULL DEFAULT '0',
-  `MaxSkill3` smallint(6) NOT NULL DEFAULT '0',
-  `MaxSkill4` smallint(6) NOT NULL DEFAULT '0',
-  `MaxFactionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MinSkill1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MinSkill2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MinSkill3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MinSkill4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MaxSkill1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MaxSkill2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MaxSkill3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MaxSkill4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MinFactionID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinFactionID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinFactionID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinReputation1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MinReputation2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MinReputation3` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `PrevQuestID1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `PrevQuestID2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `PrevQuestID3` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -4284,43 +4371,34 @@ CREATE TABLE `player_condition` (
   `CurrentCompletedQuestID2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CurrentCompletedQuestID3` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CurrentCompletedQuestID4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SpellID1` int(11) NOT NULL DEFAULT '0',
+  `SpellID2` int(11) NOT NULL DEFAULT '0',
+  `SpellID3` int(11) NOT NULL DEFAULT '0',
+  `SpellID4` int(11) NOT NULL DEFAULT '0',
+  `ItemID1` int(11) NOT NULL DEFAULT '0',
+  `ItemID2` int(11) NOT NULL DEFAULT '0',
+  `ItemID3` int(11) NOT NULL DEFAULT '0',
+  `ItemID4` int(11) NOT NULL DEFAULT '0',
+  `ItemCount1` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemCount2` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemCount3` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemCount4` int(10) unsigned NOT NULL DEFAULT '0',
   `Explored1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Explored2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `WorldStateExpressionID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `Achievement1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `Achievement2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `Achievement3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `Achievement4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `AreaID1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `AreaID2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `AreaID3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `AreaID4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `QuestKillID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PhaseID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `MinAvgEquippedItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `MaxAvgEquippedItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `ModifierTreeID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `Gender` tinyint(4) NOT NULL DEFAULT '0',
-  `NativeGender` tinyint(4) NOT NULL DEFAULT '0',
-  `MinLanguage` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `MaxLanguage` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `MinReputation1` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `MinReputation2` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `MinReputation3` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `MaxReputation` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `Unknown1` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `MinPVPRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `MaxPVPRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `PvpMedal` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `ItemFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Time1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Time2` int(10) unsigned NOT NULL DEFAULT '0',
+  `AuraSpellID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `AuraSpellID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `AuraSpellID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `AuraSpellID4` int(10) unsigned NOT NULL DEFAULT '0',
   `AuraCount1` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `AuraCount2` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `AuraCount3` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `AuraCount4` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `WeatherID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `PartyStatus` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `LifetimeMaxPVPRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Achievement1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Achievement2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Achievement3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Achievement4` smallint(5) unsigned NOT NULL DEFAULT '0',
   `LfgStatus1` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `LfgStatus2` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `LfgStatus3` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -4329,61 +4407,30 @@ CREATE TABLE `player_condition` (
   `LfgCompare2` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `LfgCompare3` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `LfgCompare4` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `CurrencyCount1` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `CurrencyCount2` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `CurrencyCount3` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `CurrencyCount4` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `MinExpansionLevel` tinyint(4) NOT NULL DEFAULT '0',
-  `MaxExpansionLevel` tinyint(4) NOT NULL DEFAULT '0',
-  `MinExpansionTier` tinyint(4) NOT NULL DEFAULT '0',
-  `MaxExpansionTier` tinyint(4) NOT NULL DEFAULT '0',
-  `MinGuildLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `MaxGuildLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `PhaseUseFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `ChrSpecializationIndex` tinyint(4) NOT NULL DEFAULT '0',
-  `ChrSpecializationRole` tinyint(4) NOT NULL DEFAULT '0',
-  `PowerType` tinyint(4) NOT NULL DEFAULT '0',
-  `PowerTypeComp` tinyint(4) NOT NULL DEFAULT '0',
-  `PowerTypeValue` tinyint(4) NOT NULL DEFAULT '0',
-  `ClassMask` int(11) NOT NULL DEFAULT '0',
-  `LanguageID` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinFactionID1` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinFactionID2` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinFactionID3` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellID1` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellID2` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellID3` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellID4` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemID1` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemID2` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemID3` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemID4` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemCount1` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemCount2` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemCount3` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemCount4` int(10) unsigned NOT NULL DEFAULT '0',
-  `LfgLogic` int(10) unsigned NOT NULL DEFAULT '0',
   `LfgValue1` int(10) unsigned NOT NULL DEFAULT '0',
   `LfgValue2` int(10) unsigned NOT NULL DEFAULT '0',
   `LfgValue3` int(10) unsigned NOT NULL DEFAULT '0',
   `LfgValue4` int(10) unsigned NOT NULL DEFAULT '0',
-  `CurrencyLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `AreaID1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AreaID2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AreaID3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AreaID4` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CurrencyID1` int(10) unsigned NOT NULL DEFAULT '0',
   `CurrencyID2` int(10) unsigned NOT NULL DEFAULT '0',
   `CurrencyID3` int(10) unsigned NOT NULL DEFAULT '0',
   `CurrencyID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyCount1` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyCount2` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyCount3` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyCount4` int(10) unsigned NOT NULL DEFAULT '0',
   `QuestKillMonster1` int(10) unsigned NOT NULL DEFAULT '0',
   `QuestKillMonster2` int(10) unsigned NOT NULL DEFAULT '0',
   `QuestKillMonster3` int(10) unsigned NOT NULL DEFAULT '0',
   `QuestKillMonster4` int(10) unsigned NOT NULL DEFAULT '0',
   `QuestKillMonster5` int(10) unsigned NOT NULL DEFAULT '0',
   `QuestKillMonster6` int(10) unsigned NOT NULL DEFAULT '0',
-  `PhaseGroupID` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinAvgItemLevel` int(10) unsigned NOT NULL DEFAULT '0',
-  `MaxAvgItemLevel` int(10) unsigned NOT NULL DEFAULT '0',
   `MovementFlags1` int(11) NOT NULL DEFAULT '0',
   `MovementFlags2` int(11) NOT NULL DEFAULT '0',
-  `MainHandItemSubclassMask` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -4451,6 +4498,40 @@ CREATE TABLE `power_type` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `prestige_level_info`
+--
+
+DROP TABLE IF EXISTS `prestige_level_info`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prestige_level_info` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PrestigeText` text,
+  `IconID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PrestigeLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prestige_level_info_locale`
+--
+
+DROP TABLE IF EXISTS `prestige_level_info_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prestige_level_info_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `PrestigeText_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `pvp_difficulty`
 --
 
@@ -4459,10 +4540,27 @@ DROP TABLE IF EXISTS `pvp_difficulty`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `pvp_difficulty` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `BracketID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MinLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MaxLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `pvp_reward`
+--
+
+DROP TABLE IF EXISTS `pvp_reward`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `pvp_reward` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `HonorLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `Prestige` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardPackID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -4635,6 +4733,43 @@ CREATE TABLE `rand_prop_points` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `reward_pack`
+--
+
+DROP TABLE IF EXISTS `reward_pack`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `reward_pack` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Money` int(10) unsigned NOT NULL DEFAULT '0',
+  `ArtifactXPMultiplier` float NOT NULL DEFAULT '0',
+  `ArtifactXPDifficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ArtifactCategoryID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `TitleID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Unused` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `reward_pack_x_item`
+--
+
+DROP TABLE IF EXISTS `reward_pack_x_item`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `reward_pack_x_item` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Amount` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardPackID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `ruleset_item_upgrade`
 --
 
@@ -4651,6 +4786,23 @@ CREATE TABLE `ruleset_item_upgrade` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `sandbox_scaling`
+--
+
+DROP TABLE IF EXISTS `sandbox_scaling`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `sandbox_scaling` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `scaling_stat_distribution`
 --
 
@@ -4712,12 +4864,12 @@ CREATE TABLE `scenario_step` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Description` text,
   `Name` text,
-  `CriteriaTreeID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ScenarioID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `PreviousStepID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `QuestRewardID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Step` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CriteriaTreeID` int(10) unsigned NOT NULL DEFAULT '0',
   `BonusRequiredStepID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -4750,8 +4902,6 @@ DROP TABLE IF EXISTS `scene_script`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `scene_script` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Name` text,
-  `Script` text,
   `PrevScriptId` smallint(5) unsigned NOT NULL DEFAULT '0',
   `NextScriptId` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
@@ -4760,6 +4910,22 @@ CREATE TABLE `scene_script` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `scene_script_global_text`
+--
+
+DROP TABLE IF EXISTS `scene_script_global_text`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scene_script_global_text` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `Script` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `scene_script_package`
 --
 
@@ -4775,6 +4941,22 @@ CREATE TABLE `scene_script_package` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `scene_script_text`
+--
+
+DROP TABLE IF EXISTS `scene_script_text`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scene_script_text` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `Script` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `skill_line`
 --
 
@@ -4804,20 +4986,20 @@ DROP TABLE IF EXISTS `skill_line_ability`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `skill_line_ability` (
+  `RaceMask` bigint(20) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
-  `RaceMask` int(10) unsigned NOT NULL DEFAULT '0',
   `SupercedesSpell` int(10) unsigned NOT NULL DEFAULT '0',
   `SkillLine` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `MinSkillLineRank` smallint(5) unsigned NOT NULL DEFAULT '0',
   `TrivialSkillLineRankHigh` smallint(5) unsigned NOT NULL DEFAULT '0',
   `TrivialSkillLineRankLow` smallint(5) unsigned NOT NULL DEFAULT '0',
   `UniqueBit` smallint(5) unsigned NOT NULL DEFAULT '0',
   `TradeSkillCategoryID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `AcquireMethod` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `NumSkillUps` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `Unknown703` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ClassMask` int(11) NOT NULL DEFAULT '0',
+  `MinSkillLineRank` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AcquireMethod` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -4850,7 +5032,7 @@ DROP TABLE IF EXISTS `skill_race_class_info`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `skill_race_class_info` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `RaceMask` int(11) NOT NULL DEFAULT '0',
+  `RaceMask` bigint(20) NOT NULL DEFAULT '0',
   `SkillID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SkillTierID` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -4870,45 +5052,28 @@ DROP TABLE IF EXISTS `sound_kit`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `sound_kit` (
-  `Name` text,
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `VolumeFloat` float NOT NULL DEFAULT '0',
   `MinDistance` float NOT NULL DEFAULT '0',
   `DistanceCutoff` float NOT NULL DEFAULT '0',
+  `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SoundEntriesAdvancedID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SoundType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DialogType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EAXDef` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VolumeVariationPlus` float NOT NULL DEFAULT '0',
   `VolumeVariationMinus` float NOT NULL DEFAULT '0',
   `PitchVariationPlus` float NOT NULL DEFAULT '0',
   `PitchVariationMinus` float NOT NULL DEFAULT '0',
   `PitchAdjust` float NOT NULL DEFAULT '0',
-  `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `SoundEntriesAdvancedID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `BusOverwriteID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `SoundType` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `EAXDef` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `DialogType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Unk700` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `sound_kit_locale`
---
-
-DROP TABLE IF EXISTS `sound_kit_locale`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `sound_kit_locale` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `locale` varchar(4) NOT NULL,
-  `Name_lang` text,
-  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`ID`,`locale`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `specialization_spells`
 --
 
@@ -4916,9 +5081,9 @@ DROP TABLE IF EXISTS `specialization_spells`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `specialization_spells` (
+  `Description` text,
   `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `OverridesSpellID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Description` text,
   `SpecID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `OrderIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
@@ -4951,13 +5116,11 @@ DROP TABLE IF EXISTS `spell`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
   `NameSubtext` text,
   `Description` text,
   `AuraDescription` text,
-  `MiscID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `DescriptionVariablesID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -4972,14 +5135,14 @@ DROP TABLE IF EXISTS `spell_aura_options`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_aura_options` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `ProcCharges` int(10) unsigned NOT NULL DEFAULT '0',
   `ProcTypeMask` int(10) unsigned NOT NULL DEFAULT '0',
   `ProcCategoryRecovery` int(10) unsigned NOT NULL DEFAULT '0',
   `CumulativeAura` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SpellProcsPerMinuteID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ProcChance` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `SpellProcsPerMinuteID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -4994,7 +5157,6 @@ DROP TABLE IF EXISTS `spell_aura_restrictions`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_aura_restrictions` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `CasterAuraSpell` int(10) unsigned NOT NULL DEFAULT '0',
   `TargetAuraSpell` int(10) unsigned NOT NULL DEFAULT '0',
   `ExcludeCasterAuraSpell` int(10) unsigned NOT NULL DEFAULT '0',
@@ -5004,6 +5166,7 @@ CREATE TABLE `spell_aura_restrictions` (
   `TargetAuraState` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ExcludeCasterAuraState` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ExcludeTargetAuraState` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5056,7 +5219,6 @@ DROP TABLE IF EXISTS `spell_categories`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_categories` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `Category` smallint(5) unsigned NOT NULL DEFAULT '0',
   `StartRecoveryCategory` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ChargeCategory` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -5065,6 +5227,7 @@ CREATE TABLE `spell_categories` (
   `DispelType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Mechanic` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `PreventionType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5136,11 +5299,11 @@ DROP TABLE IF EXISTS `spell_cooldowns`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_cooldowns` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `CategoryRecoveryTime` int(10) unsigned NOT NULL DEFAULT '0',
   `RecoveryTime` int(10) unsigned NOT NULL DEFAULT '0',
   `StartRecoveryTime` int(10) unsigned NOT NULL DEFAULT '0',
   `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5171,22 +5334,11 @@ DROP TABLE IF EXISTS `spell_effect`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_effect` (
-  `EffectSpellClassMask1` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectSpellClassMask2` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectSpellClassMask3` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectSpellClassMask4` int(10) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `Effect` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectAura` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectBasePoints` int(11) NOT NULL DEFAULT '0',
   `EffectIndex` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectMiscValue` int(11) NOT NULL DEFAULT '0',
-  `EffectMiscValueB` int(11) NOT NULL DEFAULT '0',
-  `EffectRadiusIndex` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectRadiusMaxIndex` int(10) unsigned NOT NULL DEFAULT '0',
-  `ImplicitTarget1` int(10) unsigned NOT NULL DEFAULT '0',
-  `ImplicitTarget2` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectAura` int(10) unsigned NOT NULL DEFAULT '0',
   `DifficultyID` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectAmplitude` float NOT NULL DEFAULT '0',
   `EffectAuraPeriod` int(10) unsigned NOT NULL DEFAULT '0',
@@ -5203,40 +5355,21 @@ CREATE TABLE `spell_effect` (
   `EffectAttributes` int(10) unsigned NOT NULL DEFAULT '0',
   `BonusCoefficientFromAP` float NOT NULL DEFAULT '0',
   `PvPMultiplier` float NOT NULL DEFAULT '0',
-  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`ID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `spell_effect_group_size`
---
-
-DROP TABLE IF EXISTS `spell_effect_group_size`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `spell_effect_group_size` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellEffectID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Size` float NOT NULL DEFAULT '0',
-  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`ID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `spell_effect_scaling`
---
-
-DROP TABLE IF EXISTS `spell_effect_scaling`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `spell_effect_scaling` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Coefficient` float NOT NULL DEFAULT '0',
   `Variance` float NOT NULL DEFAULT '0',
   `ResourceCoefficient` float NOT NULL DEFAULT '0',
-  `SpellEffectID` int(10) unsigned NOT NULL DEFAULT '0',
+  `GroupSizeCoefficient` float NOT NULL DEFAULT '0',
+  `EffectSpellClassMask1` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectSpellClassMask2` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectSpellClassMask3` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectSpellClassMask4` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectMiscValue` int(11) NOT NULL DEFAULT '0',
+  `EffectMiscValueB` int(11) NOT NULL DEFAULT '0',
+  `EffectRadiusIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectRadiusMaxIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `ImplicitTarget1` int(10) unsigned NOT NULL DEFAULT '0',
+  `ImplicitTarget2` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5300,13 +5433,13 @@ DROP TABLE IF EXISTS `spell_interrupts`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_interrupts` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `InterruptFlags` smallint(5) unsigned NOT NULL DEFAULT '0',
   `AuraInterruptFlags1` int(10) unsigned NOT NULL DEFAULT '0',
   `AuraInterruptFlags2` int(10) unsigned NOT NULL DEFAULT '0',
   `ChannelInterruptFlags1` int(10) unsigned NOT NULL DEFAULT '0',
   `ChannelInterruptFlags2` int(10) unsigned NOT NULL DEFAULT '0',
-  `InterruptFlags` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5321,10 +5454,10 @@ DROP TABLE IF EXISTS `spell_item_enchantment`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_item_enchantment` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
   `EffectSpellID1` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectSpellID2` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectSpellID3` int(10) unsigned NOT NULL DEFAULT '0',
-  `Name` text,
   `EffectScalingPoints1` float NOT NULL DEFAULT '0',
   `EffectScalingPoints2` float NOT NULL DEFAULT '0',
   `EffectScalingPoints3` float NOT NULL DEFAULT '0',
@@ -5362,6 +5495,11 @@ DROP TABLE IF EXISTS `spell_item_enchantment_condition`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_item_enchantment_condition` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `LTOperand1` int(10) unsigned NOT NULL DEFAULT '0',
+  `LTOperand2` int(10) unsigned NOT NULL DEFAULT '0',
+  `LTOperand3` int(10) unsigned NOT NULL DEFAULT '0',
+  `LTOperand4` int(10) unsigned NOT NULL DEFAULT '0',
+  `LTOperand5` int(10) unsigned NOT NULL DEFAULT '0',
   `LTOperandType1` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `LTOperandType2` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `LTOperandType3` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -5387,11 +5525,6 @@ CREATE TABLE `spell_item_enchantment_condition` (
   `Logic3` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Logic4` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Logic5` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `LTOperand1` int(10) unsigned NOT NULL DEFAULT '0',
-  `LTOperand2` int(10) unsigned NOT NULL DEFAULT '0',
-  `LTOperand3` int(10) unsigned NOT NULL DEFAULT '0',
-  `LTOperand4` int(10) unsigned NOT NULL DEFAULT '0',
-  `LTOperand5` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5439,12 +5572,12 @@ DROP TABLE IF EXISTS `spell_levels`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_levels` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `BaseLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MaxLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SpellLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
   `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MaxUsableLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5478,6 +5611,15 @@ DROP TABLE IF EXISTS `spell_misc`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_misc` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CastingTimeIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `DurationIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RangeIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SchoolMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Speed` float NOT NULL DEFAULT '0',
+  `ActiveIconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MultistrikeSpeedMod` float NOT NULL DEFAULT '0',
+  `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Attributes` int(10) unsigned NOT NULL DEFAULT '0',
   `AttributesEx` int(10) unsigned NOT NULL DEFAULT '0',
   `AttributesExB` int(10) unsigned NOT NULL DEFAULT '0',
@@ -5492,14 +5634,7 @@ CREATE TABLE `spell_misc` (
   `AttributesExK` int(10) unsigned NOT NULL DEFAULT '0',
   `AttributesExL` int(10) unsigned NOT NULL DEFAULT '0',
   `AttributesExM` int(10) unsigned NOT NULL DEFAULT '0',
-  `Speed` float NOT NULL DEFAULT '0',
-  `MultistrikeSpeedMod` float NOT NULL DEFAULT '0',
-  `CastingTimeIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `DurationIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RangeIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `SchoolMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ActiveIconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5513,8 +5648,7 @@ DROP TABLE IF EXISTS `spell_power`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_power` (
-  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ManaCost` int(10) unsigned NOT NULL DEFAULT '0',
+  `ManaCost` int(11) NOT NULL DEFAULT '0',
   `ManaCostPercentage` float NOT NULL DEFAULT '0',
   `ManaCostPercentagePerSecond` float NOT NULL DEFAULT '0',
   `RequiredAura` int(10) unsigned NOT NULL DEFAULT '0',
@@ -5524,9 +5658,10 @@ CREATE TABLE `spell_power` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `ManaCostPerLevel` int(11) NOT NULL DEFAULT '0',
   `ManaCostPerSecond` int(11) NOT NULL DEFAULT '0',
-  `ManaCostAdditional` int(10) unsigned NOT NULL DEFAULT '0',
+  `ManaCostAdditional` int(11) NOT NULL DEFAULT '0',
   `PowerDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
   `UnitPowerBarID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5576,7 +5711,7 @@ CREATE TABLE `spell_procs_per_minute_mod` (
   `Coeff` float NOT NULL DEFAULT '0',
   `Param` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `SpellProcsPerMinuteID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpellProcsPerMinuteID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5609,12 +5744,12 @@ DROP TABLE IF EXISTS `spell_range`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_range` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DisplayName` text,
+  `DisplayNameShort` text,
   `MinRangeHostile` float NOT NULL DEFAULT '0',
   `MinRangeFriend` float NOT NULL DEFAULT '0',
   `MaxRangeHostile` float NOT NULL DEFAULT '0',
   `MaxRangeFriend` float NOT NULL DEFAULT '0',
-  `DisplayName` text,
-  `DisplayNameShort` text,
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -5767,7 +5902,6 @@ DROP TABLE IF EXISTS `spell_target_restrictions`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_target_restrictions` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `ConeAngle` float NOT NULL DEFAULT '0',
   `Width` float NOT NULL DEFAULT '0',
   `Targets` int(10) unsigned NOT NULL DEFAULT '0',
@@ -5775,6 +5909,7 @@ CREATE TABLE `spell_target_restrictions` (
   `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MaxAffectedTargets` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MaxTargetLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5807,7 +5942,6 @@ DROP TABLE IF EXISTS `spell_x_spell_visual`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_x_spell_visual` (
-  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellVisualID` int(10) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Chance` float NOT NULL DEFAULT '0',
@@ -5820,6 +5954,7 @@ CREATE TABLE `spell_x_spell_visual` (
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Priority` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5883,9 +6018,9 @@ DROP TABLE IF EXISTS `talent`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `talent` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Description` text,
   `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `OverridesSpellID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Description` text,
   `SpecID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `TierID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ColumnIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -5922,19 +6057,24 @@ DROP TABLE IF EXISTS `taxi_nodes`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `taxi_nodes` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
   `PosX` float NOT NULL DEFAULT '0',
   `PosY` float NOT NULL DEFAULT '0',
   `PosZ` float NOT NULL DEFAULT '0',
-  `Name` text,
   `MountCreatureID1` int(10) unsigned NOT NULL DEFAULT '0',
   `MountCreatureID2` int(10) unsigned NOT NULL DEFAULT '0',
   `MapOffsetX` float NOT NULL DEFAULT '0',
   `MapOffsetY` float NOT NULL DEFAULT '0',
+  `Unk730` float NOT NULL DEFAULT '0',
+  `FlightMapOffsetX` float NOT NULL DEFAULT '0',
+  `FlightMapOffsetY` float NOT NULL DEFAULT '0',
   `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `LearnableIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `UiTextureKitPrefixID` int(11) NOT NULL DEFAULT '0',
+  `SpecialAtlasIconPlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5984,14 +6124,14 @@ CREATE TABLE `taxi_path_node` (
   `LocX` float NOT NULL DEFAULT '0',
   `LocY` float NOT NULL DEFAULT '0',
   `LocZ` float NOT NULL DEFAULT '0',
-  `Delay` int(10) unsigned NOT NULL DEFAULT '0',
   `PathID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `ArrivalEventID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `DepartureEventID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `NodeIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Delay` int(10) unsigned NOT NULL DEFAULT '0',
+  `ArrivalEventID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `DepartureEventID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -6038,8 +6178,8 @@ DROP TABLE IF EXISTS `toy`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `toy` (
-  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `Description` text,
+  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `CategoryFilter` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
@@ -6065,6 +6205,108 @@ CREATE TABLE `toy_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `transmog_holiday`
+--
+
+DROP TABLE IF EXISTS `transmog_holiday`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `transmog_holiday` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `HolidayID` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `transmog_set`
+--
+
+DROP TABLE IF EXISTS `transmog_set`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `transmog_set` (
+  `Name` text,
+  `BaseSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `UIOrder` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ExpansionID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(11) NOT NULL DEFAULT '0',
+  `QuestID` int(11) NOT NULL DEFAULT '0',
+  `ClassMask` int(11) NOT NULL DEFAULT '0',
+  `ItemNameDescriptionID` int(11) NOT NULL DEFAULT '0',
+  `TransmogSetGroupID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `transmog_set_group`
+--
+
+DROP TABLE IF EXISTS `transmog_set_group`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `transmog_set_group` (
+  `Label` text,
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `transmog_set_group_locale`
+--
+
+DROP TABLE IF EXISTS `transmog_set_group_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `transmog_set_group_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Label_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `transmog_set_item`
+--
+
+DROP TABLE IF EXISTS `transmog_set_item`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `transmog_set_item` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `TransmogSetID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemModifiedAppearanceID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `transmog_set_locale`
+--
+
+DROP TABLE IF EXISTS `transmog_set_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `transmog_set_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `transport_animation`
 --
 
@@ -6073,12 +6315,12 @@ DROP TABLE IF EXISTS `transport_animation`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `transport_animation` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `TransportID` int(10) unsigned NOT NULL DEFAULT '0',
   `TimeIndex` int(10) unsigned NOT NULL DEFAULT '0',
   `PosX` float NOT NULL DEFAULT '0',
   `PosY` float NOT NULL DEFAULT '0',
   `PosZ` float NOT NULL DEFAULT '0',
   `SequenceID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `TransportID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -6093,12 +6335,12 @@ DROP TABLE IF EXISTS `transport_rotation`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `transport_rotation` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `TransportID` int(10) unsigned NOT NULL DEFAULT '0',
   `TimeIndex` int(10) unsigned NOT NULL DEFAULT '0',
   `X` float NOT NULL DEFAULT '0',
   `Y` float NOT NULL DEFAULT '0',
   `Z` float NOT NULL DEFAULT '0',
   `W` float NOT NULL DEFAULT '0',
+  `TransportID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -6113,6 +6355,10 @@ DROP TABLE IF EXISTS `unit_power_bar`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `unit_power_bar` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `Cost` text,
+  `OutOfError` text,
+  `ToolTip` text,
   `RegenerationPeace` float NOT NULL DEFAULT '0',
   `RegenerationCombat` float NOT NULL DEFAULT '0',
   `FileDataID1` int(10) unsigned NOT NULL DEFAULT '0',
@@ -6127,10 +6373,6 @@ CREATE TABLE `unit_power_bar` (
   `Color4` int(10) unsigned NOT NULL DEFAULT '0',
   `Color5` int(10) unsigned NOT NULL DEFAULT '0',
   `Color6` int(10) unsigned NOT NULL DEFAULT '0',
-  `Name` text,
-  `Cost` text,
-  `OutOfError` text,
-  `ToolTip` text,
   `StartInset` float NOT NULL DEFAULT '0',
   `EndInset` float NOT NULL DEFAULT '0',
   `StartPower` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -6214,21 +6456,7 @@ CREATE TABLE `vehicle` (
   `CameraPitchOffset` float NOT NULL DEFAULT '0',
   `FacingLimitRight` float NOT NULL DEFAULT '0',
   `FacingLimitLeft` float NOT NULL DEFAULT '0',
-  `MsslTrgtTurnLingering` float NOT NULL DEFAULT '0',
-  `MsslTrgtPitchLingering` float NOT NULL DEFAULT '0',
-  `MsslTrgtMouseLingering` float NOT NULL DEFAULT '0',
-  `MsslTrgtEndOpacity` float NOT NULL DEFAULT '0',
-  `MsslTrgtArcSpeed` float NOT NULL DEFAULT '0',
-  `MsslTrgtArcRepeat` float NOT NULL DEFAULT '0',
-  `MsslTrgtArcWidth` float NOT NULL DEFAULT '0',
-  `MsslTrgtImpactRadius1` float NOT NULL DEFAULT '0',
-  `MsslTrgtImpactRadius2` float NOT NULL DEFAULT '0',
-  `MsslTrgtArcTexture` text,
-  `MsslTrgtImpactTexture` text,
-  `MsslTrgtImpactModel1` text,
-  `MsslTrgtImpactModel2` text,
   `CameraYawOffset` float NOT NULL DEFAULT '0',
-  `MsslTrgtImpactTexRadius` float NOT NULL DEFAULT '0',
   `SeatID1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SeatID2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SeatID3` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -6243,6 +6471,7 @@ CREATE TABLE `vehicle` (
   `PowerDisplayID3` smallint(5) unsigned NOT NULL DEFAULT '0',
   `FlagsB` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `UILocomotionType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MissileTargetingID` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -6335,9 +6564,8 @@ DROP TABLE IF EXISTS `wmo_area_table`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `wmo_area_table` (
-  `WMOGroupID` int(11) NOT NULL DEFAULT '0',
   `AreaName` text,
-  `WMOID` smallint(6) NOT NULL DEFAULT '0',
+  `WMOGroupID` int(11) NOT NULL DEFAULT '0',
   `AmbienceID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ZoneMusic` smallint(5) unsigned NOT NULL DEFAULT '0',
   `IntroSound` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -6350,6 +6578,7 @@ CREATE TABLE `wmo_area_table` (
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `UWZoneMusic` int(10) unsigned NOT NULL DEFAULT '0',
+  `WMOID` smallint(6) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -6372,6 +6601,26 @@ CREATE TABLE `wmo_area_table_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `world_effect`
+--
+
+DROP TABLE IF EXISTS `world_effect`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `world_effect` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `TargetAsset` int(10) unsigned NOT NULL DEFAULT '0',
+  `CombatConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `TargetType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `WhenToDisplay` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `QuestFeedbackEffectID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `world_map_area`
 --
 
@@ -6384,12 +6633,12 @@ CREATE TABLE `world_map_area` (
   `LocRight` float NOT NULL DEFAULT '0',
   `LocTop` float NOT NULL DEFAULT '0',
   `LocBottom` float NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `AreaID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `DisplayMapID` smallint(6) NOT NULL DEFAULT '0',
   `DefaultDungeonFloor` smallint(6) NOT NULL DEFAULT '0',
   `ParentWorldMapID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
   `LevelRangeMin` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `LevelRangeMax` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `BountySetID` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -6409,8 +6658,8 @@ DROP TABLE IF EXISTS `world_map_overlay`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `world_map_overlay` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `TextureName` text,
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `TextureWidth` smallint(5) unsigned NOT NULL DEFAULT '0',
   `TextureHeight` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MapAreaID` int(10) unsigned NOT NULL DEFAULT '0',
@@ -6455,6 +6704,7 @@ CREATE TABLE `world_map_transforms` (
   `NewDungeonMapID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `NewAreaID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Priority` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -6469,11 +6719,11 @@ DROP TABLE IF EXISTS `world_safe_locs`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `world_safe_locs` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `AreaName` text,
   `LocX` float NOT NULL DEFAULT '0',
   `LocY` float NOT NULL DEFAULT '0',
   `LocZ` float NOT NULL DEFAULT '0',
   `Facing` float NOT NULL DEFAULT '0',
-  `AreaName` text,
   `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -6505,4 +6755,4 @@ CREATE TABLE `world_safe_locs_locale` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2017-04-19  0:03:47
+-- Dump completed on 2018-02-19 22:43:15
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index d601f8518c0..251479c241f 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -2,7 +2,7 @@
 --
 -- Host: localhost    Database: world
 -- ------------------------------------------------------
--- Server version	5.7.14-log
+-- Server version	10.1.6-MariaDB
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -366,6 +366,74 @@ CREATE TABLE `conditions` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `conversation_actor_template`
+--
+
+DROP TABLE IF EXISTS `conversation_actor_template`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `conversation_actor_template` (
+  `Id` int(10) unsigned NOT NULL,
+  `CreatureId` int(10) unsigned NOT NULL DEFAULT '0',
+  `CreatureModelId` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`Id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `conversation_actors`
+--
+
+DROP TABLE IF EXISTS `conversation_actors`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `conversation_actors` (
+  `ConversationId` int(10) unsigned NOT NULL,
+  `ConversationActorId` int(10) unsigned NOT NULL DEFAULT '0',
+  `ConversationActorGuid` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `Idx` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ConversationId`,`Idx`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `conversation_line_template`
+--
+
+DROP TABLE IF EXISTS `conversation_line_template`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `conversation_line_template` (
+  `Id` int(10) unsigned NOT NULL,
+  `StartTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `UiCameraID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ActorIdx` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Unk` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`Id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `conversation_template`
+--
+
+DROP TABLE IF EXISTS `conversation_template`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `conversation_template` (
+  `Id` int(10) unsigned NOT NULL,
+  `FirstLineId` int(10) unsigned NOT NULL,
+  `LastLineEndTime` int(10) unsigned NOT NULL,
+  `ScriptName` varchar(64) NOT NULL DEFAULT '',
+  `VerifiedBuild` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`Id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `creature`
 --
 
@@ -378,7 +446,7 @@ CREATE TABLE `creature` (
   `map` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Map Identifier',
   `zoneId` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Zone Identifier',
   `areaId` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Area Identifier',
-  `spawnMask` int(10) unsigned NOT NULL DEFAULT '1',
+  `spawnMask` bigint(20) unsigned NOT NULL DEFAULT '1',
   `PhaseId` int(10) DEFAULT '0',
   `PhaseGroup` int(10) DEFAULT '0',
   `modelid` mediumint(8) unsigned NOT NULL DEFAULT '0',
@@ -395,6 +463,8 @@ CREATE TABLE `creature` (
   `MovementType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `npcflag` bigint(20) unsigned NOT NULL DEFAULT '0',
   `unit_flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `unit_flags2` int(10) unsigned NOT NULL DEFAULT '0',
+  `unit_flags3` int(10) unsigned NOT NULL DEFAULT '0',
   `dynamicflags` int(10) unsigned NOT NULL DEFAULT '0',
   `ScriptName` char(64) DEFAULT '',
   `VerifiedBuild` smallint(5) DEFAULT '0',
@@ -452,6 +522,20 @@ CREATE TABLE `creature_classlevelstats` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `creature_default_trainer`
+--
+
+DROP TABLE IF EXISTS `creature_default_trainer`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `creature_default_trainer` (
+  `CreatureId` int(11) unsigned NOT NULL,
+  `TrainerId` int(11) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`CreatureId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `creature_equip_template`
 --
 
@@ -641,6 +725,7 @@ CREATE TABLE `creature_template` (
   `name` char(200) NOT NULL DEFAULT '0',
   `femaleName` char(200) NOT NULL,
   `subname` char(200) DEFAULT NULL,
+  `TitleAlt` char(200) DEFAULT NULL,
   `IconName` char(100) DEFAULT NULL,
   `gossip_menu_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `minlevel` smallint(5) NOT NULL DEFAULT '1',
@@ -662,11 +747,10 @@ CREATE TABLE `creature_template` (
   `unit_class` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `unit_flags` int(10) unsigned NOT NULL DEFAULT '0',
   `unit_flags2` int(10) unsigned NOT NULL DEFAULT '0',
+  `unit_flags3` int(10) unsigned NOT NULL DEFAULT '0',
   `dynamicflags` int(10) unsigned NOT NULL DEFAULT '0',
   `family` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `trainer_type` tinyint(4) NOT NULL DEFAULT '0',
   `trainer_class` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `trainer_race` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `type_flags` int(10) unsigned NOT NULL DEFAULT '0',
   `type_flags2` int(10) unsigned NOT NULL DEFAULT '0',
@@ -755,6 +839,23 @@ CREATE TABLE `creature_template_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `creature_template_scaling`
+--
+
+DROP TABLE IF EXISTS `creature_template_scaling`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `creature_template_scaling` (
+  `Entry` mediumint(8) unsigned NOT NULL,
+  `LevelScalingMin` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LevelScalingMax` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LevelScalingDelta` smallint(5) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(5) DEFAULT NULL,
+  PRIMARY KEY (`Entry`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `creature_text`
 --
 
@@ -762,20 +863,37 @@ DROP TABLE IF EXISTS `creature_text`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `creature_text` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `groupid` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `id` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `text` longtext,
-  `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `language` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `probability` float NOT NULL DEFAULT '0',
-  `emote` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `duration` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `sound` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `CreatureID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `GroupID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Text` longtext,
+  `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Language` tinyint(3) NOT NULL DEFAULT '0',
+  `Probability` float unsigned NOT NULL DEFAULT '0',
+  `Emote` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Duration` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Sound` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `BroadcastTextId` mediumint(6) NOT NULL DEFAULT '0',
   `TextRange` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `comment` varchar(255) DEFAULT '',
-  PRIMARY KEY (`entry`,`groupid`,`id`)
+  PRIMARY KEY (`CreatureID`,`GroupID`,`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `creature_text_locale`
+--
+
+DROP TABLE IF EXISTS `creature_text_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `creature_text_locale` (
+  `CreatureID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `GroupID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Locale` varchar(4) NOT NULL,
+  `Text` text,
+  PRIMARY KEY (`CreatureID`,`GroupID`,`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -902,8 +1020,8 @@ DROP TABLE IF EXISTS `game_event`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `game_event` (
   `eventEntry` tinyint(3) unsigned NOT NULL COMMENT 'Entry of the game event',
-  `start_time` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT 'Absolute start date, the event will never start before',
-  `end_time` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT 'Absolute end date, the event will never start afler',
+  `start_time` timestamp NULL DEFAULT NULL COMMENT 'Absolute start date, the event will never start before',
+  `end_time` timestamp NULL DEFAULT NULL COMMENT 'Absolute end date, the event will never start after',
   `occurence` bigint(20) unsigned NOT NULL DEFAULT '5184000' COMMENT 'Delay in minutes between occurences of the event',
   `length` bigint(20) unsigned NOT NULL DEFAULT '2592000' COMMENT 'Length in minutes of the event',
   `holiday` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Client side holiday id',
@@ -1050,6 +1168,9 @@ CREATE TABLE `game_event_npc_vendor` (
   `incrtime` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `ExtendedCost` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `type` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `BonusListIDs` text,
+  `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `IgnoreFiltering` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`,`item`,`ExtendedCost`,`type`),
   KEY `slot` (`slot`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1187,7 +1308,7 @@ CREATE TABLE `gameobject` (
   `map` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Map Identifier',
   `zoneId` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Zone Identifier',
   `areaId` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Area Identifier',
-  `spawnMask` int(10) unsigned NOT NULL DEFAULT '1',
+  `spawnMask` bigint(20) unsigned NOT NULL DEFAULT '1',
   `PhaseId` int(10) DEFAULT '0',
   `PhaseGroup` int(10) DEFAULT '0',
   `position_x` float NOT NULL DEFAULT '0',
@@ -1222,6 +1343,7 @@ CREATE TABLE `gameobject_addon` (
   `parent_rotation3` float NOT NULL DEFAULT '1',
   `invisibilityType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `invisibilityValue` int(10) unsigned NOT NULL DEFAULT '0',
+  `WorldEffectID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1363,6 +1485,7 @@ CREATE TABLE `gameobject_template_addon` (
   `flags` int(10) unsigned NOT NULL DEFAULT '0',
   `mingold` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `maxgold` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `WorldEffectID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`entry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1432,10 +1555,10 @@ DROP TABLE IF EXISTS `gossip_menu`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `gossip_menu` (
-  `entry` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `text_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `MenuId` int(10) unsigned NOT NULL DEFAULT '0',
+  `TextId` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`entry`,`text_id`)
+  PRIMARY KEY (`MenuId`,`TextId`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -1447,21 +1570,81 @@ DROP TABLE IF EXISTS `gossip_menu_option`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `gossip_menu_option` (
-  `menu_id` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `id` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `option_icon` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `option_text` text,
-  `OptionBroadcastTextID` mediumint(6) NOT NULL DEFAULT '0',
-  `option_id` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `npc_option_npcflag` bigint(20) unsigned NOT NULL DEFAULT '0',
-  `action_menu_id` int(10) unsigned NOT NULL DEFAULT '0',
-  `action_poi_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `box_coded` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `box_money` int(10) unsigned NOT NULL DEFAULT '0',
-  `box_text` text,
-  `BoxBroadcastTextID` mediumint(6) NOT NULL DEFAULT '0',
+  `MenuId` int(10) unsigned NOT NULL DEFAULT '0',
+  `OptionIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `OptionIcon` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `OptionText` text,
+  `OptionBroadcastTextId` int(11) unsigned NOT NULL DEFAULT '0',
+  `OptionType` int(11) unsigned NOT NULL DEFAULT '0',
+  `OptionNpcFlag` bigint(20) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`menu_id`,`id`)
+  PRIMARY KEY (`MenuId`,`OptionIndex`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `gossip_menu_option_action`
+--
+
+DROP TABLE IF EXISTS `gossip_menu_option_action`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `gossip_menu_option_action` (
+  `MenuId` int(10) unsigned NOT NULL DEFAULT '0',
+  `OptionIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `ActionMenuId` int(11) unsigned NOT NULL DEFAULT '0',
+  `ActionPoiId` int(11) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`MenuId`,`OptionIndex`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `gossip_menu_option_box`
+--
+
+DROP TABLE IF EXISTS `gossip_menu_option_box`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `gossip_menu_option_box` (
+  `MenuId` int(10) unsigned NOT NULL DEFAULT '0',
+  `OptionIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `BoxCoded` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `BoxMoney` int(11) unsigned NOT NULL DEFAULT '0',
+  `BoxText` text,
+  `BoxBroadcastTextId` int(11) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`MenuId`,`OptionIndex`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `gossip_menu_option_locale`
+--
+
+DROP TABLE IF EXISTS `gossip_menu_option_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `gossip_menu_option_locale` (
+  `MenuId` int(10) unsigned NOT NULL DEFAULT '0',
+  `OptionIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `Locale` varchar(4) NOT NULL,
+  `OptionText` text,
+  `BoxText` text,
+  PRIMARY KEY (`MenuId`,`OptionIndex`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `gossip_menu_option_trainer`
+--
+
+DROP TABLE IF EXISTS `gossip_menu_option_trainer`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `gossip_menu_option_trainer` (
+  `MenuId` int(10) unsigned NOT NULL DEFAULT '0',
+  `OptionIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `TrainerId` int(11) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`MenuId`,`OptionIndex`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -1491,7 +1674,7 @@ DROP TABLE IF EXISTS `guild_rewards`;
 CREATE TABLE `guild_rewards` (
   `ItemID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `MinGuildRep` tinyint(3) unsigned DEFAULT '0',
-  `RaceMask` int(11) DEFAULT '0',
+  `RaceMask` bigint(20) unsigned DEFAULT '0',
   `Cost` bigint(20) unsigned DEFAULT '0',
   PRIMARY KEY (`ItemID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1695,59 +1878,6 @@ CREATE TABLE `locales_achievement_reward` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `locales_creature_text`
---
-
-DROP TABLE IF EXISTS `locales_creature_text`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `locales_creature_text` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `groupid` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `id` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `text_loc1` text,
-  `text_loc2` text,
-  `text_loc3` text,
-  `text_loc4` text,
-  `text_loc5` text,
-  `text_loc6` text,
-  `text_loc7` text,
-  `text_loc8` text,
-  PRIMARY KEY (`entry`,`groupid`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `locales_gossip_menu_option`
---
-
-DROP TABLE IF EXISTS `locales_gossip_menu_option`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `locales_gossip_menu_option` (
-  `menu_id` smallint(6) unsigned NOT NULL DEFAULT '0',
-  `id` smallint(6) unsigned NOT NULL DEFAULT '0',
-  `option_text_loc1` text,
-  `option_text_loc2` text,
-  `option_text_loc3` text,
-  `option_text_loc4` text,
-  `option_text_loc5` text,
-  `option_text_loc6` text,
-  `option_text_loc7` text,
-  `option_text_loc8` text,
-  `box_text_loc1` text,
-  `box_text_loc2` text,
-  `box_text_loc3` text,
-  `box_text_loc4` text,
-  `box_text_loc5` text,
-  `box_text_loc6` text,
-  `box_text_loc7` text,
-  `box_text_loc8` text,
-  PRIMARY KEY (`menu_id`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `mail_level_reward`
 --
 
@@ -1868,25 +1998,6 @@ CREATE TABLE `npc_text` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `npc_trainer`
---
-
-DROP TABLE IF EXISTS `npc_trainer`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `npc_trainer` (
-  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `SpellID` mediumint(8) NOT NULL DEFAULT '0',
-  `MoneyCost` int(10) unsigned NOT NULL DEFAULT '0',
-  `ReqSkillLine` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `ReqSkillRank` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `ReqLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `Index` tinyint(3) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`ID`,`SpellID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `npc_vendor`
 --
 
@@ -1901,6 +2012,7 @@ CREATE TABLE `npc_vendor` (
   `incrtime` int(10) unsigned NOT NULL DEFAULT '0',
   `ExtendedCost` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `type` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `BonusListIDs` text,
   `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
   `IgnoreFiltering` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
@@ -2157,6 +2269,158 @@ CREATE TABLE `player_xp_for_level` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `playerchoice`
+--
+
+DROP TABLE IF EXISTS `playerchoice`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `playerchoice` (
+  `ChoiceId` int(11) NOT NULL,
+  `UiTextureKitId` int(11) NOT NULL DEFAULT '0',
+  `Question` varchar(255) DEFAULT NULL,
+  `HideWarboardHeader` tinyint(1) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `playerchoice_locale`
+--
+
+DROP TABLE IF EXISTS `playerchoice_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `playerchoice_locale` (
+  `ChoiceId` int(11) NOT NULL,
+  `locale` varchar(4) NOT NULL,
+  `Question` varchar(255) DEFAULT NULL,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceId`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `playerchoice_response`
+--
+
+DROP TABLE IF EXISTS `playerchoice_response`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `playerchoice_response` (
+  `ChoiceId` int(11) NOT NULL,
+  `ResponseId` int(11) NOT NULL,
+  `Index` int(10) unsigned NOT NULL,
+  `ChoiceArtFileId` int(11) NOT NULL DEFAULT '0',
+  `Header` varchar(511) NOT NULL,
+  `Answer` varchar(511) NOT NULL,
+  `Description` varchar(2047) NOT NULL,
+  `Confirmation` varchar(127) NOT NULL,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceId`,`ResponseId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `playerchoice_response_locale`
+--
+
+DROP TABLE IF EXISTS `playerchoice_response_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `playerchoice_response_locale` (
+  `ChoiceId` int(11) NOT NULL,
+  `ResponseId` int(11) NOT NULL,
+  `locale` varchar(4) NOT NULL,
+  `Header` varchar(511) NOT NULL DEFAULT '',
+  `Answer` varchar(511) NOT NULL DEFAULT '',
+  `Description` varchar(2047) NOT NULL DEFAULT '',
+  `Confirmation` varchar(127) NOT NULL DEFAULT '',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceId`,`ResponseId`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `playerchoice_response_reward`
+--
+
+DROP TABLE IF EXISTS `playerchoice_response_reward`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `playerchoice_response_reward` (
+  `ChoiceId` int(11) NOT NULL,
+  `ResponseId` int(11) NOT NULL,
+  `TitleId` int(11) NOT NULL DEFAULT '0',
+  `PackageId` int(11) NOT NULL DEFAULT '0',
+  `SkillLineId` int(10) unsigned NOT NULL DEFAULT '0',
+  `SkillPointCount` int(10) unsigned NOT NULL DEFAULT '0',
+  `ArenaPointCount` int(10) unsigned NOT NULL DEFAULT '0',
+  `HonorPointCount` int(10) unsigned NOT NULL DEFAULT '0',
+  `Money` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `Xp` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceId`,`ResponseId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `playerchoice_response_reward_currency`
+--
+
+DROP TABLE IF EXISTS `playerchoice_response_reward_currency`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `playerchoice_response_reward_currency` (
+  `ChoiceId` int(11) NOT NULL,
+  `ResponseId` int(11) NOT NULL,
+  `Index` int(10) unsigned NOT NULL,
+  `CurrencyId` int(10) unsigned NOT NULL DEFAULT '0',
+  `Quantity` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceId`,`ResponseId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `playerchoice_response_reward_faction`
+--
+
+DROP TABLE IF EXISTS `playerchoice_response_reward_faction`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `playerchoice_response_reward_faction` (
+  `ChoiceId` int(11) NOT NULL,
+  `ResponseId` int(11) NOT NULL,
+  `Index` int(10) unsigned NOT NULL,
+  `FactionId` int(10) unsigned NOT NULL DEFAULT '0',
+  `Quantity` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceId`,`ResponseId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `playerchoice_response_reward_item`
+--
+
+DROP TABLE IF EXISTS `playerchoice_response_reward_item`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `playerchoice_response_reward_item` (
+  `ChoiceId` int(11) NOT NULL,
+  `ResponseId` int(11) NOT NULL,
+  `Index` int(10) unsigned NOT NULL,
+  `ItemId` int(10) unsigned NOT NULL DEFAULT '0',
+  `BonusListIDs` text,
+  `Quantity` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceId`,`ResponseId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `playercreateinfo`
 --
 
@@ -2447,6 +2711,7 @@ CREATE TABLE `quest_objectives` (
   `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `QuestID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Order` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `StorageIndex` tinyint(3) NOT NULL DEFAULT '0',
   `ObjectID` int(10) NOT NULL DEFAULT '0',
   `Amount` int(10) NOT NULL DEFAULT '0',
@@ -2538,6 +2803,7 @@ CREATE TABLE `quest_poi` (
   `WorldEffectID` int(11) NOT NULL DEFAULT '0',
   `PlayerConditionID` int(11) NOT NULL DEFAULT '0',
   `WoDUnk1` int(11) NOT NULL DEFAULT '0',
+  `AlwaysAllowMergingBlobs` tinyint(1) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
   PRIMARY KEY (`QuestID`,`BlobIndex`,`Idx1`),
   KEY `idx` (`QuestID`,`BlobIndex`)
@@ -2609,6 +2875,7 @@ CREATE TABLE `quest_template` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `QuestType` tinyint(3) unsigned NOT NULL DEFAULT '2',
   `QuestLevel` int(11) NOT NULL DEFAULT '-1',
+  `MaxScalingLevel` int(11) NOT NULL DEFAULT '255',
   `QuestPackageID` int(10) unsigned NOT NULL DEFAULT '0',
   `MinLevel` int(11) NOT NULL DEFAULT '0',
   `QuestSortID` smallint(6) NOT NULL DEFAULT '0',
@@ -2710,7 +2977,7 @@ CREATE TABLE `quest_template` (
   `CompleteSoundKitID` int(10) unsigned NOT NULL DEFAULT '0',
   `AreaGroupID` int(10) unsigned NOT NULL DEFAULT '0',
   `TimeAllowed` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllowableRaces` int(11) NOT NULL DEFAULT '-1',
+  `AllowableRaces` bigint(20) unsigned DEFAULT '0',
   `QuestRewardID` int(10) unsigned NOT NULL DEFAULT '0',
   `Expansion` int(11) NOT NULL DEFAULT '0',
   `LogTitle` text,
@@ -2752,6 +3019,7 @@ CREATE TABLE `quest_template_addon` (
   `RequiredMaxRepValue` mediumint(8) NOT NULL DEFAULT '0',
   `ProvidedItemCount` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SpecialFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ScriptName` varchar(64) NOT NULL DEFAULT '',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2797,15 +3065,16 @@ CREATE TABLE `quest_visual_effect` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `race_expansion_requirement`
+-- Table structure for table `race_unlock_requirement`
 --
 
-DROP TABLE IF EXISTS `race_expansion_requirement`;
+DROP TABLE IF EXISTS `race_unlock_requirement`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `race_expansion_requirement` (
+CREATE TABLE `race_unlock_requirement` (
   `raceID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `expansion` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `achievementId` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`raceID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3179,7 +3448,7 @@ CREATE TABLE `spell_area` (
   `aura_spell` mediumint(8) NOT NULL DEFAULT '0',
   `racemask` int(10) unsigned NOT NULL DEFAULT '0',
   `gender` tinyint(3) unsigned NOT NULL DEFAULT '2',
-  `autocast` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `flags` tinyint(3) unsigned NOT NULL DEFAULT '3',
   `quest_start_status` int(11) NOT NULL DEFAULT '64',
   `quest_end_status` int(11) NOT NULL DEFAULT '11',
   PRIMARY KEY (`spell`,`area`,`quest_start`,`aura_spell`,`racemask`,`gender`)
@@ -3419,30 +3688,6 @@ CREATE TABLE `spell_proc` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `spell_proc_event`
---
-
-DROP TABLE IF EXISTS `spell_proc_event`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `spell_proc_event` (
-  `entry` mediumint(8) NOT NULL DEFAULT '0',
-  `SchoolMask` tinyint(4) NOT NULL DEFAULT '0',
-  `SpellFamilyName` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `SpellFamilyMask0` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellFamilyMask1` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellFamilyMask2` int(10) unsigned NOT NULL DEFAULT '0',
-  `spellFamilyMask3` int(10) unsigned NOT NULL DEFAULT '0',
-  `procFlags` int(10) unsigned NOT NULL DEFAULT '0',
-  `procEx` int(10) unsigned NOT NULL DEFAULT '0',
-  `ppmRate` float NOT NULL DEFAULT '0',
-  `CustomChance` float NOT NULL DEFAULT '0',
-  `Cooldown` int(10) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`entry`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `spell_required`
 --
 
@@ -3610,6 +3855,60 @@ CREATE TABLE `terrain_worldmap` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `trainer`
+--
+
+DROP TABLE IF EXISTS `trainer`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `trainer` (
+  `Id` int(10) unsigned NOT NULL DEFAULT '0',
+  `Type` tinyint(2) unsigned NOT NULL DEFAULT '2',
+  `Greeting` text,
+  `VerifiedBuild` smallint(5) DEFAULT '0',
+  PRIMARY KEY (`Id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `trainer_locale`
+--
+
+DROP TABLE IF EXISTS `trainer_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `trainer_locale` (
+  `Id` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Greeting_lang` text,
+  `VerifiedBuild` smallint(5) DEFAULT '0',
+  PRIMARY KEY (`Id`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `trainer_spell`
+--
+
+DROP TABLE IF EXISTS `trainer_spell`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `trainer_spell` (
+  `TrainerId` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellId` int(10) unsigned NOT NULL DEFAULT '0',
+  `MoneyCost` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReqSkillLine` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReqSkillRank` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReqAbility1` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReqAbility2` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReqAbility3` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReqLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(5) DEFAULT '0',
+  PRIMARY KEY (`TrainerId`,`SpellId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `transports`
 --
 
@@ -3720,17 +4019,18 @@ CREATE TABLE `vehicle_template_accessory` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Temporary table structure for view `version`
+-- Table structure for table `version`
 --
 
 DROP TABLE IF EXISTS `version`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `version` (
-  `core_version` varchar(120) NOT NULL DEFAULT '' COMMENT 'Core revision dumped at startup.',
+  `core_version` varchar(255) NOT NULL DEFAULT '' COMMENT 'Core revision dumped at startup.',
   `core_revision` varchar(120) DEFAULT NULL,
   `db_version` varchar(120) DEFAULT NULL COMMENT 'Version of world DB.',
   `cache_id` int(11) DEFAULT '0',
+  `hotfix_cache_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`core_version`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Version Notes';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3828,4 +4128,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2017-04-19  0:03:47
+-- Dump completed on 2018-02-19 22:43:12
diff --git a/sql/updates/auth/master/2017_04_19_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_04_19_00_auth.sql
index cc9e3b957a9..cc9e3b957a9 100644
--- a/sql/updates/auth/master/2017_04_19_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_04_19_00_auth.sql
diff --git a/sql/updates/auth/master/2017_04_22_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_04_22_00_auth.sql
index ef99165e22c..ef99165e22c 100644
--- a/sql/updates/auth/master/2017_04_22_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_04_22_00_auth.sql
diff --git a/sql/updates/auth/master/2017_04_27_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_04_27_00_auth.sql
index 583a282abdf..583a282abdf 100644
--- a/sql/updates/auth/master/2017_04_27_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_04_27_00_auth.sql
diff --git a/sql/updates/auth/master/2017_05_14_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_05_14_00_auth.sql
index 792ba10bc06..792ba10bc06 100644
--- a/sql/updates/auth/master/2017_05_14_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_05_14_00_auth.sql
diff --git a/sql/updates/auth/master/2017_06_15_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_06_15_00_auth.sql
index 6adc6f59653..6adc6f59653 100644
--- a/sql/updates/auth/master/2017_06_15_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_06_15_00_auth.sql
diff --git a/sql/updates/auth/master/2017_06_18_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_06_18_00_auth.sql
index 08a8926053f..08a8926053f 100644
--- a/sql/updates/auth/master/2017_06_18_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_06_18_00_auth.sql
diff --git a/sql/updates/auth/master/2017_06_25_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_06_25_00_auth.sql
index 8df778b89a4..8df778b89a4 100644
--- a/sql/updates/auth/master/2017_06_25_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_06_25_00_auth.sql
diff --git a/sql/updates/auth/master/2017_06_28_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_06_28_00_auth.sql
index 9924b951cb1..9924b951cb1 100644
--- a/sql/updates/auth/master/2017_06_28_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_06_28_00_auth.sql
diff --git a/sql/updates/auth/master/2017_06_30_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_06_30_00_auth.sql
index 30ba5433ec7..30ba5433ec7 100644
--- a/sql/updates/auth/master/2017_06_30_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_06_30_00_auth.sql
diff --git a/sql/updates/auth/master/2017_08_04_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_08_04_00_auth.sql
index 90e1647b6e1..90e1647b6e1 100644
--- a/sql/updates/auth/master/2017_08_04_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_08_04_00_auth.sql
diff --git a/sql/updates/auth/master/2017_08_13_00_auth_2016_09_22_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_08_13_00_auth_2016_09_22_00_auth.sql
index 324bd800ad2..324bd800ad2 100644
--- a/sql/updates/auth/master/2017_08_13_00_auth_2016_09_22_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_08_13_00_auth_2016_09_22_00_auth.sql
diff --git a/sql/updates/auth/master/2017_09_22_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_09_22_00_auth.sql
index 1b2fe2850a3..1b2fe2850a3 100644
--- a/sql/updates/auth/master/2017_09_22_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_09_22_00_auth.sql
diff --git a/sql/updates/auth/master/2017_11_11_01_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_11_11_01_auth.sql
index e046cca6bdc..e046cca6bdc 100644
--- a/sql/updates/auth/master/2017_11_11_01_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_11_11_01_auth.sql
diff --git a/sql/updates/auth/master/2017_12_30_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_12_30_00_auth.sql
index 5939777034f..5939777034f 100644
--- a/sql/updates/auth/master/2017_12_30_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_12_30_00_auth.sql
diff --git a/sql/updates/auth/master/2017_12_30_01_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_12_30_01_auth.sql
index b1c9a297968..b1c9a297968 100644
--- a/sql/updates/auth/master/2017_12_30_01_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_12_30_01_auth.sql
diff --git a/sql/updates/auth/master/2017_12_31_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_12_31_00_auth.sql
index 7348c426b5f..7348c426b5f 100644
--- a/sql/updates/auth/master/2017_12_31_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_12_31_00_auth.sql
diff --git a/sql/updates/auth/master/2018_01_02_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2018_01_02_00_auth.sql
index 891380c76be..891380c76be 100644
--- a/sql/updates/auth/master/2018_01_02_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2018_01_02_00_auth.sql
diff --git a/sql/updates/auth/master/2018_02_18_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2018_02_18_00_auth.sql
index 4e3f05cc5af..4e3f05cc5af 100644
--- a/sql/updates/auth/master/2018_02_18_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2018_02_18_00_auth.sql
diff --git a/sql/updates/characters/master/2017_04_19_00_characters.sql b/sql/old/7/characters/01_2018_02_19/2017_04_19_00_characters.sql
index cedbe3833eb..cedbe3833eb 100644
--- a/sql/updates/characters/master/2017_04_19_00_characters.sql
+++ b/sql/old/7/characters/01_2018_02_19/2017_04_19_00_characters.sql
diff --git a/sql/updates/characters/master/2017_05_08_00_characters.sql b/sql/old/7/characters/01_2018_02_19/2017_05_08_00_characters.sql
index 819912fa362..819912fa362 100644
--- a/sql/updates/characters/master/2017_05_08_00_characters.sql
+++ b/sql/old/7/characters/01_2018_02_19/2017_05_08_00_characters.sql
diff --git a/sql/updates/characters/master/2017_05_14_00_characters.sql b/sql/old/7/characters/01_2018_02_19/2017_05_14_00_characters.sql
index e830ca24744..e830ca24744 100644
--- a/sql/updates/characters/master/2017_05_14_00_characters.sql
+++ b/sql/old/7/characters/01_2018_02_19/2017_05_14_00_characters.sql
diff --git a/sql/updates/characters/master/2017_05_24_00_characters.sql b/sql/old/7/characters/01_2018_02_19/2017_05_24_00_characters.sql
index e0558ed2c33..e0558ed2c33 100644
--- a/sql/updates/characters/master/2017_05_24_00_characters.sql
+++ b/sql/old/7/characters/01_2018_02_19/2017_05_24_00_characters.sql
diff --git a/sql/updates/characters/master/2017_06_04_00_characters.sql b/sql/old/7/characters/01_2018_02_19/2017_06_04_00_characters.sql
index 30f85396e24..30f85396e24 100644
--- a/sql/updates/characters/master/2017_06_04_00_characters.sql
+++ b/sql/old/7/characters/01_2018_02_19/2017_06_04_00_characters.sql
diff --git a/sql/updates/characters/master/2017_08_20_00_characters.sql b/sql/old/7/characters/01_2018_02_19/2017_08_20_00_characters.sql
index f4d354081bf..f4d354081bf 100644
--- a/sql/updates/characters/master/2017_08_20_00_characters.sql
+++ b/sql/old/7/characters/01_2018_02_19/2017_08_20_00_characters.sql
diff --git a/sql/updates/characters/master/2017_08_20_01_characters.sql b/sql/old/7/characters/01_2018_02_19/2017_08_20_01_characters.sql
index 3f37d8a9407..3f37d8a9407 100644
--- a/sql/updates/characters/master/2017_08_20_01_characters.sql
+++ b/sql/old/7/characters/01_2018_02_19/2017_08_20_01_characters.sql
diff --git a/sql/updates/characters/master/2017_10_29_00_characters.sql b/sql/old/7/characters/01_2018_02_19/2017_10_29_00_characters.sql
index 1c991f135de..1c991f135de 100644
--- a/sql/updates/characters/master/2017_10_29_00_characters.sql
+++ b/sql/old/7/characters/01_2018_02_19/2017_10_29_00_characters.sql
diff --git a/sql/updates/characters/master/2018_02_03_00_characters.sql b/sql/old/7/characters/01_2018_02_19/2018_02_03_00_characters.sql
index 846a5978394..846a5978394 100644
--- a/sql/updates/characters/master/2018_02_03_00_characters.sql
+++ b/sql/old/7/characters/01_2018_02_19/2018_02_03_00_characters.sql
diff --git a/sql/updates/characters/master/2018_02_08_00_characters.sql b/sql/old/7/characters/01_2018_02_19/2018_02_08_00_characters.sql
index 5e8f8dbac02..5e8f8dbac02 100644
--- a/sql/updates/characters/master/2018_02_08_00_characters.sql
+++ b/sql/old/7/characters/01_2018_02_19/2018_02_08_00_characters.sql
diff --git a/sql/updates/hotfixes/master/2017_04_19_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2017_04_19_00_hotfixes.sql
index 2fce5d4bae0..2fce5d4bae0 100644
--- a/sql/updates/hotfixes/master/2017_04_19_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2017_04_19_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_04_19_01_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2017_04_19_01_hotfixes.sql
index 373a04d0ba4..373a04d0ba4 100644
--- a/sql/updates/hotfixes/master/2017_04_19_01_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2017_04_19_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_05_07_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2017_05_07_00_hotfixes.sql
index 2c9459f3fdd..2c9459f3fdd 100644
--- a/sql/updates/hotfixes/master/2017_05_07_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2017_05_07_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_05_14_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2017_05_14_00_hotfixes.sql
index 03cd2e19698..03cd2e19698 100644
--- a/sql/updates/hotfixes/master/2017_05_14_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2017_05_14_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_06_04_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2017_06_04_00_hotfixes.sql
index 2a8e08c01b4..2a8e08c01b4 100644
--- a/sql/updates/hotfixes/master/2017_06_04_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2017_06_04_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_06_14_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2017_06_14_00_hotfixes.sql
index f8b4215390a..f8b4215390a 100644
--- a/sql/updates/hotfixes/master/2017_06_14_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2017_06_14_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_07_02_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2017_07_02_00_hotfixes.sql
index 2357acdd325..2357acdd325 100644
--- a/sql/updates/hotfixes/master/2017_07_02_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2017_07_02_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_07_04_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2017_07_04_00_hotfixes.sql
index c388d49adda..c388d49adda 100644
--- a/sql/updates/hotfixes/master/2017_07_04_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2017_07_04_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_07_27_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2017_07_27_00_hotfixes.sql
index cf0c7b13e92..cf0c7b13e92 100644
--- a/sql/updates/hotfixes/master/2017_07_27_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2017_07_27_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_08_23_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2017_08_23_00_hotfixes.sql
index ee74fde154f..ee74fde154f 100644
--- a/sql/updates/hotfixes/master/2017_08_23_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2017_08_23_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_08_24_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2017_08_24_00_hotfixes.sql
index d98ef18bd12..d98ef18bd12 100644
--- a/sql/updates/hotfixes/master/2017_08_24_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2017_08_24_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_09_15_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2017_09_15_00_hotfixes.sql
index c3ad0b8de7f..c3ad0b8de7f 100644
--- a/sql/updates/hotfixes/master/2017_09_15_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2017_09_15_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_11_05_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2017_11_05_00_hotfixes.sql
index 6654e5d42dd..6654e5d42dd 100644
--- a/sql/updates/hotfixes/master/2017_11_05_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2017_11_05_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_11_18_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2017_11_18_00_hotfixes.sql
index 334892a0d2a..334892a0d2a 100644
--- a/sql/updates/hotfixes/master/2017_11_18_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2017_11_18_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2018_01_01_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2018_01_01_00_hotfixes.sql
index be822996dd7..be822996dd7 100644
--- a/sql/updates/hotfixes/master/2018_01_01_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2018_01_01_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2018_01_04_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2018_01_04_00_hotfixes.sql
index b6840bf9c27..b6840bf9c27 100644
--- a/sql/updates/hotfixes/master/2018_01_04_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2018_01_04_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2018_01_04_01_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2018_01_04_01_hotfixes.sql
index d7ec6681f09..d7ec6681f09 100644
--- a/sql/updates/hotfixes/master/2018_01_04_01_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2018_01_04_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2018_01_04_02_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2018_01_04_02_hotfixes.sql
index 6c99c41abd1..6c99c41abd1 100644
--- a/sql/updates/hotfixes/master/2018_01_04_02_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2018_01_04_02_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2018_01_05_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2018_01_05_00_hotfixes.sql
index e3774786229..e3774786229 100644
--- a/sql/updates/hotfixes/master/2018_01_05_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2018_01_05_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2018_01_05_01_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2018_01_05_01_hotfixes.sql
index 2dfb3b9d379..2dfb3b9d379 100644
--- a/sql/updates/hotfixes/master/2018_01_05_01_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2018_01_05_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2018_01_05_02_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2018_01_05_02_hotfixes.sql
index 0de6e32db45..0de6e32db45 100644
--- a/sql/updates/hotfixes/master/2018_01_05_02_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2018_01_05_02_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2018_01_05_03_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2018_01_05_03_hotfixes.sql
index 8a980d2ce4c..8a980d2ce4c 100644
--- a/sql/updates/hotfixes/master/2018_01_05_03_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2018_01_05_03_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2018_01_05_04_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2018_01_05_04_hotfixes.sql
index ef4fce8436f..ef4fce8436f 100644
--- a/sql/updates/hotfixes/master/2018_01_05_04_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2018_01_05_04_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2018_01_05_05_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2018_01_05_05_hotfixes.sql
index d43d0754674..d43d0754674 100644
--- a/sql/updates/hotfixes/master/2018_01_05_05_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2018_01_05_05_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2018_01_05_06_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2018_01_05_06_hotfixes.sql
index a44ddd58535..a44ddd58535 100644
--- a/sql/updates/hotfixes/master/2018_01_05_06_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2018_01_05_06_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2018_02_18_00_hotfixes.sql b/sql/old/7/hotfixes/01_2018_02_19/2018_02_18_00_hotfixes.sql
index a3c8eadfdd1..a3c8eadfdd1 100644
--- a/sql/updates/hotfixes/master/2018_02_18_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/01_2018_02_19/2018_02_18_00_hotfixes.sql
diff --git a/sql/updates/world/master/2017_04_19_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_04_19_00_world.sql
index 8765f060277..8765f060277 100644
--- a/sql/updates/world/master/2017_04_19_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_04_19_00_world.sql
diff --git a/sql/updates/world/master/2017_04_19_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_04_19_01_world.sql
index 7aeddee48a9..7aeddee48a9 100644
--- a/sql/updates/world/master/2017_04_19_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_04_19_01_world.sql
diff --git a/sql/updates/world/master/2017_04_19_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_04_19_02_world.sql
index 5d937a394ab..5d937a394ab 100644
--- a/sql/updates/world/master/2017_04_19_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_04_19_02_world.sql
diff --git a/sql/updates/world/master/2017_04_20_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_04_20_00_world.sql
index 97d64909194..97d64909194 100644
--- a/sql/updates/world/master/2017_04_20_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_04_20_00_world.sql
diff --git a/sql/updates/world/master/2017_04_21_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_04_21_00_world.sql
index 6e22e89e4f2..6e22e89e4f2 100644
--- a/sql/updates/world/master/2017_04_21_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_04_21_00_world.sql
diff --git a/sql/updates/world/master/2017_04_22_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_04_22_00_world.sql
index 73e8676dab6..73e8676dab6 100644
--- a/sql/updates/world/master/2017_04_22_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_04_22_00_world.sql
diff --git a/sql/updates/world/master/2017_04_23_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_04_23_00_world.sql
index 6927e50fce2..6927e50fce2 100644
--- a/sql/updates/world/master/2017_04_23_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_04_23_00_world.sql
diff --git a/sql/updates/world/master/2017_04_23_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_04_23_01_world.sql
index 7beaa96c6de..7beaa96c6de 100644
--- a/sql/updates/world/master/2017_04_23_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_04_23_01_world.sql
diff --git a/sql/updates/world/master/2017_04_24_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_04_24_00_world.sql
index 8d7ade3cd0c..8d7ade3cd0c 100644
--- a/sql/updates/world/master/2017_04_24_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_04_24_00_world.sql
diff --git a/sql/updates/world/master/2017_04_24_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_04_24_01_world.sql
index 991196af75f..991196af75f 100644
--- a/sql/updates/world/master/2017_04_24_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_04_24_01_world.sql
diff --git a/sql/updates/world/master/2017_04_25_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_04_25_00_world.sql
index fad69116d78..fad69116d78 100644
--- a/sql/updates/world/master/2017_04_25_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_04_25_00_world.sql
diff --git a/sql/updates/world/master/2017_04_27_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_04_27_00_world.sql
index 7b72f6cf789..7b72f6cf789 100644
--- a/sql/updates/world/master/2017_04_27_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_04_27_00_world.sql
diff --git a/sql/updates/world/master/2017_04_28_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_04_28_00_world.sql
index 4c658e82203..4c658e82203 100644
--- a/sql/updates/world/master/2017_04_28_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_04_28_00_world.sql
diff --git a/sql/updates/world/master/2017_04_29_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_04_29_00_world.sql
index 89375dfd68b..89375dfd68b 100644
--- a/sql/updates/world/master/2017_04_29_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_04_29_00_world.sql
diff --git a/sql/updates/world/master/2017_04_29_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_04_29_01_world.sql
index 17b0f6e2327..17b0f6e2327 100644
--- a/sql/updates/world/master/2017_04_29_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_04_29_01_world.sql
diff --git a/sql/updates/world/master/2017_04_30_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_04_30_00_world.sql
index 9dc253a06a2..9dc253a06a2 100644
--- a/sql/updates/world/master/2017_04_30_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_04_30_00_world.sql
diff --git a/sql/updates/world/master/2017_04_30_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_04_30_01_world.sql
index dd937e978f4..dd937e978f4 100644
--- a/sql/updates/world/master/2017_04_30_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_04_30_01_world.sql
diff --git a/sql/updates/world/master/2017_05_01_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_01_00_world.sql
index 2d71fae6a58..2d71fae6a58 100644
--- a/sql/updates/world/master/2017_05_01_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_01_00_world.sql
diff --git a/sql/updates/world/master/2017_05_02_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_02_00_world.sql
index 42f67eed907..42f67eed907 100644
--- a/sql/updates/world/master/2017_05_02_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_02_00_world.sql
diff --git a/sql/updates/world/master/2017_05_04_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_04_00_world.sql
index b5aad2daa30..b5aad2daa30 100644
--- a/sql/updates/world/master/2017_05_04_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_04_00_world.sql
diff --git a/sql/updates/world/master/2017_05_06_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_06_00_world.sql
index e0b05b3861e..e0b05b3861e 100644
--- a/sql/updates/world/master/2017_05_06_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_06_00_world.sql
diff --git a/sql/updates/world/master/2017_05_08_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_08_00_world.sql
index a2244c70d19..a2244c70d19 100644
--- a/sql/updates/world/master/2017_05_08_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_08_00_world.sql
diff --git a/sql/updates/world/master/2017_05_09_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_09_00_world.sql
index bf0b9483f85..bf0b9483f85 100644
--- a/sql/updates/world/master/2017_05_09_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_09_00_world.sql
diff --git a/sql/updates/world/master/2017_05_10_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_10_00_world.sql
index d3b7e609ef9..d3b7e609ef9 100644
--- a/sql/updates/world/master/2017_05_10_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_10_00_world.sql
diff --git a/sql/updates/world/master/2017_05_10_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_10_01_world.sql
index 4af8089ee49..4af8089ee49 100644
--- a/sql/updates/world/master/2017_05_10_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_10_01_world.sql
diff --git a/sql/updates/world/master/2017_05_10_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_10_02_world.sql
index 7a98b66b31b..7a98b66b31b 100644
--- a/sql/updates/world/master/2017_05_10_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_10_02_world.sql
diff --git a/sql/updates/world/master/2017_05_10_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_10_03_world.sql
index e4f029289dd..e4f029289dd 100644
--- a/sql/updates/world/master/2017_05_10_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_10_03_world.sql
diff --git a/sql/updates/world/master/2017_05_10_04_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_10_04_world.sql
index 48ce58ecc81..48ce58ecc81 100644
--- a/sql/updates/world/master/2017_05_10_04_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_10_04_world.sql
diff --git a/sql/updates/world/master/2017_05_10_05_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_10_05_world.sql
index ac79dde0b89..ac79dde0b89 100644
--- a/sql/updates/world/master/2017_05_10_05_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_10_05_world.sql
diff --git a/sql/updates/world/master/2017_05_10_06_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_10_06_world.sql
index 97b6263eabe..97b6263eabe 100644
--- a/sql/updates/world/master/2017_05_10_06_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_10_06_world.sql
diff --git a/sql/updates/world/master/2017_05_10_07_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_10_07_world.sql
index 535d3ec8133..535d3ec8133 100644
--- a/sql/updates/world/master/2017_05_10_07_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_10_07_world.sql
diff --git a/sql/updates/world/master/2017_05_11_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_11_00_world.sql
index 04bb3d22ada..04bb3d22ada 100644
--- a/sql/updates/world/master/2017_05_11_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_11_00_world.sql
diff --git a/sql/updates/world/master/2017_05_11_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_11_01_world.sql
index aa856634d66..aa856634d66 100644
--- a/sql/updates/world/master/2017_05_11_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_11_01_world.sql
diff --git a/sql/updates/world/master/2017_05_11_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_11_02_world.sql
index 48276636b8d..48276636b8d 100644
--- a/sql/updates/world/master/2017_05_11_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_11_02_world.sql
diff --git a/sql/updates/world/master/2017_05_11_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_11_03_world.sql
index b0203bfc1b6..b0203bfc1b6 100644
--- a/sql/updates/world/master/2017_05_11_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_11_03_world.sql
diff --git a/sql/updates/world/master/2017_05_12_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_12_00_world.sql
index ac0ceb19a70..ac0ceb19a70 100644
--- a/sql/updates/world/master/2017_05_12_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_12_00_world.sql
diff --git a/sql/updates/world/master/2017_05_14_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_14_00_world.sql
index ab6a44301cd..ab6a44301cd 100644
--- a/sql/updates/world/master/2017_05_14_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_14_00_world.sql
diff --git a/sql/updates/world/master/2017_05_14_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_14_01_world.sql
index b8f19333d39..b8f19333d39 100644
--- a/sql/updates/world/master/2017_05_14_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_14_01_world.sql
diff --git a/sql/updates/world/master/2017_05_14_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_14_02_world.sql
index fdb6d07d398..fdb6d07d398 100644
--- a/sql/updates/world/master/2017_05_14_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_14_02_world.sql
diff --git a/sql/updates/world/master/2017_05_14_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_14_03_world.sql
index 0904f79fdce..0904f79fdce 100644
--- a/sql/updates/world/master/2017_05_14_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_14_03_world.sql
diff --git a/sql/updates/world/master/2017_05_15_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_15_00_world.sql
index 6decd2dc04c..6decd2dc04c 100644
--- a/sql/updates/world/master/2017_05_15_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_15_00_world.sql
diff --git a/sql/updates/world/master/2017_05_15_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_15_01_world.sql
index 7857b9563bb..7857b9563bb 100644
--- a/sql/updates/world/master/2017_05_15_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_15_01_world.sql
diff --git a/sql/updates/world/master/2017_05_21_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_21_00_world.sql
index 8fffbb5d8c6..8fffbb5d8c6 100644
--- a/sql/updates/world/master/2017_05_21_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_21_00_world.sql
diff --git a/sql/updates/world/master/2017_05_21_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_21_01_world.sql
index 9da8535feb5..9da8535feb5 100644
--- a/sql/updates/world/master/2017_05_21_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_21_01_world.sql
diff --git a/sql/updates/world/master/2017_05_22_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_22_00_world.sql
index 89255e216df..89255e216df 100644
--- a/sql/updates/world/master/2017_05_22_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_22_00_world.sql
diff --git a/sql/updates/world/master/2017_05_22_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_22_01_world.sql
index 2f43ff3905a..2f43ff3905a 100644
--- a/sql/updates/world/master/2017_05_22_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_22_01_world.sql
diff --git a/sql/updates/world/master/2017_05_22_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_22_02_world.sql
index 6340e6ee85a..6340e6ee85a 100644
--- a/sql/updates/world/master/2017_05_22_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_22_02_world.sql
diff --git a/sql/updates/world/master/2017_05_22_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_22_03_world.sql
index 895a91cf852..895a91cf852 100644
--- a/sql/updates/world/master/2017_05_22_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_22_03_world.sql
diff --git a/sql/updates/world/master/2017_05_22_04_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_22_04_world.sql
index b42bca433a0..b42bca433a0 100644
--- a/sql/updates/world/master/2017_05_22_04_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_22_04_world.sql
diff --git a/sql/updates/world/master/2017_05_23_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_23_00_world.sql
index f3c7d1b3d10..f3c7d1b3d10 100644
--- a/sql/updates/world/master/2017_05_23_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_23_00_world.sql
diff --git a/sql/updates/world/master/2017_05_23_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_23_01_world.sql
index c7c3b1bc8a7..c7c3b1bc8a7 100644
--- a/sql/updates/world/master/2017_05_23_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_23_01_world.sql
diff --git a/sql/updates/world/master/2017_05_23_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_23_02_world.sql
index 94eb69aef0a..94eb69aef0a 100644
--- a/sql/updates/world/master/2017_05_23_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_23_02_world.sql
diff --git a/sql/updates/world/master/2017_05_23_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_23_03_world.sql
index 1026b22ee07..1026b22ee07 100644
--- a/sql/updates/world/master/2017_05_23_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_23_03_world.sql
diff --git a/sql/updates/world/master/2017_05_23_04_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_23_04_world.sql
index 6fa40601ca6..6fa40601ca6 100644
--- a/sql/updates/world/master/2017_05_23_04_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_23_04_world.sql
diff --git a/sql/updates/world/master/2017_05_23_05_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_23_05_world.sql
index aefb2165974..aefb2165974 100644
--- a/sql/updates/world/master/2017_05_23_05_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_23_05_world.sql
diff --git a/sql/updates/world/master/2017_05_23_06_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_23_06_world.sql
index e7a6977f900..e7a6977f900 100644
--- a/sql/updates/world/master/2017_05_23_06_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_23_06_world.sql
diff --git a/sql/updates/world/master/2017_05_23_07_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_23_07_world.sql
index 3cdb1928f86..3cdb1928f86 100644
--- a/sql/updates/world/master/2017_05_23_07_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_23_07_world.sql
diff --git a/sql/updates/world/master/2017_05_23_08_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_23_08_world.sql
index da177c2fc85..da177c2fc85 100644
--- a/sql/updates/world/master/2017_05_23_08_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_23_08_world.sql
diff --git a/sql/updates/world/master/2017_05_24_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_24_00_world.sql
index 1dbe3ba3432..1dbe3ba3432 100644
--- a/sql/updates/world/master/2017_05_24_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_24_00_world.sql
diff --git a/sql/updates/world/master/2017_05_24_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_24_01_world.sql
index 117b2842571..117b2842571 100644
--- a/sql/updates/world/master/2017_05_24_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_24_01_world.sql
diff --git a/sql/updates/world/master/2017_05_24_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_24_02_world.sql
index 9904728dbb4..9904728dbb4 100644
--- a/sql/updates/world/master/2017_05_24_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_24_02_world.sql
diff --git a/sql/updates/world/master/2017_05_24_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_24_03_world.sql
index 9e4912d13ba..9e4912d13ba 100644
--- a/sql/updates/world/master/2017_05_24_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_24_03_world.sql
diff --git a/sql/updates/world/master/2017_05_24_04_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_24_04_world.sql
index ac71183f843..ac71183f843 100644
--- a/sql/updates/world/master/2017_05_24_04_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_24_04_world.sql
diff --git a/sql/updates/world/master/2017_05_24_05_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_24_05_world.sql
index 7429740ff33..7429740ff33 100644
--- a/sql/updates/world/master/2017_05_24_05_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_24_05_world.sql
diff --git a/sql/updates/world/master/2017_05_24_06_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_24_06_world.sql
index c1a46ebc09e..c1a46ebc09e 100644
--- a/sql/updates/world/master/2017_05_24_06_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_24_06_world.sql
diff --git a/sql/updates/world/master/2017_05_25_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_25_00_world.sql
index 48e15c51588..48e15c51588 100644
--- a/sql/updates/world/master/2017_05_25_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_25_00_world.sql
diff --git a/sql/updates/world/master/2017_05_25_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_25_01_world.sql
index b2b1aefcd50..b2b1aefcd50 100644
--- a/sql/updates/world/master/2017_05_25_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_25_01_world.sql
diff --git a/sql/updates/world/master/2017_05_25_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_25_02_world.sql
index de44fb4cffa..de44fb4cffa 100644
--- a/sql/updates/world/master/2017_05_25_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_25_02_world.sql
diff --git a/sql/updates/world/master/2017_05_25_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_25_03_world.sql
index 5d39d65eca4..5d39d65eca4 100644
--- a/sql/updates/world/master/2017_05_25_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_25_03_world.sql
diff --git a/sql/updates/world/master/2017_05_26_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_05_26_00_world.sql
index 69cecfcad8a..69cecfcad8a 100644
--- a/sql/updates/world/master/2017_05_26_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_05_26_00_world.sql
diff --git a/sql/updates/world/master/2017_06_01_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_01_00_world.sql
index e6c495949c8..e6c495949c8 100644
--- a/sql/updates/world/master/2017_06_01_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_01_00_world.sql
diff --git a/sql/updates/world/master/2017_06_01_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_01_01_world.sql
index 33e75c590cc..33e75c590cc 100644
--- a/sql/updates/world/master/2017_06_01_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_01_01_world.sql
diff --git a/sql/updates/world/master/2017_06_01_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_01_02_world.sql
index b147b806ef5..b147b806ef5 100644
--- a/sql/updates/world/master/2017_06_01_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_01_02_world.sql
diff --git a/sql/updates/world/master/2017_06_01_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_01_03_world.sql
index be1d7dbe55f..be1d7dbe55f 100644
--- a/sql/updates/world/master/2017_06_01_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_01_03_world.sql
diff --git a/sql/updates/world/master/2017_06_02_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_02_00_world.sql
index c56af77c230..c56af77c230 100644
--- a/sql/updates/world/master/2017_06_02_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_02_00_world.sql
diff --git a/sql/updates/world/master/2017_06_03_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_03_00_world.sql
index c0f49477e1f..c0f49477e1f 100644
--- a/sql/updates/world/master/2017_06_03_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_03_00_world.sql
diff --git a/sql/updates/world/master/2017_06_03_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_03_01_world.sql
index 1b294cbb560..1b294cbb560 100644
--- a/sql/updates/world/master/2017_06_03_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_03_01_world.sql
diff --git a/sql/updates/world/master/2017_06_07_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_07_00_world.sql
index e4d7159f3c2..e4d7159f3c2 100644
--- a/sql/updates/world/master/2017_06_07_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_07_00_world.sql
diff --git a/sql/updates/world/master/2017_06_10_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_10_00_world.sql
index 10fdd473573..10fdd473573 100644
--- a/sql/updates/world/master/2017_06_10_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_10_00_world.sql
diff --git a/sql/updates/world/master/2017_06_10_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_10_01_world.sql
index 24100926c09..24100926c09 100644
--- a/sql/updates/world/master/2017_06_10_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_10_01_world.sql
diff --git a/sql/updates/world/master/2017_06_12_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_12_00_world.sql
index 71dde483721..71dde483721 100644
--- a/sql/updates/world/master/2017_06_12_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_12_00_world.sql
diff --git a/sql/updates/world/master/2017_06_17_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_17_00_world.sql
index 374a258923b..374a258923b 100644
--- a/sql/updates/world/master/2017_06_17_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_17_00_world.sql
diff --git a/sql/updates/world/master/2017_06_18_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_18_00_world.sql
index 8d4a5c392d5..8d4a5c392d5 100644
--- a/sql/updates/world/master/2017_06_18_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_18_00_world.sql
diff --git a/sql/updates/world/master/2017_06_20_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_20_00_world.sql
index 5f90d810a51..5f90d810a51 100644
--- a/sql/updates/world/master/2017_06_20_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_20_00_world.sql
diff --git a/sql/updates/world/master/2017_06_25_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_25_00_world.sql
index 6741d0c96bc..6741d0c96bc 100644
--- a/sql/updates/world/master/2017_06_25_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_25_00_world.sql
diff --git a/sql/updates/world/master/2017_06_27_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_27_00_world.sql
index de12125248b..de12125248b 100644
--- a/sql/updates/world/master/2017_06_27_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_27_00_world.sql
diff --git a/sql/updates/world/master/2017_06_28_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_28_00_world.sql
index 7fefdf703c8..7fefdf703c8 100644
--- a/sql/updates/world/master/2017_06_28_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_28_00_world.sql
diff --git a/sql/updates/world/master/2017_06_28_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_06_28_01_world.sql
index 96db040e508..96db040e508 100644
--- a/sql/updates/world/master/2017_06_28_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_06_28_01_world.sql
diff --git a/sql/updates/world/master/2017_07_01_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_01_00_world.sql
index d1e0d1a0e45..d1e0d1a0e45 100644
--- a/sql/updates/world/master/2017_07_01_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_01_00_world.sql
diff --git a/sql/updates/world/master/2017_07_02_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_02_00_world.sql
index a132e04115e..a132e04115e 100644
--- a/sql/updates/world/master/2017_07_02_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_02_00_world.sql
diff --git a/sql/updates/world/master/2017_07_02_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_02_01_world.sql
index af8200f7007..af8200f7007 100644
--- a/sql/updates/world/master/2017_07_02_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_02_01_world.sql
diff --git a/sql/updates/world/master/2017_07_02_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_02_02_world.sql
index 284dc4bdd7d..284dc4bdd7d 100644
--- a/sql/updates/world/master/2017_07_02_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_02_02_world.sql
diff --git a/sql/updates/world/master/2017_07_02_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_02_03_world.sql
index 5b01f6912db..5b01f6912db 100644
--- a/sql/updates/world/master/2017_07_02_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_02_03_world.sql
diff --git a/sql/updates/world/master/2017_07_03_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_03_00_world.sql
index b1ed5e24fab..b1ed5e24fab 100644
--- a/sql/updates/world/master/2017_07_03_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_03_00_world.sql
diff --git a/sql/updates/world/master/2017_07_03_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_03_01_world.sql
index 7b0574f52ed..7b0574f52ed 100644
--- a/sql/updates/world/master/2017_07_03_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_03_01_world.sql
diff --git a/sql/updates/world/master/2017_07_04_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_04_00_world.sql
index 0a64d65494f..0a64d65494f 100644
--- a/sql/updates/world/master/2017_07_04_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_04_00_world.sql
diff --git a/sql/updates/world/master/2017_07_05_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_05_00_world.sql
index de58e5d3979..de58e5d3979 100644
--- a/sql/updates/world/master/2017_07_05_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_05_00_world.sql
diff --git a/sql/updates/world/master/2017_07_05_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_05_01_world.sql
index 2a46ecebdad..2a46ecebdad 100644
--- a/sql/updates/world/master/2017_07_05_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_05_01_world.sql
diff --git a/sql/updates/world/master/2017_07_06_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_06_00_world.sql
index d716d7be2f2..d716d7be2f2 100644
--- a/sql/updates/world/master/2017_07_06_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_06_00_world.sql
diff --git a/sql/updates/world/master/2017_07_07_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_07_00_world.sql
index 1913c2ed602..1913c2ed602 100644
--- a/sql/updates/world/master/2017_07_07_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_07_00_world.sql
diff --git a/sql/updates/world/master/2017_07_08_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_08_00_world.sql
index 9fce87ef001..9fce87ef001 100644
--- a/sql/updates/world/master/2017_07_08_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_08_00_world.sql
diff --git a/sql/updates/world/master/2017_07_09_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_09_00_world.sql
index 43730904c3e..43730904c3e 100644
--- a/sql/updates/world/master/2017_07_09_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_09_00_world.sql
diff --git a/sql/updates/world/master/2017_07_09_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_09_01_world.sql
index 2f6a48e1fb3..2f6a48e1fb3 100644
--- a/sql/updates/world/master/2017_07_09_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_09_01_world.sql
diff --git a/sql/updates/world/master/2017_07_09_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_09_02_world.sql
index 5a96bf0b199..5a96bf0b199 100644
--- a/sql/updates/world/master/2017_07_09_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_09_02_world.sql
diff --git a/sql/updates/world/master/2017_07_09_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_09_03_world.sql
index 66ed7b6b9b7..66ed7b6b9b7 100644
--- a/sql/updates/world/master/2017_07_09_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_09_03_world.sql
diff --git a/sql/updates/world/master/2017_07_09_04_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_09_04_world.sql
index 776a805eef5..776a805eef5 100644
--- a/sql/updates/world/master/2017_07_09_04_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_09_04_world.sql
diff --git a/sql/updates/world/master/2017_07_10_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_10_00_world.sql
index 4e6ef4fe805..4e6ef4fe805 100644
--- a/sql/updates/world/master/2017_07_10_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_10_00_world.sql
diff --git a/sql/updates/world/master/2017_07_10_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_10_01_world.sql
index 1d93d8fb20a..1d93d8fb20a 100644
--- a/sql/updates/world/master/2017_07_10_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_10_01_world.sql
diff --git a/sql/updates/world/master/2017_07_12_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_12_00_world.sql
index 1d93d8fb20a..1d93d8fb20a 100644
--- a/sql/updates/world/master/2017_07_12_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_12_00_world.sql
diff --git a/sql/updates/world/master/2017_07_13_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_13_00_world.sql
index 1ffa26e243a..1ffa26e243a 100644
--- a/sql/updates/world/master/2017_07_13_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_13_00_world.sql
diff --git a/sql/updates/world/master/2017_07_15_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_15_00_world.sql
index 438fc607020..438fc607020 100644
--- a/sql/updates/world/master/2017_07_15_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_15_00_world.sql
diff --git a/sql/updates/world/master/2017_07_18_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_18_00_world.sql
index c1b74c33bf9..c1b74c33bf9 100644
--- a/sql/updates/world/master/2017_07_18_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_18_00_world.sql
diff --git a/sql/updates/world/master/2017_07_22_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_22_00_world.sql
index 89b5c48f18c..89b5c48f18c 100644
--- a/sql/updates/world/master/2017_07_22_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_22_00_world.sql
diff --git a/sql/updates/world/master/2017_07_23_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_23_00_world.sql
index 8755411a800..8755411a800 100644
--- a/sql/updates/world/master/2017_07_23_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_23_00_world.sql
diff --git a/sql/updates/world/master/2017_07_23_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_23_01_world.sql
index 0e9229b046a..0e9229b046a 100644
--- a/sql/updates/world/master/2017_07_23_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_23_01_world.sql
diff --git a/sql/updates/world/master/2017_07_25_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_25_00_world.sql
index c25b856a118..c25b856a118 100644
--- a/sql/updates/world/master/2017_07_25_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_25_00_world.sql
diff --git a/sql/updates/world/master/2017_07_26_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_26_00_world.sql
index 5e00c950a7b..5e00c950a7b 100644
--- a/sql/updates/world/master/2017_07_26_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_26_00_world.sql
diff --git a/sql/updates/world/master/2017_07_27_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_27_00_world.sql
index 1537f6e5592..1537f6e5592 100644
--- a/sql/updates/world/master/2017_07_27_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_27_00_world.sql
diff --git a/sql/updates/world/master/2017_07_29_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_29_00_world.sql
index 9307960390f..9307960390f 100644
--- a/sql/updates/world/master/2017_07_29_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_29_00_world.sql
diff --git a/sql/updates/world/master/2017_07_31_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_07_31_00_world.sql
index 20175915156..20175915156 100644
--- a/sql/updates/world/master/2017_07_31_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_07_31_00_world.sql
diff --git a/sql/updates/world/master/2017_08_04_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_04_00_world.sql
index 4de06439635..4de06439635 100644
--- a/sql/updates/world/master/2017_08_04_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_04_00_world.sql
diff --git a/sql/updates/world/master/2017_08_04_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_04_01_world.sql
index bc75f288441..bc75f288441 100644
--- a/sql/updates/world/master/2017_08_04_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_04_01_world.sql
diff --git a/sql/updates/world/master/2017_08_13_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_13_00_world.sql
index 42bf6108287..42bf6108287 100644
--- a/sql/updates/world/master/2017_08_13_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_13_00_world.sql
diff --git a/sql/updates/world/master/2017_08_13_01_world_2016_10_05_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_13_01_world_2016_10_05_03_world.sql
index 41f582280f8..41f582280f8 100644
--- a/sql/updates/world/master/2017_08_13_01_world_2016_10_05_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_13_01_world_2016_10_05_03_world.sql
diff --git a/sql/updates/world/master/2017_08_13_02_world_2016_10_05_06_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_13_02_world_2016_10_05_06_world.sql
index fd34f7cd34b..fd34f7cd34b 100644
--- a/sql/updates/world/master/2017_08_13_02_world_2016_10_05_06_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_13_02_world_2016_10_05_06_world.sql
diff --git a/sql/updates/world/master/2017_08_20_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_20_00_world.sql
index d77b9d46ae3..d77b9d46ae3 100644
--- a/sql/updates/world/master/2017_08_20_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_20_00_world.sql
diff --git a/sql/updates/world/master/2017_08_20_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_20_01_world.sql
index 2640e24c2ec..2640e24c2ec 100644
--- a/sql/updates/world/master/2017_08_20_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_20_01_world.sql
diff --git a/sql/updates/world/master/2017_08_20_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_20_02_world.sql
index 6a5a31b9f52..6a5a31b9f52 100644
--- a/sql/updates/world/master/2017_08_20_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_20_02_world.sql
diff --git a/sql/updates/world/master/2017_08_20_03_world_2016_10_05_11_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_08_20_03_world_2016_10_05_11_world_335.sql
index 008cfe049a8..008cfe049a8 100644
--- a/sql/updates/world/master/2017_08_20_03_world_2016_10_05_11_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_20_03_world_2016_10_05_11_world_335.sql
diff --git a/sql/updates/world/master/2017_08_21_00_world_2016_10_05_12_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_08_21_00_world_2016_10_05_12_world_335.sql
index a052a030dc4..a052a030dc4 100644
--- a/sql/updates/world/master/2017_08_21_00_world_2016_10_05_12_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_21_00_world_2016_10_05_12_world_335.sql
diff --git a/sql/updates/world/master/2017_08_21_01_world_2016_10_06_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_21_01_world_2016_10_06_00_world.sql
index 11e6ccdff18..11e6ccdff18 100644
--- a/sql/updates/world/master/2017_08_21_01_world_2016_10_06_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_21_01_world_2016_10_06_00_world.sql
diff --git a/sql/updates/world/master/2017_08_21_02_world_2016_10_06_01_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_08_21_02_world_2016_10_06_01_world_335.sql
index 1f9af5fa5c3..1f9af5fa5c3 100644
--- a/sql/updates/world/master/2017_08_21_02_world_2016_10_06_01_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_21_02_world_2016_10_06_01_world_335.sql
diff --git a/sql/updates/world/master/2017_08_21_03_world_2016_10_06_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_21_03_world_2016_10_06_02_world.sql
index 85105ca2c50..85105ca2c50 100644
--- a/sql/updates/world/master/2017_08_21_03_world_2016_10_06_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_21_03_world_2016_10_06_02_world.sql
diff --git a/sql/updates/world/master/2017_08_21_04_world_2016_10_06_04_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_08_21_04_world_2016_10_06_04_world_335.sql
index 7168b4f3d97..7168b4f3d97 100644
--- a/sql/updates/world/master/2017_08_21_04_world_2016_10_06_04_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_21_04_world_2016_10_06_04_world_335.sql
diff --git a/sql/updates/world/master/2017_08_21_05_world_2016_10_06_05_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_08_21_05_world_2016_10_06_05_world_335.sql
index 0039967a07d..0039967a07d 100644
--- a/sql/updates/world/master/2017_08_21_05_world_2016_10_06_05_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_21_05_world_2016_10_06_05_world_335.sql
diff --git a/sql/updates/world/master/2017_08_21_06_world_2016_10_06_06_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_08_21_06_world_2016_10_06_06_world_335.sql
index 8f888c49c16..8f888c49c16 100644
--- a/sql/updates/world/master/2017_08_21_06_world_2016_10_06_06_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_21_06_world_2016_10_06_06_world_335.sql
diff --git a/sql/updates/world/master/2017_08_21_07_world_2016_10_06_07_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_21_07_world_2016_10_06_07_world.sql
index 765f48098c3..765f48098c3 100644
--- a/sql/updates/world/master/2017_08_21_07_world_2016_10_06_07_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_21_07_world_2016_10_06_07_world.sql
diff --git a/sql/updates/world/master/2017_08_21_08_world_2016_10_07_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_21_08_world_2016_10_07_00_world.sql
index 0ecd7195b6d..0ecd7195b6d 100644
--- a/sql/updates/world/master/2017_08_21_08_world_2016_10_07_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_21_08_world_2016_10_07_00_world.sql
diff --git a/sql/updates/world/master/2017_08_22_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_22_00_world.sql
index de6b6edcd46..de6b6edcd46 100644
--- a/sql/updates/world/master/2017_08_22_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_22_00_world.sql
diff --git a/sql/updates/world/master/2017_08_26_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_26_00_world.sql
index c834f62a623..c834f62a623 100644
--- a/sql/updates/world/master/2017_08_26_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_26_00_world.sql
diff --git a/sql/updates/world/master/2017_08_26_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_26_01_world.sql
index 70ad20c9ae4..70ad20c9ae4 100644
--- a/sql/updates/world/master/2017_08_26_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_26_01_world.sql
diff --git a/sql/updates/world/master/2017_08_26_02_world_2016_10_07_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_26_02_world_2016_10_07_02_world.sql
index 7df71fc4e03..7df71fc4e03 100644
--- a/sql/updates/world/master/2017_08_26_02_world_2016_10_07_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_26_02_world_2016_10_07_02_world.sql
diff --git a/sql/updates/world/master/2017_08_27_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_27_00_world.sql
index 8a656461538..8a656461538 100644
--- a/sql/updates/world/master/2017_08_27_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_27_00_world.sql
diff --git a/sql/updates/world/master/2017_08_28_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_08_28_00_world.sql
index 4bbeec60fdf..4bbeec60fdf 100644
--- a/sql/updates/world/master/2017_08_28_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_08_28_00_world.sql
diff --git a/sql/updates/world/master/2017_09_01_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_01_00_world.sql
index 26b6957b4ed..26b6957b4ed 100644
--- a/sql/updates/world/master/2017_09_01_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_01_00_world.sql
diff --git a/sql/updates/world/master/2017_09_05_00_world_2016_10_07_03_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_00_world_2016_10_07_03_world_335.sql
index d45e3437937..d45e3437937 100644
--- a/sql/updates/world/master/2017_09_05_00_world_2016_10_07_03_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_00_world_2016_10_07_03_world_335.sql
diff --git a/sql/updates/world/master/2017_09_05_01_world_2016_10_08_00_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_01_world_2016_10_08_00_world_335.sql
index 40dcbe4bcf7..40dcbe4bcf7 100644
--- a/sql/updates/world/master/2017_09_05_01_world_2016_10_08_00_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_01_world_2016_10_08_00_world_335.sql
diff --git a/sql/updates/world/master/2017_09_05_02_world_2016_10_08_01_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_02_world_2016_10_08_01_world_335.sql
index 5f9cd3d6654..5f9cd3d6654 100644
--- a/sql/updates/world/master/2017_09_05_02_world_2016_10_08_01_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_02_world_2016_10_08_01_world_335.sql
diff --git a/sql/updates/world/master/2017_09_05_03_world_2016_10_08_02_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_03_world_2016_10_08_02_world_335.sql
index 7cdf4474281..7cdf4474281 100644
--- a/sql/updates/world/master/2017_09_05_03_world_2016_10_08_02_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_03_world_2016_10_08_02_world_335.sql
diff --git a/sql/updates/world/master/2017_09_05_04_world_2016_10_08_03_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_04_world_2016_10_08_03_world_335.sql
index a0aa0e659bc..a0aa0e659bc 100644
--- a/sql/updates/world/master/2017_09_05_04_world_2016_10_08_03_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_04_world_2016_10_08_03_world_335.sql
diff --git a/sql/updates/world/master/2017_09_05_05_world_2016_10_08_04_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_05_world_2016_10_08_04_world_335.sql
index 028b7505534..028b7505534 100644
--- a/sql/updates/world/master/2017_09_05_05_world_2016_10_08_04_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_05_world_2016_10_08_04_world_335.sql
diff --git a/sql/updates/world/master/2017_09_05_06_world_2016_10_08_05_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_06_world_2016_10_08_05_world.sql
index bd835ab05fa..bd835ab05fa 100644
--- a/sql/updates/world/master/2017_09_05_06_world_2016_10_08_05_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_06_world_2016_10_08_05_world.sql
diff --git a/sql/updates/world/master/2017_09_05_07_world_2016_10_08_06_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_07_world_2016_10_08_06_world_335.sql
index 84663326d90..84663326d90 100644
--- a/sql/updates/world/master/2017_09_05_07_world_2016_10_08_06_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_07_world_2016_10_08_06_world_335.sql
diff --git a/sql/updates/world/master/2017_09_05_08_world_2016_10_09_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_08_world_2016_10_09_01_world.sql
index 54f21122326..54f21122326 100644
--- a/sql/updates/world/master/2017_09_05_08_world_2016_10_09_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_08_world_2016_10_09_01_world.sql
diff --git a/sql/updates/world/master/2017_09_05_09_world_2016_10_09_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_09_world_2016_10_09_02_world.sql
index 18b368cf9d9..18b368cf9d9 100644
--- a/sql/updates/world/master/2017_09_05_09_world_2016_10_09_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_09_world_2016_10_09_02_world.sql
diff --git a/sql/updates/world/master/2017_09_05_10_world_2016_10_10_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_10_world_2016_10_10_00_world.sql
index 30fb4c42246..30fb4c42246 100644
--- a/sql/updates/world/master/2017_09_05_10_world_2016_10_10_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_10_world_2016_10_10_00_world.sql
diff --git a/sql/updates/world/master/2017_09_05_11_world_2016_10_10_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_11_world_2016_10_10_01_world.sql
index a8da054d270..a8da054d270 100644
--- a/sql/updates/world/master/2017_09_05_11_world_2016_10_10_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_11_world_2016_10_10_01_world.sql
diff --git a/sql/updates/world/master/2017_09_05_12_world_2016_10_10_02_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_12_world_2016_10_10_02_world_335.sql
index 2e2f80a2607..2e2f80a2607 100644
--- a/sql/updates/world/master/2017_09_05_12_world_2016_10_10_02_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_12_world_2016_10_10_02_world_335.sql
diff --git a/sql/updates/world/master/2017_09_05_13_world_2016_10_10_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_13_world_2016_10_10_03_world.sql
index 9bbc05447ca..9bbc05447ca 100644
--- a/sql/updates/world/master/2017_09_05_13_world_2016_10_10_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_13_world_2016_10_10_03_world.sql
diff --git a/sql/updates/world/master/2017_09_05_14_world_2016_10_11_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_14_world_2016_10_11_00_world.sql
index 1804b59eb7d..1804b59eb7d 100644
--- a/sql/updates/world/master/2017_09_05_14_world_2016_10_11_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_14_world_2016_10_11_00_world.sql
diff --git a/sql/updates/world/master/2017_09_05_15_world_2016_10_11_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_15_world_2016_10_11_01_world.sql
index 8e5202d9d85..8e5202d9d85 100644
--- a/sql/updates/world/master/2017_09_05_15_world_2016_10_11_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_15_world_2016_10_11_01_world.sql
diff --git a/sql/updates/world/master/2017_09_05_16_world_2016_10_11_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_16_world_2016_10_11_02_world.sql
index 721869086ab..721869086ab 100644
--- a/sql/updates/world/master/2017_09_05_16_world_2016_10_11_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_16_world_2016_10_11_02_world.sql
diff --git a/sql/updates/world/master/2017_09_05_17_world_2016_10_11_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_05_17_world_2016_10_11_03_world.sql
index 555b5d3359e..555b5d3359e 100644
--- a/sql/updates/world/master/2017_09_05_17_world_2016_10_11_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_05_17_world_2016_10_11_03_world.sql
diff --git a/sql/updates/world/master/2017_09_06_00_world_2016_10_11_04_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_06_00_world_2016_10_11_04_world.sql
index fb939805c23..fb939805c23 100644
--- a/sql/updates/world/master/2017_09_06_00_world_2016_10_11_04_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_06_00_world_2016_10_11_04_world.sql
diff --git a/sql/updates/world/master/2017_09_06_01_world_2016_10_11_05_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_06_01_world_2016_10_11_05_world.sql
index 4e23bac65da..4e23bac65da 100644
--- a/sql/updates/world/master/2017_09_06_01_world_2016_10_11_05_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_06_01_world_2016_10_11_05_world.sql
diff --git a/sql/updates/world/master/2017_09_06_02_world_2016_10_11_06_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_06_02_world_2016_10_11_06_world.sql
index 30c5f277fad..30c5f277fad 100644
--- a/sql/updates/world/master/2017_09_06_02_world_2016_10_11_06_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_06_02_world_2016_10_11_06_world.sql
diff --git a/sql/updates/world/master/2017_09_06_03_world_2016_10_12_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_06_03_world_2016_10_12_02_world.sql
index 085f3d96e5a..085f3d96e5a 100644
--- a/sql/updates/world/master/2017_09_06_03_world_2016_10_12_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_06_03_world_2016_10_12_02_world.sql
diff --git a/sql/updates/world/master/2017_09_06_04_world_2016_10_12_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_06_04_world_2016_10_12_03_world.sql
index aeaae94998b..aeaae94998b 100644
--- a/sql/updates/world/master/2017_09_06_04_world_2016_10_12_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_06_04_world_2016_10_12_03_world.sql
diff --git a/sql/updates/world/master/2017_09_06_05_world_2016_10_14_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_06_05_world_2016_10_14_00_world.sql
index ce5756cdeb1..ce5756cdeb1 100644
--- a/sql/updates/world/master/2017_09_06_05_world_2016_10_14_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_06_05_world_2016_10_14_00_world.sql
diff --git a/sql/updates/world/master/2017_09_06_06_world_2016_10_14_02_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_09_06_06_world_2016_10_14_02_world_335.sql
index e2329bf7577..e2329bf7577 100644
--- a/sql/updates/world/master/2017_09_06_06_world_2016_10_14_02_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_06_06_world_2016_10_14_02_world_335.sql
diff --git a/sql/updates/world/master/2017_09_07_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_09_07_00_world.sql
index 8d2f1d4479f..8d2f1d4479f 100644
--- a/sql/updates/world/master/2017_09_07_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_09_07_00_world.sql
diff --git a/sql/updates/world/master/2017_10_03_00_world_2016_10_14_03_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_00_world_2016_10_14_03_world_335.sql
index 11e96b09b94..11e96b09b94 100644
--- a/sql/updates/world/master/2017_10_03_00_world_2016_10_14_03_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_00_world_2016_10_14_03_world_335.sql
diff --git a/sql/updates/world/master/2017_10_03_01_world_2016_10_14_04_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_01_world_2016_10_14_04_world_335.sql
index 02898cc9bd4..02898cc9bd4 100644
--- a/sql/updates/world/master/2017_10_03_01_world_2016_10_14_04_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_01_world_2016_10_14_04_world_335.sql
diff --git a/sql/updates/world/master/2017_10_03_02_world_2016_10_14_05_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_02_world_2016_10_14_05_world.sql
index b59f5c7d27b..b59f5c7d27b 100644
--- a/sql/updates/world/master/2017_10_03_02_world_2016_10_14_05_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_02_world_2016_10_14_05_world.sql
diff --git a/sql/updates/world/master/2017_10_03_03_world_2016_10_14_06_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_03_world_2016_10_14_06_world.sql
index f42a57a5a5c..f42a57a5a5c 100644
--- a/sql/updates/world/master/2017_10_03_03_world_2016_10_14_06_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_03_world_2016_10_14_06_world.sql
diff --git a/sql/updates/world/master/2017_10_03_04_world_2016_10_14_07_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_04_world_2016_10_14_07_world.sql
index 8b9364acf80..8b9364acf80 100644
--- a/sql/updates/world/master/2017_10_03_04_world_2016_10_14_07_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_04_world_2016_10_14_07_world.sql
diff --git a/sql/updates/world/master/2017_10_03_05_world_2016_10_15_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_05_world_2016_10_15_00_world.sql
index 2a2b1ae3e8e..2a2b1ae3e8e 100644
--- a/sql/updates/world/master/2017_10_03_05_world_2016_10_15_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_05_world_2016_10_15_00_world.sql
diff --git a/sql/updates/world/master/2017_10_03_05_world_2016_10_15_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_05_world_2016_10_15_01_world.sql
index c790b540cfe..c790b540cfe 100644
--- a/sql/updates/world/master/2017_10_03_05_world_2016_10_15_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_05_world_2016_10_15_01_world.sql
diff --git a/sql/updates/world/master/2017_10_03_06_world_2016_10_15_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_06_world_2016_10_15_02_world.sql
index 3ddc9dfc5f9..3ddc9dfc5f9 100644
--- a/sql/updates/world/master/2017_10_03_06_world_2016_10_15_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_06_world_2016_10_15_02_world.sql
diff --git a/sql/updates/world/master/2017_10_03_07_world_2016_10_15_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_07_world_2016_10_15_03_world.sql
index 89c39eda004..89c39eda004 100644
--- a/sql/updates/world/master/2017_10_03_07_world_2016_10_15_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_07_world_2016_10_15_03_world.sql
diff --git a/sql/updates/world/master/2017_10_03_08_world_2016_10_15_04_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_08_world_2016_10_15_04_world.sql
index 134462cd68f..134462cd68f 100644
--- a/sql/updates/world/master/2017_10_03_08_world_2016_10_15_04_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_08_world_2016_10_15_04_world.sql
diff --git a/sql/updates/world/master/2017_10_03_09_world_2016_10_15_05_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_09_world_2016_10_15_05_world.sql
index dfbf7235623..dfbf7235623 100644
--- a/sql/updates/world/master/2017_10_03_09_world_2016_10_15_05_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_09_world_2016_10_15_05_world.sql
diff --git a/sql/updates/world/master/2017_10_03_09_world_2016_10_15_06_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_09_world_2016_10_15_06_world.sql
index 8bc09775223..8bc09775223 100644
--- a/sql/updates/world/master/2017_10_03_09_world_2016_10_15_06_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_09_world_2016_10_15_06_world.sql
diff --git a/sql/updates/world/master/2017_10_03_10_world_2016_10_15_10_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_10_world_2016_10_15_10_world.sql
index 9c3be9d00df..9c3be9d00df 100644
--- a/sql/updates/world/master/2017_10_03_10_world_2016_10_15_10_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_10_world_2016_10_15_10_world.sql
diff --git a/sql/updates/world/master/2017_10_03_11_world_2016_10_16_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_11_world_2016_10_16_00_world.sql
index a7114ec06c2..a7114ec06c2 100644
--- a/sql/updates/world/master/2017_10_03_11_world_2016_10_16_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_11_world_2016_10_16_00_world.sql
diff --git a/sql/updates/world/master/2017_10_03_12_world_2016_10_16_01_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_12_world_2016_10_16_01_world_335.sql
index 2b0c1d2bfa1..2b0c1d2bfa1 100644
--- a/sql/updates/world/master/2017_10_03_12_world_2016_10_16_01_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_12_world_2016_10_16_01_world_335.sql
diff --git a/sql/updates/world/master/2017_10_03_13_world_2016_10_16_02_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_13_world_2016_10_16_02_world_335.sql
index 6c7a0c65caf..6c7a0c65caf 100644
--- a/sql/updates/world/master/2017_10_03_13_world_2016_10_16_02_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_13_world_2016_10_16_02_world_335.sql
diff --git a/sql/updates/world/master/2017_10_03_14_world_2016_10_17_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_14_world_2016_10_17_01_world.sql
index 063d4f53f1b..063d4f53f1b 100644
--- a/sql/updates/world/master/2017_10_03_14_world_2016_10_17_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_14_world_2016_10_17_01_world.sql
diff --git a/sql/updates/world/master/2017_10_03_15_world_2016_10_17_03_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_10_03_15_world_2016_10_17_03_world_335.sql
index 17255cea34e..17255cea34e 100644
--- a/sql/updates/world/master/2017_10_03_15_world_2016_10_17_03_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_03_15_world_2016_10_17_03_world_335.sql
diff --git a/sql/updates/world/master/2017_10_09_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_09_00_world.sql
index 8646ecb9eeb..8646ecb9eeb 100644
--- a/sql/updates/world/master/2017_10_09_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_09_00_world.sql
diff --git a/sql/updates/world/master/2017_10_15_00_world_2016_10_18_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_15_00_world_2016_10_18_00_world.sql
index 711ca05eb0c..711ca05eb0c 100644
--- a/sql/updates/world/master/2017_10_15_00_world_2016_10_18_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_15_00_world_2016_10_18_00_world.sql
diff --git a/sql/updates/world/master/2017_10_15_01_world_2016_10_18_01_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_10_15_01_world_2016_10_18_01_world_335.sql
index 067350cb3ef..067350cb3ef 100644
--- a/sql/updates/world/master/2017_10_15_01_world_2016_10_18_01_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_15_01_world_2016_10_18_01_world_335.sql
diff --git a/sql/updates/world/master/2017_10_15_02_world_2016_10_18_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_15_02_world_2016_10_18_02_world.sql
index 041f8dd60b6..041f8dd60b6 100644
--- a/sql/updates/world/master/2017_10_15_02_world_2016_10_18_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_15_02_world_2016_10_18_02_world.sql
diff --git a/sql/updates/world/master/2017_10_15_03_world_2016_10_18_06_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_10_15_03_world_2016_10_18_06_world_335.sql
index 87c4ee063a4..87c4ee063a4 100644
--- a/sql/updates/world/master/2017_10_15_03_world_2016_10_18_06_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_15_03_world_2016_10_18_06_world_335.sql
diff --git a/sql/updates/world/master/2017_10_15_04_world_2016_10_19_00_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_10_15_04_world_2016_10_19_00_world_335.sql
index ef769535f36..ef769535f36 100644
--- a/sql/updates/world/master/2017_10_15_04_world_2016_10_19_00_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_15_04_world_2016_10_19_00_world_335.sql
diff --git a/sql/updates/world/master/2017_10_15_05_world_2016_10_20_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_15_05_world_2016_10_20_00_world.sql
index d2db94033ab..d2db94033ab 100644
--- a/sql/updates/world/master/2017_10_15_05_world_2016_10_20_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_15_05_world_2016_10_20_00_world.sql
diff --git a/sql/updates/world/master/2017_10_15_06_world_2016_10_21_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_15_06_world_2016_10_21_00_world.sql
index 00c773e398e..00c773e398e 100644
--- a/sql/updates/world/master/2017_10_15_06_world_2016_10_21_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_15_06_world_2016_10_21_00_world.sql
diff --git a/sql/updates/world/master/2017_10_15_07_world_2016_10_21_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_15_07_world_2016_10_21_01_world.sql
index 3753e8fd9c7..3753e8fd9c7 100644
--- a/sql/updates/world/master/2017_10_15_07_world_2016_10_21_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_15_07_world_2016_10_21_01_world.sql
diff --git a/sql/updates/world/master/2017_10_15_08_world_2016_10_21_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_15_08_world_2016_10_21_02_world.sql
index ce000dacadd..ce000dacadd 100644
--- a/sql/updates/world/master/2017_10_15_08_world_2016_10_21_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_15_08_world_2016_10_21_02_world.sql
diff --git a/sql/updates/world/master/2017_10_15_09_world_2016_10_25_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_15_09_world_2016_10_25_00_world.sql
index 5acfd2bdcd0..5acfd2bdcd0 100644
--- a/sql/updates/world/master/2017_10_15_09_world_2016_10_25_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_15_09_world_2016_10_25_00_world.sql
diff --git a/sql/updates/world/master/2017_10_15_10_world_2016_10_26_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_15_10_world_2016_10_26_00_world.sql
index 15a1c9ccead..15a1c9ccead 100644
--- a/sql/updates/world/master/2017_10_15_10_world_2016_10_26_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_15_10_world_2016_10_26_00_world.sql
diff --git a/sql/updates/world/master/2017_10_26_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_26_00_world.sql
index a3e8a443adc..a3e8a443adc 100644
--- a/sql/updates/world/master/2017_10_26_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_26_00_world.sql
diff --git a/sql/updates/world/master/2017_10_28_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_28_00_world.sql
index d4206beeb30..d4206beeb30 100644
--- a/sql/updates/world/master/2017_10_28_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_28_00_world.sql
diff --git a/sql/updates/world/master/2017_10_29_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_29_00_world.sql
index 1a901b62878..1a901b62878 100644
--- a/sql/updates/world/master/2017_10_29_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_29_00_world.sql
diff --git a/sql/updates/world/master/2017_10_30_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_30_00_world.sql
index 6331c96509b..6331c96509b 100644
--- a/sql/updates/world/master/2017_10_30_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_30_00_world.sql
diff --git a/sql/updates/world/master/2017_10_30_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_30_01_world.sql
index d52dbac0359..d52dbac0359 100644
--- a/sql/updates/world/master/2017_10_30_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_30_01_world.sql
diff --git a/sql/updates/world/master/2017_10_30_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_10_30_02_world.sql
index c0a57815cdb..c0a57815cdb 100644
--- a/sql/updates/world/master/2017_10_30_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_10_30_02_world.sql
diff --git a/sql/updates/world/master/2017_11_03_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_03_00_world.sql
index d8e9dfa3b3e..d8e9dfa3b3e 100644
--- a/sql/updates/world/master/2017_11_03_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_03_00_world.sql
diff --git a/sql/updates/world/master/2017_11_03_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_03_01_world.sql
index 5a5acaa99d4..5a5acaa99d4 100644
--- a/sql/updates/world/master/2017_11_03_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_03_01_world.sql
diff --git a/sql/updates/world/master/2017_11_03_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_03_02_world.sql
index bbaa5e30772..bbaa5e30772 100644
--- a/sql/updates/world/master/2017_11_03_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_03_02_world.sql
diff --git a/sql/updates/world/master/2017_11_03_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_03_03_world.sql
index bb0cb39222e..bb0cb39222e 100644
--- a/sql/updates/world/master/2017_11_03_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_03_03_world.sql
diff --git a/sql/updates/world/master/2017_11_03_04_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_03_04_world.sql
index b814627f7ef..b814627f7ef 100644
--- a/sql/updates/world/master/2017_11_03_04_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_03_04_world.sql
diff --git a/sql/updates/world/master/2017_11_04_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_04_00_world.sql
index cee322ee811..cee322ee811 100644
--- a/sql/updates/world/master/2017_11_04_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_04_00_world.sql
diff --git a/sql/updates/world/master/2017_11_05_00_world_2016_10_26_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_05_00_world_2016_10_26_01_world.sql
index bf1b2342308..bf1b2342308 100644
--- a/sql/updates/world/master/2017_11_05_00_world_2016_10_26_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_05_00_world_2016_10_26_01_world.sql
diff --git a/sql/updates/world/master/2017_11_05_01_world_2016_10_26_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_05_01_world_2016_10_26_02_world.sql
index 399d01b8db0..399d01b8db0 100644
--- a/sql/updates/world/master/2017_11_05_01_world_2016_10_26_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_05_01_world_2016_10_26_02_world.sql
diff --git a/sql/updates/world/master/2017_11_05_02_world_2016_10_27_00_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_11_05_02_world_2016_10_27_00_world_335.sql
index f9be10b6ba9..f9be10b6ba9 100644
--- a/sql/updates/world/master/2017_11_05_02_world_2016_10_27_00_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_05_02_world_2016_10_27_00_world_335.sql
diff --git a/sql/updates/world/master/2017_11_05_03_world_2016_10_27_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_05_03_world_2016_10_27_02_world.sql
index 205cf6927d2..205cf6927d2 100644
--- a/sql/updates/world/master/2017_11_05_03_world_2016_10_27_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_05_03_world_2016_10_27_02_world.sql
diff --git a/sql/updates/world/master/2017_11_05_04_world_2016_10_27_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_05_04_world_2016_10_27_03_world.sql
index dc0421aa81d..dc0421aa81d 100644
--- a/sql/updates/world/master/2017_11_05_04_world_2016_10_27_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_05_04_world_2016_10_27_03_world.sql
diff --git a/sql/updates/world/master/2017_11_05_05_world_2016_10_27_04_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_05_05_world_2016_10_27_04_world.sql
index c54411ecf93..c54411ecf93 100644
--- a/sql/updates/world/master/2017_11_05_05_world_2016_10_27_04_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_05_05_world_2016_10_27_04_world.sql
diff --git a/sql/updates/world/master/2017_11_05_06_world_2016_10_27_05_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_05_06_world_2016_10_27_05_world.sql
index 3c1e8cdccca..3c1e8cdccca 100644
--- a/sql/updates/world/master/2017_11_05_06_world_2016_10_27_05_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_05_06_world_2016_10_27_05_world.sql
diff --git a/sql/updates/world/master/2017_11_05_07_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_05_07_world.sql
index fe2634ad98e..fe2634ad98e 100644
--- a/sql/updates/world/master/2017_11_05_07_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_05_07_world.sql
diff --git a/sql/updates/world/master/2017_11_05_08_world_2016_10_28_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_05_08_world_2016_10_28_00_world.sql
index 954a9356516..954a9356516 100644
--- a/sql/updates/world/master/2017_11_05_08_world_2016_10_28_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_05_08_world_2016_10_28_00_world.sql
diff --git a/sql/updates/world/master/2017_11_05_09_world_2016_10_28_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_05_09_world_2016_10_28_01_world.sql
index 6e4398ce50c..6e4398ce50c 100644
--- a/sql/updates/world/master/2017_11_05_09_world_2016_10_28_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_05_09_world_2016_10_28_01_world.sql
diff --git a/sql/updates/world/master/2017_11_05_10_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_05_10_world.sql
index e22fb5d56cf..e22fb5d56cf 100644
--- a/sql/updates/world/master/2017_11_05_10_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_05_10_world.sql
diff --git a/sql/updates/world/master/2017_11_05_11_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_05_11_world.sql
index 76252fbb0d6..76252fbb0d6 100644
--- a/sql/updates/world/master/2017_11_05_11_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_05_11_world.sql
diff --git a/sql/updates/world/master/2017_11_05_12_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_05_12_world.sql
index 92fe76810a1..92fe76810a1 100644
--- a/sql/updates/world/master/2017_11_05_12_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_05_12_world.sql
diff --git a/sql/updates/world/master/2017_11_07_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_07_00_world.sql
index aa1d8b86edd..aa1d8b86edd 100644
--- a/sql/updates/world/master/2017_11_07_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_07_00_world.sql
diff --git a/sql/updates/world/master/2017_11_07_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_07_01_world.sql
index 464da9c5088..464da9c5088 100644
--- a/sql/updates/world/master/2017_11_07_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_07_01_world.sql
diff --git a/sql/updates/world/master/2017_11_08_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_08_00_world.sql
index 001b90a416e..001b90a416e 100644
--- a/sql/updates/world/master/2017_11_08_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_08_00_world.sql
diff --git a/sql/updates/world/master/2017_11_08_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_08_01_world.sql
index 01f8b52aeea..01f8b52aeea 100644
--- a/sql/updates/world/master/2017_11_08_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_08_01_world.sql
diff --git a/sql/updates/world/master/2017_11_08_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_08_02_world.sql
index d9ed13c84e8..d9ed13c84e8 100644
--- a/sql/updates/world/master/2017_11_08_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_08_02_world.sql
diff --git a/sql/updates/world/master/2017_11_08_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_08_03_world.sql
index 71b31c4094c..71b31c4094c 100644
--- a/sql/updates/world/master/2017_11_08_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_08_03_world.sql
diff --git a/sql/updates/world/master/2017_11_08_04_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_08_04_world.sql
index 643caf12f4c..643caf12f4c 100644
--- a/sql/updates/world/master/2017_11_08_04_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_08_04_world.sql
diff --git a/sql/updates/world/master/2017_11_09_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_09_00_world.sql
index 3e92d62dd60..3e92d62dd60 100644
--- a/sql/updates/world/master/2017_11_09_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_09_00_world.sql
diff --git a/sql/updates/world/master/2017_11_09_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_09_01_world.sql
index 996d44c87b6..996d44c87b6 100644
--- a/sql/updates/world/master/2017_11_09_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_09_01_world.sql
diff --git a/sql/updates/world/master/2017_11_10_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_10_00_world.sql
index 1d788124df5..1d788124df5 100644
--- a/sql/updates/world/master/2017_11_10_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_10_00_world.sql
diff --git a/sql/updates/world/master/2017_11_10_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_10_01_world.sql
index f957d712621..f957d712621 100644
--- a/sql/updates/world/master/2017_11_10_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_10_01_world.sql
diff --git a/sql/updates/world/master/2017_11_11_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_11_00_world.sql
index cc76c0b590c..cc76c0b590c 100644
--- a/sql/updates/world/master/2017_11_11_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_11_00_world.sql
diff --git a/sql/updates/world/master/2017_11_11_01_world_2016_10_29_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_11_01_world_2016_10_29_00_world.sql
index 16f6b661ea4..16f6b661ea4 100644
--- a/sql/updates/world/master/2017_11_11_01_world_2016_10_29_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_11_01_world_2016_10_29_00_world.sql
diff --git a/sql/updates/world/master/2017_11_11_02_world_2016_10_29_01_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_11_11_02_world_2016_10_29_01_world_335.sql
index 11b344f9604..11b344f9604 100644
--- a/sql/updates/world/master/2017_11_11_02_world_2016_10_29_01_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_11_02_world_2016_10_29_01_world_335.sql
diff --git a/sql/updates/world/master/2017_11_11_03_world_2016_10_29_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_11_03_world_2016_10_29_02_world.sql
index f3acc97d0a2..f3acc97d0a2 100644
--- a/sql/updates/world/master/2017_11_11_03_world_2016_10_29_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_11_03_world_2016_10_29_02_world.sql
diff --git a/sql/updates/world/master/2017_11_11_04_world_2016_10_29_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_11_04_world_2016_10_29_03_world.sql
index 42ef3a58166..42ef3a58166 100644
--- a/sql/updates/world/master/2017_11_11_04_world_2016_10_29_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_11_04_world_2016_10_29_03_world.sql
diff --git a/sql/updates/world/master/2017_11_11_05_world_2016_10_29_04_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_11_05_world_2016_10_29_04_world.sql
index 5bea6f0f8b2..5bea6f0f8b2 100644
--- a/sql/updates/world/master/2017_11_11_05_world_2016_10_29_04_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_11_05_world_2016_10_29_04_world.sql
diff --git a/sql/updates/world/master/2017_11_11_06_world_2016_10_29_05_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_11_06_world_2016_10_29_05_world.sql
index 1f923592dda..1f923592dda 100644
--- a/sql/updates/world/master/2017_11_11_06_world_2016_10_29_05_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_11_06_world_2016_10_29_05_world.sql
diff --git a/sql/updates/world/master/2017_11_11_07_world_2016_10_29_06_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_11_07_world_2016_10_29_06_world.sql
index 06c9251574c..06c9251574c 100644
--- a/sql/updates/world/master/2017_11_11_07_world_2016_10_29_06_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_11_07_world_2016_10_29_06_world.sql
diff --git a/sql/updates/world/master/2017_11_11_08_world_2016_10_29_07_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_11_08_world_2016_10_29_07_world.sql
index 8c020dc8fd8..8c020dc8fd8 100644
--- a/sql/updates/world/master/2017_11_11_08_world_2016_10_29_07_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_11_08_world_2016_10_29_07_world.sql
diff --git a/sql/updates/world/master/2017_11_11_09_world_2016_10_30_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_11_09_world_2016_10_30_00_world.sql
index 9aad7b753d8..9aad7b753d8 100644
--- a/sql/updates/world/master/2017_11_11_09_world_2016_10_30_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_11_09_world_2016_10_30_00_world.sql
diff --git a/sql/updates/world/master/2017_11_11_10_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_11_10_world.sql
index 35bb932f320..35bb932f320 100644
--- a/sql/updates/world/master/2017_11_11_10_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_11_10_world.sql
diff --git a/sql/updates/world/master/2017_11_12_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_12_00_world.sql
index 6694e57ad48..6694e57ad48 100644
--- a/sql/updates/world/master/2017_11_12_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_12_00_world.sql
diff --git a/sql/updates/world/master/2017_11_12_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_12_01_world.sql
index 0755c82e1d9..0755c82e1d9 100644
--- a/sql/updates/world/master/2017_11_12_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_12_01_world.sql
diff --git a/sql/updates/world/master/2017_11_12_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_12_02_world.sql
index 9d2cc01c26b..9d2cc01c26b 100644
--- a/sql/updates/world/master/2017_11_12_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_12_02_world.sql
diff --git a/sql/updates/world/master/2017_11_13_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_13_00_world.sql
index dddf2321b83..dddf2321b83 100644
--- a/sql/updates/world/master/2017_11_13_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_13_00_world.sql
diff --git a/sql/updates/world/master/2017_11_13_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_13_01_world.sql
index 57ff0fe74cd..57ff0fe74cd 100644
--- a/sql/updates/world/master/2017_11_13_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_13_01_world.sql
diff --git a/sql/updates/world/master/2017_11_15_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_15_00_world.sql
index c5661309217..c5661309217 100644
--- a/sql/updates/world/master/2017_11_15_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_15_00_world.sql
diff --git a/sql/updates/world/master/2017_11_15_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_15_01_world.sql
index 1b2e2fb73d8..1b2e2fb73d8 100644
--- a/sql/updates/world/master/2017_11_15_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_15_01_world.sql
diff --git a/sql/updates/world/master/2017_11_15_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_15_02_world.sql
index aaad9cc37b8..aaad9cc37b8 100644
--- a/sql/updates/world/master/2017_11_15_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_15_02_world.sql
diff --git a/sql/updates/world/master/2017_11_16_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_16_00_world.sql
index 2016c94c366..2016c94c366 100644
--- a/sql/updates/world/master/2017_11_16_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_16_00_world.sql
diff --git a/sql/updates/world/master/2017_11_16_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_16_01_world.sql
index 9226e1a9b49..9226e1a9b49 100644
--- a/sql/updates/world/master/2017_11_16_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_16_01_world.sql
diff --git a/sql/updates/world/master/2017_11_16_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_16_02_world.sql
index 5178c2050db..5178c2050db 100644
--- a/sql/updates/world/master/2017_11_16_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_16_02_world.sql
diff --git a/sql/updates/world/master/2017_11_16_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_16_03_world.sql
index 6ef42fcca8c..6ef42fcca8c 100644
--- a/sql/updates/world/master/2017_11_16_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_16_03_world.sql
diff --git a/sql/updates/world/master/2017_11_16_04_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_16_04_world.sql
index 77f1e0c376f..77f1e0c376f 100644
--- a/sql/updates/world/master/2017_11_16_04_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_16_04_world.sql
diff --git a/sql/updates/world/master/2017_11_18_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_18_00_world.sql
index 643e5654187..643e5654187 100644
--- a/sql/updates/world/master/2017_11_18_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_18_00_world.sql
diff --git a/sql/updates/world/master/2017_11_18_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_18_01_world.sql
index 2a7f6601bd7..2a7f6601bd7 100644
--- a/sql/updates/world/master/2017_11_18_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_18_01_world.sql
diff --git a/sql/updates/world/master/2017_11_18_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_18_02_world.sql
index a08c3671b04..a08c3671b04 100644
--- a/sql/updates/world/master/2017_11_18_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_18_02_world.sql
diff --git a/sql/updates/world/master/2017_11_19_00_world_2016_10_30_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_19_00_world_2016_10_30_02_world.sql
index 0d39b8eb6f9..0d39b8eb6f9 100644
--- a/sql/updates/world/master/2017_11_19_00_world_2016_10_30_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_19_00_world_2016_10_30_02_world.sql
diff --git a/sql/updates/world/master/2017_11_19_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_19_01_world.sql
index cfd8d64f380..cfd8d64f380 100644
--- a/sql/updates/world/master/2017_11_19_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_19_01_world.sql
diff --git a/sql/updates/world/master/2017_11_20_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_20_00_world.sql
index bd2e1d25ae6..bd2e1d25ae6 100644
--- a/sql/updates/world/master/2017_11_20_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_20_00_world.sql
diff --git a/sql/updates/world/master/2017_11_22_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_22_00_world.sql
index 06a3b1eea03..06a3b1eea03 100644
--- a/sql/updates/world/master/2017_11_22_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_22_00_world.sql
diff --git a/sql/updates/world/master/2017_11_24_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_24_00_world.sql
index 8d0a561d43b..8d0a561d43b 100644
--- a/sql/updates/world/master/2017_11_24_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_24_00_world.sql
diff --git a/sql/updates/world/master/2017_11_26_00_world_2016_10_30_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_26_00_world_2016_10_30_03_world.sql
index 7994cccdbd0..7994cccdbd0 100644
--- a/sql/updates/world/master/2017_11_26_00_world_2016_10_30_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_26_00_world_2016_10_30_03_world.sql
diff --git a/sql/updates/world/master/2017_11_26_01_world_2016_10_30_04_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_26_01_world_2016_10_30_04_world.sql
index 5737fc9dbb0..5737fc9dbb0 100644
--- a/sql/updates/world/master/2017_11_26_01_world_2016_10_30_04_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_26_01_world_2016_10_30_04_world.sql
diff --git a/sql/updates/world/master/2017_11_26_02_world_2016_10_30_08_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_26_02_world_2016_10_30_08_world.sql
index 0fd201e6cc8..0fd201e6cc8 100644
--- a/sql/updates/world/master/2017_11_26_02_world_2016_10_30_08_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_26_02_world_2016_10_30_08_world.sql
diff --git a/sql/updates/world/master/2017_11_26_03_world_2016_11_01_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_26_03_world_2016_11_01_00_world.sql
index 63647bfdc2e..63647bfdc2e 100644
--- a/sql/updates/world/master/2017_11_26_03_world_2016_11_01_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_26_03_world_2016_11_01_00_world.sql
diff --git a/sql/updates/world/master/2017_11_26_04_world_2016_11_01_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_26_04_world_2016_11_01_02_world.sql
index eb3f95e3e6d..eb3f95e3e6d 100644
--- a/sql/updates/world/master/2017_11_26_04_world_2016_11_01_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_26_04_world_2016_11_01_02_world.sql
diff --git a/sql/updates/world/master/2017_11_26_05_world_2016_11_01_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_26_05_world_2016_11_01_03_world.sql
index 7a551a16ade..7a551a16ade 100644
--- a/sql/updates/world/master/2017_11_26_05_world_2016_11_01_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_26_05_world_2016_11_01_03_world.sql
diff --git a/sql/updates/world/master/2017_11_26_06_world_2016_11_02_00_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_11_26_06_world_2016_11_02_00_world_335.sql
index 86c433ef209..86c433ef209 100644
--- a/sql/updates/world/master/2017_11_26_06_world_2016_11_02_00_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_26_06_world_2016_11_02_00_world_335.sql
diff --git a/sql/updates/world/master/2017_11_26_07_world_2016_11_02_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_26_07_world_2016_11_02_01_world.sql
index d0d4b78c0c3..d0d4b78c0c3 100644
--- a/sql/updates/world/master/2017_11_26_07_world_2016_11_02_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_26_07_world_2016_11_02_01_world.sql
diff --git a/sql/updates/world/master/2017_11_26_08_world_2016_11_02_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_11_26_08_world_2016_11_02_02_world.sql
index 7002536a162..7002536a162 100644
--- a/sql/updates/world/master/2017_11_26_08_world_2016_11_02_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_26_08_world_2016_11_02_02_world.sql
diff --git a/sql/updates/world/master/2017_11_26_09_world_2016_11_02_03_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_11_26_09_world_2016_11_02_03_world_335.sql
index b49502e53c6..b49502e53c6 100644
--- a/sql/updates/world/master/2017_11_26_09_world_2016_11_02_03_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_11_26_09_world_2016_11_02_03_world_335.sql
diff --git a/sql/updates/world/master/2017_12_04_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_12_04_00_world.sql
index 39b5e8177e0..39b5e8177e0 100644
--- a/sql/updates/world/master/2017_12_04_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_12_04_00_world.sql
diff --git a/sql/updates/world/master/2017_12_09_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_12_09_00_world.sql
index 4dde1fe197f..4dde1fe197f 100644
--- a/sql/updates/world/master/2017_12_09_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_12_09_00_world.sql
diff --git a/sql/updates/world/master/2017_12_10_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_12_10_00_world.sql
index 47ead119073..47ead119073 100644
--- a/sql/updates/world/master/2017_12_10_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_12_10_00_world.sql
diff --git a/sql/updates/world/master/2017_12_10_01_world_2016_11_03_01_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_12_10_01_world_2016_11_03_01_world_335.sql
index 058c388799e..058c388799e 100644
--- a/sql/updates/world/master/2017_12_10_01_world_2016_11_03_01_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_12_10_01_world_2016_11_03_01_world_335.sql
diff --git a/sql/updates/world/master/2017_12_10_02_world_2016_11_04_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_12_10_02_world_2016_11_04_01_world.sql
index 0b23027ff68..0b23027ff68 100644
--- a/sql/updates/world/master/2017_12_10_02_world_2016_11_04_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_12_10_02_world_2016_11_04_01_world.sql
diff --git a/sql/updates/world/master/2017_12_10_03_world_2016_11_04_02_world.sql b/sql/old/7/world/01_2018_02_19/2017_12_10_03_world_2016_11_04_02_world.sql
index 8dd6cf4e1f1..8dd6cf4e1f1 100644
--- a/sql/updates/world/master/2017_12_10_03_world_2016_11_04_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_12_10_03_world_2016_11_04_02_world.sql
diff --git a/sql/updates/world/master/2017_12_16_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_12_16_00_world.sql
index 34cf7f6db81..34cf7f6db81 100644
--- a/sql/updates/world/master/2017_12_16_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_12_16_00_world.sql
diff --git a/sql/updates/world/master/2017_12_19_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_12_19_00_world.sql
index e33545dea4b..e33545dea4b 100644
--- a/sql/updates/world/master/2017_12_19_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_12_19_00_world.sql
diff --git a/sql/updates/world/master/2017_12_23_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_12_23_00_world.sql
index bcf641d66da..bcf641d66da 100644
--- a/sql/updates/world/master/2017_12_23_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_12_23_00_world.sql
diff --git a/sql/updates/world/master/2017_12_23_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_12_23_01_world.sql
index 849901121ad..849901121ad 100644
--- a/sql/updates/world/master/2017_12_23_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_12_23_01_world.sql
diff --git a/sql/updates/world/master/2017_12_24_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_12_24_00_world.sql
index 85f57313a3e..85f57313a3e 100644
--- a/sql/updates/world/master/2017_12_24_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_12_24_00_world.sql
diff --git a/sql/updates/world/master/2017_12_26_00_world_2016_11_13_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_12_26_00_world_2016_11_13_00_world.sql
index a92bbc2fb45..a92bbc2fb45 100644
--- a/sql/updates/world/master/2017_12_26_00_world_2016_11_13_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_12_26_00_world_2016_11_13_00_world.sql
diff --git a/sql/updates/world/master/2017_12_30_00_world_2016_11_14_00_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_12_30_00_world_2016_11_14_00_world_335.sql
index 95112247b84..95112247b84 100644
--- a/sql/updates/world/master/2017_12_30_00_world_2016_11_14_00_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_12_30_00_world_2016_11_14_00_world_335.sql
diff --git a/sql/updates/world/master/2017_12_30_01_world_2016_11_15_00_world_335.sql b/sql/old/7/world/01_2018_02_19/2017_12_30_01_world_2016_11_15_00_world_335.sql
index a3baf21d63a..a3baf21d63a 100644
--- a/sql/updates/world/master/2017_12_30_01_world_2016_11_15_00_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_12_30_01_world_2016_11_15_00_world_335.sql
diff --git a/sql/updates/world/master/2017_12_30_02_world_2016_11_15_01_world.sql b/sql/old/7/world/01_2018_02_19/2017_12_30_02_world_2016_11_15_01_world.sql
index dfec95454c1..dfec95454c1 100644
--- a/sql/updates/world/master/2017_12_30_02_world_2016_11_15_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_12_30_02_world_2016_11_15_01_world.sql
diff --git a/sql/updates/world/master/2017_12_30_03_world.sql b/sql/old/7/world/01_2018_02_19/2017_12_30_03_world.sql
index 1d7be946705..1d7be946705 100644
--- a/sql/updates/world/master/2017_12_30_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_12_30_03_world.sql
diff --git a/sql/updates/world/master/2017_12_31_00_world.sql b/sql/old/7/world/01_2018_02_19/2017_12_31_00_world.sql
index 7e9aab77d82..7e9aab77d82 100644
--- a/sql/updates/world/master/2017_12_31_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2017_12_31_00_world.sql
diff --git a/sql/updates/world/master/2018_01_01_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_01_00_world.sql
index 8a5f2bebc1e..8a5f2bebc1e 100644
--- a/sql/updates/world/master/2018_01_01_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_01_00_world.sql
diff --git a/sql/updates/world/master/2018_01_01_01_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_01_01_world.sql
index 18471e496f1..18471e496f1 100644
--- a/sql/updates/world/master/2018_01_01_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_01_01_world.sql
diff --git a/sql/updates/world/master/2018_01_01_02_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_01_02_world.sql
index 892dc419904..892dc419904 100644
--- a/sql/updates/world/master/2018_01_01_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_01_02_world.sql
diff --git a/sql/updates/world/master/2018_01_02_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_02_00_world.sql
index d15d303ca78..d15d303ca78 100644
--- a/sql/updates/world/master/2018_01_02_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_02_00_world.sql
diff --git a/sql/updates/world/master/2018_01_05_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_00_world.sql
index f5ff05a47b8..f5ff05a47b8 100644
--- a/sql/updates/world/master/2018_01_05_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_00_world.sql
diff --git a/sql/updates/world/master/2018_01_05_01_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_01_world.sql
index ffc73f5681c..ffc73f5681c 100644
--- a/sql/updates/world/master/2018_01_05_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_01_world.sql
diff --git a/sql/updates/world/master/2018_01_05_02_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_02_world.sql
index 3a7343a545c..3a7343a545c 100644
--- a/sql/updates/world/master/2018_01_05_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_02_world.sql
diff --git a/sql/updates/world/master/2018_01_05_03_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_03_world.sql
index 8b57600068c..8b57600068c 100644
--- a/sql/updates/world/master/2018_01_05_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_03_world.sql
diff --git a/sql/updates/world/master/2018_01_05_04_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_04_world.sql
index 7aa56548a05..7aa56548a05 100644
--- a/sql/updates/world/master/2018_01_05_04_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_04_world.sql
diff --git a/sql/updates/world/master/2018_01_05_05_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_05_world.sql
index fbebe28a353..fbebe28a353 100644
--- a/sql/updates/world/master/2018_01_05_05_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_05_world.sql
diff --git a/sql/updates/world/master/2018_01_05_06_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_06_world.sql
index 41e878a6f1b..41e878a6f1b 100644
--- a/sql/updates/world/master/2018_01_05_06_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_06_world.sql
diff --git a/sql/updates/world/master/2018_01_05_07_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_07_world.sql
index 1e3ba192fce..1e3ba192fce 100644
--- a/sql/updates/world/master/2018_01_05_07_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_07_world.sql
diff --git a/sql/updates/world/master/2018_01_05_08_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_08_world.sql
index 29008780298..29008780298 100644
--- a/sql/updates/world/master/2018_01_05_08_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_08_world.sql
diff --git a/sql/updates/world/master/2018_01_05_09_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_09_world.sql
index d8918cf67e4..d8918cf67e4 100644
--- a/sql/updates/world/master/2018_01_05_09_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_09_world.sql
diff --git a/sql/updates/world/master/2018_01_05_10_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_10_world.sql
index 15c673022c4..15c673022c4 100644
--- a/sql/updates/world/master/2018_01_05_10_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_10_world.sql
diff --git a/sql/updates/world/master/2018_01_05_11_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_11_world.sql
index dae44d4868d..dae44d4868d 100644
--- a/sql/updates/world/master/2018_01_05_11_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_11_world.sql
diff --git a/sql/updates/world/master/2018_01_05_12_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_12_world.sql
index 5ff3de1ac6e..5ff3de1ac6e 100644
--- a/sql/updates/world/master/2018_01_05_12_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_12_world.sql
diff --git a/sql/updates/world/master/2018_01_05_13_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_13_world.sql
index e4966ee0f7d..e4966ee0f7d 100644
--- a/sql/updates/world/master/2018_01_05_13_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_13_world.sql
diff --git a/sql/updates/world/master/2018_01_05_14_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_14_world.sql
index b233dd229e7..b233dd229e7 100644
--- a/sql/updates/world/master/2018_01_05_14_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_14_world.sql
diff --git a/sql/updates/world/master/2018_01_05_15_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_15_world.sql
index 159dd4bbc6c..159dd4bbc6c 100644
--- a/sql/updates/world/master/2018_01_05_15_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_15_world.sql
diff --git a/sql/updates/world/master/2018_01_05_16_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_16_world.sql
index 51278a33f05..51278a33f05 100644
--- a/sql/updates/world/master/2018_01_05_16_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_16_world.sql
diff --git a/sql/updates/world/master/2018_01_05_17_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_17_world.sql
index e0bc0bc47cf..e0bc0bc47cf 100644
--- a/sql/updates/world/master/2018_01_05_17_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_17_world.sql
diff --git a/sql/updates/world/master/2018_01_05_18_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_18_world.sql
index ae4f9a6ba81..ae4f9a6ba81 100644
--- a/sql/updates/world/master/2018_01_05_18_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_18_world.sql
diff --git a/sql/updates/world/master/2018_01_05_19_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_19_world.sql
index 4f5a95d0cbe..4f5a95d0cbe 100644
--- a/sql/updates/world/master/2018_01_05_19_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_19_world.sql
diff --git a/sql/updates/world/master/2018_01_05_20_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_20_world.sql
index 69622ef230b..69622ef230b 100644
--- a/sql/updates/world/master/2018_01_05_20_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_20_world.sql
diff --git a/sql/updates/world/master/2018_01_05_21_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_05_21_world.sql
index a5ef64d1e34..a5ef64d1e34 100644
--- a/sql/updates/world/master/2018_01_05_21_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_05_21_world.sql
diff --git a/sql/updates/world/master/2018_01_06_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_06_00_world.sql
index 564a943563d..564a943563d 100644
--- a/sql/updates/world/master/2018_01_06_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_06_00_world.sql
diff --git a/sql/updates/world/master/2018_01_06_01_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_06_01_world.sql
index 9cca6ebec4d..9cca6ebec4d 100644
--- a/sql/updates/world/master/2018_01_06_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_06_01_world.sql
diff --git a/sql/updates/world/master/2018_01_06_02_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_06_02_world.sql
index 6a88a7172b4..6a88a7172b4 100644
--- a/sql/updates/world/master/2018_01_06_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_06_02_world.sql
diff --git a/sql/updates/world/master/2018_01_06_03_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_06_03_world.sql
index ef261783aad..ef261783aad 100644
--- a/sql/updates/world/master/2018_01_06_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_06_03_world.sql
diff --git a/sql/updates/world/master/2018_01_06_04_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_06_04_world.sql
index 1a1ceed8a24..1a1ceed8a24 100644
--- a/sql/updates/world/master/2018_01_06_04_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_06_04_world.sql
diff --git a/sql/updates/world/master/2018_01_06_05_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_06_05_world.sql
index 8ff2c938d5c..8ff2c938d5c 100644
--- a/sql/updates/world/master/2018_01_06_05_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_06_05_world.sql
diff --git a/sql/updates/world/master/2018_01_06_06_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_06_06_world.sql
index ebe06d36c60..ebe06d36c60 100644
--- a/sql/updates/world/master/2018_01_06_06_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_06_06_world.sql
diff --git a/sql/updates/world/master/2018_01_06_07_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_06_07_world.sql
index ad704e6fe9d..ad704e6fe9d 100644
--- a/sql/updates/world/master/2018_01_06_07_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_06_07_world.sql
diff --git a/sql/updates/world/master/2018_01_10_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_10_00_world.sql
index 9bba3f60b8b..9bba3f60b8b 100644
--- a/sql/updates/world/master/2018_01_10_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_10_00_world.sql
diff --git a/sql/updates/world/master/2018_01_13_00_world_2016_11_19_00_world_335.sql b/sql/old/7/world/01_2018_02_19/2018_01_13_00_world_2016_11_19_00_world_335.sql
index ae32a91d4d1..ae32a91d4d1 100644
--- a/sql/updates/world/master/2018_01_13_00_world_2016_11_19_00_world_335.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_13_00_world_2016_11_19_00_world_335.sql
diff --git a/sql/updates/world/master/2018_01_14_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_14_00_world.sql
index adb43a5478d..adb43a5478d 100644
--- a/sql/updates/world/master/2018_01_14_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_14_00_world.sql
diff --git a/sql/updates/world/master/2018_01_20_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_20_00_world.sql
index 743752c0f69..743752c0f69 100644
--- a/sql/updates/world/master/2018_01_20_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_20_00_world.sql
diff --git a/sql/updates/world/master/2018_01_20_01_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_20_01_world.sql
index 4ca510bb570..4ca510bb570 100644
--- a/sql/updates/world/master/2018_01_20_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_20_01_world.sql
diff --git a/sql/updates/world/master/2018_01_28_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_28_00_world.sql
index db16731ab7f..db16731ab7f 100644
--- a/sql/updates/world/master/2018_01_28_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_28_00_world.sql
diff --git a/sql/updates/world/master/2018_01_29_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_01_29_00_world.sql
index 06383902c49..06383902c49 100644
--- a/sql/updates/world/master/2018_01_29_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_01_29_00_world.sql
diff --git a/sql/updates/world/master/2018_02_01_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_02_01_00_world.sql
index 34ff35f7dc4..34ff35f7dc4 100644
--- a/sql/updates/world/master/2018_02_01_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_02_01_00_world.sql
diff --git a/sql/updates/world/master/2018_02_02_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_02_02_00_world.sql
index c0fc3298875..c0fc3298875 100644
--- a/sql/updates/world/master/2018_02_02_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_02_02_00_world.sql
diff --git a/sql/updates/world/master/2018_02_02_01_world.sql b/sql/old/7/world/01_2018_02_19/2018_02_02_01_world.sql
index 6ca8a8bc872..6ca8a8bc872 100644
--- a/sql/updates/world/master/2018_02_02_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_02_02_01_world.sql
diff --git a/sql/updates/world/master/2018_02_04_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_02_04_00_world.sql
index 62df8eca762..62df8eca762 100644
--- a/sql/updates/world/master/2018_02_04_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_02_04_00_world.sql
diff --git a/sql/updates/world/master/2018_02_11_00_world_2016_11_20_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_02_11_00_world_2016_11_20_00_world.sql
index 2326ec439a0..2326ec439a0 100644
--- a/sql/updates/world/master/2018_02_11_00_world_2016_11_20_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_02_11_00_world_2016_11_20_00_world.sql
diff --git a/sql/updates/world/master/2018_02_11_01_world_2016_11_20_01_world.sql b/sql/old/7/world/01_2018_02_19/2018_02_11_01_world_2016_11_20_01_world.sql
index e93887bedc7..e93887bedc7 100644
--- a/sql/updates/world/master/2018_02_11_01_world_2016_11_20_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_02_11_01_world_2016_11_20_01_world.sql
diff --git a/sql/updates/world/master/2018_02_11_02_world_2016_11_20_02_world.sql b/sql/old/7/world/01_2018_02_19/2018_02_11_02_world_2016_11_20_02_world.sql
index 3ffff8aaedf..3ffff8aaedf 100644
--- a/sql/updates/world/master/2018_02_11_02_world_2016_11_20_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_02_11_02_world_2016_11_20_02_world.sql
diff --git a/sql/updates/world/master/2018_02_11_03_world_2016_11_23_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_02_11_03_world_2016_11_23_00_world.sql
index ccbb4b3a6cf..ccbb4b3a6cf 100644
--- a/sql/updates/world/master/2018_02_11_03_world_2016_11_23_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_02_11_03_world_2016_11_23_00_world.sql
diff --git a/sql/updates/world/master/2018_02_11_04_world_2016_11_16_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_02_11_04_world_2016_11_16_00_world.sql
index 9a046d72499..9a046d72499 100644
--- a/sql/updates/world/master/2018_02_11_04_world_2016_11_16_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_02_11_04_world_2016_11_16_00_world.sql
diff --git a/sql/updates/world/master/2018_02_11_05_world_2016_11_26_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_02_11_05_world_2016_11_26_00_world.sql
index 36049ecccd2..36049ecccd2 100644
--- a/sql/updates/world/master/2018_02_11_05_world_2016_11_26_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_02_11_05_world_2016_11_26_00_world.sql
diff --git a/sql/updates/world/master/2018_02_11_06_world_2016_11_26_01_world.sql b/sql/old/7/world/01_2018_02_19/2018_02_11_06_world_2016_11_26_01_world.sql
index 5a521526f62..5a521526f62 100644
--- a/sql/updates/world/master/2018_02_11_06_world_2016_11_26_01_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_02_11_06_world_2016_11_26_01_world.sql
diff --git a/sql/updates/world/master/2018_02_11_07_world_2016_11_26_02_world.sql b/sql/old/7/world/01_2018_02_19/2018_02_11_07_world_2016_11_26_02_world.sql
index db6f5470a91..db6f5470a91 100644
--- a/sql/updates/world/master/2018_02_11_07_world_2016_11_26_02_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_02_11_07_world_2016_11_26_02_world.sql
diff --git a/sql/updates/world/master/2018_02_11_08_world_2016_11_26_03_world.sql b/sql/old/7/world/01_2018_02_19/2018_02_11_08_world_2016_11_26_03_world.sql
index e6af3773be1..e6af3773be1 100644
--- a/sql/updates/world/master/2018_02_11_08_world_2016_11_26_03_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_02_11_08_world_2016_11_26_03_world.sql
diff --git a/sql/updates/world/master/2018_02_11_09_world_2016_11_26_04_world.sql b/sql/old/7/world/01_2018_02_19/2018_02_11_09_world_2016_11_26_04_world.sql
index 2ab7c3baff3..2ab7c3baff3 100644
--- a/sql/updates/world/master/2018_02_11_09_world_2016_11_26_04_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_02_11_09_world_2016_11_26_04_world.sql
diff --git a/sql/updates/world/master/2018_02_19_00_world.sql b/sql/old/7/world/01_2018_02_19/2018_02_19_00_world.sql
index 7f44f654d1b..7f44f654d1b 100644
--- a/sql/updates/world/master/2018_02_19_00_world.sql
+++ b/sql/old/7/world/01_2018_02_19/2018_02_19_00_world.sql
diff --git a/sql/updates/auth/master/2018_02_19_00_auth.sql b/sql/updates/auth/master/2018_02_19_00_auth.sql
new file mode 100644
index 00000000000..ff96110bac2
--- /dev/null
+++ b/sql/updates/auth/master/2018_02_19_00_auth.sql
@@ -0,0 +1,2 @@
+-- TDB 735.00 auth
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/characters/master/2018_02_19_00_characters.sql b/sql/updates/characters/master/2018_02_19_00_characters.sql
new file mode 100644
index 00000000000..b5811a110df
--- /dev/null
+++ b/sql/updates/characters/master/2018_02_19_00_characters.sql
@@ -0,0 +1,2 @@
+-- TDB 735.00 characters
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/hotfixes/master/2018_02_19_00_hotfixes.sql b/sql/updates/hotfixes/master/2018_02_19_00_hotfixes.sql
new file mode 100644
index 00000000000..673b63701a1
--- /dev/null
+++ b/sql/updates/hotfixes/master/2018_02_19_00_hotfixes.sql
@@ -0,0 +1,2 @@
+-- TDB 735.00 hotfixes
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/world/master/2018_02_19_01_world.sql b/sql/updates/world/master/2018_02_19_01_world.sql
new file mode 100644
index 00000000000..82bb10c18fc
--- /dev/null
+++ b/sql/updates/world/master/2018_02_19_01_world.sql
@@ -0,0 +1,3 @@
+-- TDB 735.00 world
+UPDATE `updates` SET `state`='ARCHIVED';
+UPDATE `version` SET `db_version`='TDB 735.00', `cache_id`=7 LIMIT 1;