327 files changed, 3814 insertions, 810 deletions

diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 77695ed80a5..43ba4afe22e 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.16  Distrib 10.1.16-MariaDB, for Win64 (AMD64)
+-- MySQL dump 10.16  Distrib 10.1.6-MariaDB, for Win64 (AMD64)
 --
--- Host: localhost    Database: auth
+-- Host: localhost    Database: auth6
 -- ------------------------------------------------------
--- Server version	10.1.16-MariaDB
+-- Server version	5.7.14-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -616,7 +616,7 @@ 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 (0,195,-1),(1,194,-1),(2,193,-1),(3,192,-1);
+INSERT INTO `rbac_default_permissions` VALUES (3,192,-1),(2,193,-1),(1,194,-1),(0,195,-1);
 /*!40000 ALTER TABLE `rbac_default_permissions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -721,7 +721,7 @@ CREATE TABLE `realmlist` (
   `Battlegroup` tinyint(3) unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   UNIQUE KEY `idx_name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Realm System';
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='Realm System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -757,7 +757,7 @@ CREATE TABLE `updates` (
 
 LOCK TABLES `updates` WRITE;
 /*!40000 ALTER TABLE `updates` DISABLE KEYS */;
-INSERT INTO `updates` VALUES ('2014_10_04_00_auth.sql','C3BC70A6EC381474B7308F442346F1E721176BC6','ARCHIVED','2015-03-21 16:55:52',0),('2014_10_19_00_auth.sql','7472B490A4F86C9D3DA609CDD3197499CB80C87C','ARCHIVED','2015-03-21 16:55:52',0),('2014_10_26_00_auth.sql','75CC67ADE2A3B2E54FD57D6B0DCAA8FE50F4EE35','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_03_00_auth.sql','5948C9F286CF0FEA8E241785C0259FF36B73BDC5','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_04_00_auth.sql','3AFC68B2375C2A417DDEA94583C53AFF83DE50DF','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_09_00_auth.sql','B8DD1A7047C0FDDB80344B239343EC33BF1A0D97','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_10_00_auth.sql','8FBA737A1D3FF4631A1E662A5B500A8BD304EC63','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_10_00_auth_from_335.sql','0E3CB119442D09DD88E967015319BBC8DAFBBFE0','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_10_01_auth.sql','327E77A1DA3546D5275AB249915DD57EDD6FDD3D','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_23_00_auth.sql','0BBEB3EB3AED0FEF277A062819B6B2C00084A742','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_25_00_auth.sql','4F45CDB26BDBB3EE83F1988E3D7818C5926ADC02','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_05_00_auth.sql','6A7BBCEF43111C73A2D2C3CCB6911BE50DE7DD94','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_10_00_auth.sql','821703A96D80F9080074852B5A46E2909C9562EA','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_19_00_auth.sql','44D8E12FFF327AD07878FBDF8D9C16B6B7DCB122','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_20_00_auth.sql','4DAA02AE285C02AE6C82EA2C8B97AC71990F1085','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_25_00_auth.sql','61411930F482BC73FC7FD2C370C811E944F5FF92','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_27_00_auth.sql','CE2E5D2CD82E79C25294539ADED27A1429105B43','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_28_00_auth.sql','0A913217610E76AFF119C27259737BBC523090E6','ARCHIVED','2015-03-21 16:55:52',0),('2015_02_22_00_auth.sql','21CCCF8B01252E16CA3D6C9E3E8DAA4C9B28ED6E','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_01_00_auth.sql','911881E273207FF6182D1FDAC8C85FFAE8F1C852','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_10_00_auth.sql','2CC8502C11412EFEB5C11BE166761A8754A59009','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_20_00_auth.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_20_01_auth.sql','5CCEDF20C8189FB1E8DF064A9F0DDC342841FBF0','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_20_02_auth.sql','85E4ACD9AA099C0C4AC034575F2BB07D348EAC72','ARCHIVED','2015-03-21 16:56:46',0),('2015_03_15_00_auth.sql','1D8E107FBEFE5E7F47E09F45240DFF499B77CDED','ARCHIVED','2015-05-02 13:57:57',0),('2015_03_26_00_auth.sql','34AC8543E6A9C6C832DE58EAB33618EEEF70B9F9','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_04_00_auth.sql','57146B35E54A2EC7869C945034AB078358020311','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_06_00_auth.sql','2A8049DC2923420A002D42FB6F02C2FFCC5CDD22','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_08_00_auth.sql','4D7D8EEF285C982BB676836602266501BEC26764','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_10_00_auth.sql','4AE68FD97A95CEE5143EA20FD33F5D557367AC1F','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_11_00_auth.sql','80A71C8921CFEBB547D264558B6DE27201685B84','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_11_01_auth.sql','3E88183E1A85D11BFD74CF9A32A725C44AE02EEC','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_21_00_auth.sql','1B3B48DBA06368B985C548D166C515C9DD598CB9','ARCHIVED','2015-05-02 13:57:57',0),('2015_05_02_00_auth.sql','96AB595E0D2A088750E3F48B0AF0A8A14F3CFE1E','ARCHIVED','2015-05-02 13:57:57',0),('2015_05_02_01_auth.sql','FB11FB834E488B0FD3AFDABCC1A3113092E7C2E5','ARCHIVED','2015-05-02 13:57:57',0),('2015_07_02_00_auth.sql','E5EE3842AB9B01851E49B360FBAF6FFEEAB2A8DA','ARCHIVED','2015-07-10 19:30:56',0),('2015_07_06_00_auth.sql','6D1ADBA496DC6E6D7B3BF887DA8D4D17D3FBACE0','ARCHIVED','2015-07-10 19:30:56',0),('2015_07_08_00_auth.sql','CB54020AFD1E31742FD8BF9CE16879625E289788','ARCHIVED','2015-07-10 19:30:56',0),('2015_07_08_01_auth.sql','74D281CB82E0DA36D628BDC7AC797AE5498DB461','ARCHIVED','2015-07-10 19:30:56',0),('2015_07_16_00_auth.sql','A057E95B5553B6A57A1642FE3FEC8E2E62EDE3C6','ARCHIVED','2015-10-10 08:30:48',0),('2015_07_29_00_auth.sql','0000FECBC413E96C7C45F303D162E263EFBA7116','ARCHIVED','2015-10-10 08:30:48',0),('2015_08_26_00_auth.sql','3071C02A2EB7DCBF4CEE10279FEFAB7C29A43A3A','ARCHIVED','2015-10-10 08:30:48',0),('2015_09_05_00_auth.sql','F765D82B37873FA67447347D5B83C99C159FB452','ARCHIVED','2015-10-10 08:30:48',0),('2015_09_05_01_auth.sql','97A72DBCBF14D27A1863834A22296905FF276086','ARCHIVED','2015-10-10 08:30:48',0),('2015_09_09_00_auth.sql','495A0CF1B1C49205D4A5D3C25A4E1EB95616D6B4','ARCHIVED','2015-10-10 08:30:48',0),('2015_09_15_00_auth.sql','D1FEFDA4C98F30384DF4B64D5A53187303EB5786','ARCHIVED','2015-10-10 08:30:48',0),('2015_10_09_00_auth.sql','B6D643D444C6AE711503F73B96B6252A852913D6','ARCHIVED','2015-10-10 08:30:48',0),('2015_10_16_00_auth.sql','366AFFD1088762866091A81CE1EC64138B8B35F1','ARCHIVED','2015-11-08 00:46:02',62),('2015_10_17_00_auth.sql','AC0D45E905033F42093852D2C4476663BDACCB3D','ARCHIVED','2015-10-17 12:39:12',0),('2015_11_01_00_auth_2015_08_21_00.sql','C31A9E1D28E11B60BE8F8198637DD51F6D75123F','ARCHIVED','2015-11-01 14:50:26',0),('2015_11_08_00_auth.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2015-11-08 00:51:45',0),('2015_11_21_00_auth.sql','575A1D697CC6C7C517F7CCB950988267C99CE7FA','ARCHIVED','2015-11-21 21:25:38',0),('2015_12_07_00_auth.sql','24A07AC1F38E5D26A3599FC06D29E267418F69F3','ARCHIVED','2015-12-07 20:55:48',0),('2016_01_13_00_auth.sql','114527BCCB0DE286CBE6FDA3029DD0523D1037FA','ARCHIVED','2016-01-13 21:39:13',0),('2016_03_22_01_auth_2016_01_13_00_auth.sql','24615CC69B3CD7BB4699874647C35BA86E8A93FD','ARCHIVED','2016-03-22 22:55:13',0),('2016_03_28_00_auth.sql','BA14D23D81FA24565F04A359090DE86C5E195209','ARCHIVED','2016-03-28 16:49:32',0),('2016_04_11_00_auth.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','RELEASED','2016-04-11 02:24:14',30),('2016_04_17_00_auth.sql','83399B64D1221B56F73A0FFB51889F11A70521BC','RELEASED','2016-04-17 00:22:05',0),('2016_05_07_00_auth.sql','7E36DCC4F06FCDCDA7155AF3C5EDF8D3A720565F','RELEASED','2016-05-07 01:00:21',0),('2016_05_19_00_auth.sql','FB52E6BF35682CE6FA667B552B551F4FBD72AC30','RELEASED','2016-05-19 22:18:06',0),('2016_07_19_00_auth.sql','D5498F28A1E21F4AD0E0D7C2B96FCF7292C14C4D','RELEASED','2016-07-19 14:00:28',0),('2016_07_19_01_auth.sql','EBFE5D7D7E7CFA0CDA76AC49A1E8D4FA461A12BE','RELEASED','2016-07-19 16:06:39',0),('2016_07_23_00_auth.sql','1048F6A922ACD9BFC2E4518A71AF7037F79A85C4','RELEASED','2016-07-23 14:39:21',0),('2016_07_23_01_auth.sql','5897C7D8B8DE15895286FBCD1535FC75E1B70F62','RELEASED','2016-07-23 17:35:11',0),('2016_07_30_00_auth.sql','0FD4147840F7F02E2F1828A904B269F5B66097E0','RELEASED','2016-07-30 15:07:02',0),('2016_08_07_00_auth.sql','D9DD23851822E32E1312FFABEE2DB721C8651443','RELEASED','2016-08-07 15:33:42',0),('2016_08_11_00_auth.sql','0C79A86A4DFC53746BECF3D8A145482F94AE5FC9','RELEASED','2016-08-11 17:02:20',0),('2016_08_13_00_auth.sql','ED2286C4FF3D80D0F4DEE3D3121BCC15544470BE','RELEASED','2016-08-13 01:11:49',0),('2016_08_26_00_auth.sql','3C566371B6026EFEEA19CD215EC9F02C6DA9EAB3','RELEASED','2016-08-26 14:09:52',19),('2016_08_27_00_auth.sql','65ABEF7ACBCEA974C744ED42F95FBBD29226917B','RELEASED','2016-08-27 07:02:45',0),('2016_08_30_00_auth.sql','E16C19A938FE6370921658D2B713EE28A633FD56','RELEASED','2016-08-30 00:00:00',0),('2016_09_02_00_auth.sql','08932DAC4BDE74D3C39A43DDE404522F23EDD035','RELEASED','2016-09-02 00:00:00',0),('2016_09_03_00_auth_2016_05_11_00_auth.sql','401EFD3586772BDED66B4A944C20A1AC18A22D3A','RELEASED','2016-09-03 11:29:38',0),('2016_09_03_01_auth.sql','08B5ABCB74BBF25A30D37AF639F0EA1B10640673','RELEASED','2016-09-03 13:24:32',0),('2016_09_03_02_auth_2016_06_06_00_auth.sql','A0A8D73A952D0618833416513D53F73A70E7EA25','RELEASED','2016-09-03 15:56:50',0),('2016_09_03_03_auth.sql','9BF1C03EE39B6DC7E817BA46BE7D12A41AFBFDF7','RELEASED','2016-09-03 15:56:50',0),('2016_09_15_00_auth.sql','CD65F822AF1B5B7776E39804D0362F3E34AA6445','RELEASED','2016-09-15 16:30:36',0),('2016_09_21_00_auth.sql','57219A16B88080240EED94CDD41FC2764B8A32C5','RELEASED','2016-09-21 17:08:43',0),('2016_09_25_00_auth.sql','E811EFD8CE92ABEC5B8C02A09E643035939CF96D','RELEASED','2016-09-25 15:56:58',0),('2016_10_01_00_auth.sql','7C444FF1B03BA3C83472BDA409854754D052D6FB','RELEASED','2016-10-01 13:32:43',0),('2016_10_06_00_auth.sql','6A415F9813EFB5B95EB2AA2B326E1A6791E25EDB','RELEASED','2016-10-06 23:16:24',0),('2016_10_12_00_auth.sql','671D57BBA183AC70B9580DEE19B7EC046AF2EA87','RELEASED','2016-10-12 00:01:05',0);
+INSERT INTO `updates` VALUES ('2014_10_04_00_auth.sql','C3BC70A6EC381474B7308F442346F1E721176BC6','ARCHIVED','2015-03-21 16:55:52',0),('2014_10_19_00_auth.sql','7472B490A4F86C9D3DA609CDD3197499CB80C87C','ARCHIVED','2015-03-21 16:55:52',0),('2014_10_26_00_auth.sql','75CC67ADE2A3B2E54FD57D6B0DCAA8FE50F4EE35','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_03_00_auth.sql','5948C9F286CF0FEA8E241785C0259FF36B73BDC5','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_04_00_auth.sql','3AFC68B2375C2A417DDEA94583C53AFF83DE50DF','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_09_00_auth.sql','B8DD1A7047C0FDDB80344B239343EC33BF1A0D97','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_10_00_auth.sql','8FBA737A1D3FF4631A1E662A5B500A8BD304EC63','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_10_00_auth_from_335.sql','0E3CB119442D09DD88E967015319BBC8DAFBBFE0','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_10_01_auth.sql','327E77A1DA3546D5275AB249915DD57EDD6FDD3D','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_23_00_auth.sql','0BBEB3EB3AED0FEF277A062819B6B2C00084A742','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_25_00_auth.sql','4F45CDB26BDBB3EE83F1988E3D7818C5926ADC02','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_05_00_auth.sql','6A7BBCEF43111C73A2D2C3CCB6911BE50DE7DD94','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_10_00_auth.sql','821703A96D80F9080074852B5A46E2909C9562EA','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_19_00_auth.sql','44D8E12FFF327AD07878FBDF8D9C16B6B7DCB122','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_20_00_auth.sql','4DAA02AE285C02AE6C82EA2C8B97AC71990F1085','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_25_00_auth.sql','61411930F482BC73FC7FD2C370C811E944F5FF92','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_27_00_auth.sql','CE2E5D2CD82E79C25294539ADED27A1429105B43','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_28_00_auth.sql','0A913217610E76AFF119C27259737BBC523090E6','ARCHIVED','2015-03-21 16:55:52',0),('2015_02_22_00_auth.sql','21CCCF8B01252E16CA3D6C9E3E8DAA4C9B28ED6E','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_01_00_auth.sql','911881E273207FF6182D1FDAC8C85FFAE8F1C852','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_10_00_auth.sql','2CC8502C11412EFEB5C11BE166761A8754A59009','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_20_00_auth.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_20_01_auth.sql','5CCEDF20C8189FB1E8DF064A9F0DDC342841FBF0','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_20_02_auth.sql','85E4ACD9AA099C0C4AC034575F2BB07D348EAC72','ARCHIVED','2015-03-21 16:56:46',0),('2015_03_15_00_auth.sql','1D8E107FBEFE5E7F47E09F45240DFF499B77CDED','ARCHIVED','2015-05-02 13:57:57',0),('2015_03_26_00_auth.sql','34AC8543E6A9C6C832DE58EAB33618EEEF70B9F9','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_04_00_auth.sql','57146B35E54A2EC7869C945034AB078358020311','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_06_00_auth.sql','2A8049DC2923420A002D42FB6F02C2FFCC5CDD22','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_08_00_auth.sql','4D7D8EEF285C982BB676836602266501BEC26764','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_10_00_auth.sql','4AE68FD97A95CEE5143EA20FD33F5D557367AC1F','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_11_00_auth.sql','80A71C8921CFEBB547D264558B6DE27201685B84','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_11_01_auth.sql','3E88183E1A85D11BFD74CF9A32A725C44AE02EEC','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_21_00_auth.sql','1B3B48DBA06368B985C548D166C515C9DD598CB9','ARCHIVED','2015-05-02 13:57:57',0),('2015_05_02_00_auth.sql','96AB595E0D2A088750E3F48B0AF0A8A14F3CFE1E','ARCHIVED','2015-05-02 13:57:57',0),('2015_05_02_01_auth.sql','FB11FB834E488B0FD3AFDABCC1A3113092E7C2E5','ARCHIVED','2015-05-02 13:57:57',0),('2015_07_02_00_auth.sql','E5EE3842AB9B01851E49B360FBAF6FFEEAB2A8DA','ARCHIVED','2015-07-10 19:30:56',0),('2015_07_06_00_auth.sql','6D1ADBA496DC6E6D7B3BF887DA8D4D17D3FBACE0','ARCHIVED','2015-07-10 19:30:56',0),('2015_07_08_00_auth.sql','CB54020AFD1E31742FD8BF9CE16879625E289788','ARCHIVED','2015-07-10 19:30:56',0),('2015_07_08_01_auth.sql','74D281CB82E0DA36D628BDC7AC797AE5498DB461','ARCHIVED','2015-07-10 19:30:56',0),('2015_07_16_00_auth.sql','A057E95B5553B6A57A1642FE3FEC8E2E62EDE3C6','ARCHIVED','2015-10-10 08:30:48',0),('2015_07_29_00_auth.sql','0000FECBC413E96C7C45F303D162E263EFBA7116','ARCHIVED','2015-10-10 08:30:48',0),('2015_08_26_00_auth.sql','3071C02A2EB7DCBF4CEE10279FEFAB7C29A43A3A','ARCHIVED','2015-10-10 08:30:48',0),('2015_09_05_00_auth.sql','F765D82B37873FA67447347D5B83C99C159FB452','ARCHIVED','2015-10-10 08:30:48',0),('2015_09_05_01_auth.sql','97A72DBCBF14D27A1863834A22296905FF276086','ARCHIVED','2015-10-10 08:30:48',0),('2015_09_09_00_auth.sql','495A0CF1B1C49205D4A5D3C25A4E1EB95616D6B4','ARCHIVED','2015-10-10 08:30:48',0),('2015_09_15_00_auth.sql','D1FEFDA4C98F30384DF4B64D5A53187303EB5786','ARCHIVED','2015-10-10 08:30:48',0),('2015_10_09_00_auth.sql','B6D643D444C6AE711503F73B96B6252A852913D6','ARCHIVED','2015-10-10 08:30:48',0),('2015_10_16_00_auth.sql','366AFFD1088762866091A81CE1EC64138B8B35F1','ARCHIVED','2015-11-08 00:46:02',62),('2015_10_17_00_auth.sql','AC0D45E905033F42093852D2C4476663BDACCB3D','ARCHIVED','2015-10-17 12:39:12',0),('2015_11_01_00_auth_2015_08_21_00.sql','C31A9E1D28E11B60BE8F8198637DD51F6D75123F','ARCHIVED','2015-11-01 14:50:26',0),('2015_11_08_00_auth.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2015-11-08 00:51:45',0),('2015_11_21_00_auth.sql','575A1D697CC6C7C517F7CCB950988267C99CE7FA','ARCHIVED','2015-11-21 21:25:38',0),('2015_12_07_00_auth.sql','24A07AC1F38E5D26A3599FC06D29E267418F69F3','ARCHIVED','2015-12-07 20:55:48',0),('2016_01_13_00_auth.sql','114527BCCB0DE286CBE6FDA3029DD0523D1037FA','ARCHIVED','2016-01-13 21:39:13',0),('2016_03_22_01_auth_2016_01_13_00_auth.sql','24615CC69B3CD7BB4699874647C35BA86E8A93FD','ARCHIVED','2016-03-22 22:55:13',0),('2016_03_28_00_auth.sql','BA14D23D81FA24565F04A359090DE86C5E195209','ARCHIVED','2016-03-28 16:49:32',0),('2016_04_11_00_auth.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-04-11 02:24:14',30),('2016_04_17_00_auth.sql','83399B64D1221B56F73A0FFB51889F11A70521BC','ARCHIVED','2016-04-17 00:22:05',0),('2016_05_07_00_auth.sql','7E36DCC4F06FCDCDA7155AF3C5EDF8D3A720565F','ARCHIVED','2016-05-07 01:00:21',0),('2016_05_19_00_auth.sql','FB52E6BF35682CE6FA667B552B551F4FBD72AC30','ARCHIVED','2016-05-19 22:18:06',0),('2016_07_19_00_auth.sql','D5498F28A1E21F4AD0E0D7C2B96FCF7292C14C4D','ARCHIVED','2016-07-19 14:00:28',0),('2016_07_19_01_auth.sql','EBFE5D7D7E7CFA0CDA76AC49A1E8D4FA461A12BE','ARCHIVED','2016-07-19 16:06:39',0),('2016_07_23_00_auth.sql','1048F6A922ACD9BFC2E4518A71AF7037F79A85C4','ARCHIVED','2016-07-23 14:39:21',0),('2016_07_23_01_auth.sql','5897C7D8B8DE15895286FBCD1535FC75E1B70F62','ARCHIVED','2016-07-23 17:35:11',0),('2016_07_30_00_auth.sql','0FD4147840F7F02E2F1828A904B269F5B66097E0','ARCHIVED','2016-07-30 15:07:02',0),('2016_08_07_00_auth.sql','D9DD23851822E32E1312FFABEE2DB721C8651443','ARCHIVED','2016-08-07 15:33:42',0),('2016_08_11_00_auth.sql','0C79A86A4DFC53746BECF3D8A145482F94AE5FC9','ARCHIVED','2016-08-11 17:02:20',0),('2016_08_13_00_auth.sql','ED2286C4FF3D80D0F4DEE3D3121BCC15544470BE','ARCHIVED','2016-08-13 01:11:49',0),('2016_08_26_00_auth.sql','3C566371B6026EFEEA19CD215EC9F02C6DA9EAB3','ARCHIVED','2016-08-26 14:09:52',19),('2016_08_27_00_auth.sql','65ABEF7ACBCEA974C744ED42F95FBBD29226917B','ARCHIVED','2016-08-27 07:02:45',0),('2016_08_30_00_auth.sql','E16C19A938FE6370921658D2B713EE28A633FD56','ARCHIVED','2016-08-30 00:00:00',0),('2016_09_02_00_auth.sql','08932DAC4BDE74D3C39A43DDE404522F23EDD035','ARCHIVED','2016-09-02 00:00:00',0),('2016_09_03_00_auth_2016_05_11_00_auth.sql','401EFD3586772BDED66B4A944C20A1AC18A22D3A','ARCHIVED','2016-09-03 11:29:38',0),('2016_09_03_01_auth.sql','08B5ABCB74BBF25A30D37AF639F0EA1B10640673','ARCHIVED','2016-09-03 13:24:32',0),('2016_09_03_02_auth_2016_06_06_00_auth.sql','A0A8D73A952D0618833416513D53F73A70E7EA25','ARCHIVED','2016-09-03 15:56:50',0),('2016_09_03_03_auth.sql','9BF1C03EE39B6DC7E817BA46BE7D12A41AFBFDF7','ARCHIVED','2016-09-03 15:56:50',0),('2016_09_15_00_auth.sql','CD65F822AF1B5B7776E39804D0362F3E34AA6445','ARCHIVED','2016-09-15 16:30:36',0),('2016_09_21_00_auth.sql','57219A16B88080240EED94CDD41FC2764B8A32C5','ARCHIVED','2016-09-21 17:08:43',0),('2016_09_25_00_auth.sql','E811EFD8CE92ABEC5B8C02A09E643035939CF96D','ARCHIVED','2016-09-25 15:56:58',0),('2016_10_01_00_auth.sql','7C444FF1B03BA3C83472BDA409854754D052D6FB','ARCHIVED','2016-10-01 13:32:43',0),('2016_10_06_00_auth.sql','6A415F9813EFB5B95EB2AA2B326E1A6791E25EDB','ARCHIVED','2016-10-06 23:16:24',0),('2016_10_12_00_auth.sql','671D57BBA183AC70B9580DEE19B7EC046AF2EA87','ARCHIVED','2016-10-12 00:01:05',0),('2016_10_17_00_auth.sql','A0EF594CD73690D46A46031137DB0E895F079235','RELEASED','2016-10-16 16:33:05',19);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -820,4 +820,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-09-03 17:56:56
+-- Dump completed on 2016-10-16 17:35:47
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 6e7b301f39c..4a4fc66ba21 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.6.26, for Win64 (x86_64)
+-- MySQL dump 10.16  Distrib 10.1.6-MariaDB, for Win64 (AMD64)
 --
--- Host: localhost    Database: characters
+-- Host: localhost    Database: characters6
 -- ------------------------------------------------------
--- Server version	5.6.26-log
+-- Server version	5.7.14-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -899,7 +899,7 @@ DROP TABLE IF EXISTS `character_glyphs`;
 CREATE TABLE `character_glyphs` (
   `guid` bigint(20) unsigned NOT NULL,
   `talentGroup` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `glyphId` smallint(5) unsigned DEFAULT '0',
+  `glyphId` smallint(5) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`,`talentGroup`,`glyphId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2636,13 +2636,13 @@ DROP TABLE IF EXISTS `item_instance_gems`;
 CREATE TABLE `item_instance_gems` (
   `itemGuid` bigint(20) unsigned NOT NULL,
   `gemItemId1` int(10) unsigned DEFAULT NULL,
-  `gemBonuses1` TEXT,
+  `gemBonuses1` text,
   `gemContext1` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `gemItemId2` int(10) unsigned DEFAULT NULL,
-  `gemBonuses2` TEXT,
+  `gemBonuses2` text,
   `gemContext2` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `gemItemId3` int(10) unsigned DEFAULT NULL,
-  `gemBonuses3` TEXT,
+  `gemBonuses3` text,
   `gemContext3` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemGuid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -2657,6 +2657,7 @@ LOCK TABLES `item_instance_gems` WRITE;
 /*!40000 ALTER TABLE `item_instance_gems` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
 -- Table structure for table `item_instance_modifiers`
 --
 
@@ -3244,7 +3245,7 @@ CREATE TABLE `updates` (
 
 LOCK TABLES `updates` WRITE;
 /*!40000 ALTER TABLE `updates` DISABLE KEYS */;
-INSERT INTO `updates` VALUES ('2014_10_20_00_characters.sql','A5882DA0979CF4DAE33DA011EBAA006C24BE7230','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_23_00_characters.sql','E2AC4758133EE19B7F08464A445802154D1261C8','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_23_01_characters.sql','20029E6323D9773B32C34D84FFED1711CC60F09F','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_23_02_characters.sql','8A7A16886EE71E7ACDDB3DDA6D0ECAC2FD2FDCA8','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_24_00_characters.sql','D008FE81AE844FCA686439D6ECC5108FB0DD1EB9','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_25_00_characters.sql','A39C7BE46686B54776BDAB9D7A882D91EDEC51A4','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_26_00_characters.sql','C787954CC35FE34B4101FDE6527F14C027F4947C','ARCHIVED','2015-03-21 15:55:55',0),('2014_11_12_00_characters.sql','B160BB2313F1BD5F3B076A5A9279DC10D4796E34','ARCHIVED','2015-03-21 15:55:55',0),('2014_12_23_00_characters.sql','3D9D648B2387B357F4BD090B33F80682F7924882','ARCHIVED','2015-03-21 15:55:55',0),('2014_12_28_00_characters.sql','5362922FF4483A336311D73082A5727309CD9219','ARCHIVED','2015-03-21 15:55:55',0),('2014_12_31_00_characters.sql','498DDF2DD936CF156D74A8208DC93DCE9FCAB5AA','ARCHIVED','2015-03-21 15:55:55',0),('2015_01_02_00_characters.sql','E5940BE836F253982E07930120422E598D08BDE1','ARCHIVED','2015-03-21 15:55:55',0),('2015_01_10_00_characters.sql','30796056C8623699B2FE1BF626A19D38262E9284','ARCHIVED','2015-03-21 15:55:55',0),('2015_01_16_00_characters.sql','96642760A54C8D799AAFE438049A63AA521656F2','ARCHIVED','2015-03-21 15:55:55',0),('2015_01_27_00_characters.sql','EB710E3EB9F2CAFD84AB62CDC84E898403A80A4F','ARCHIVED','2015-03-21 15:55:55',0),('2015_02_13_00_characters.sql','405BEB4ED207DC6076442A37EE2AFB1F21E274A0','ARCHIVED','2015-03-21 15:55:55',0),('2015_02_13_01_characters.sql','35F582D4F33BF55D1685A1BA89273ED895FD09C5','ARCHIVED','2015-03-21 15:55:55',0),('2015_02_17_00_characters.sql','8D21FC5A55BF8B55D6DCDCE5F02CF2B640230E94','ARCHIVED','2015-03-21 15:55:55',0),('2015_03_10_00_characters.sql','E565B89B145C340067742DFF2DEF1B74F5F1BD4E','ARCHIVED','2015-03-21 15:55:55',0),('2015_03_20_00_characters.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 15:55:55',0),('2015_03_20_01_characters.sql','20BD68468C57FCF7E665B4DA185DCD52FACE8B3F','ARCHIVED','2015-03-21 15:55:55',0),('2015_03_20_02_characters.sql','0296995DCD3676BA9AE6024CA7C91C5F39D927A3','ARCHIVED','2015-03-21 15:56:46',0),('2015_03_29_00_characters.sql','95D6A46BB746A8BD3EE3FE2086DF1A07F7C33B92','ARCHIVED','2015-05-02 15:43:06',0),('2015_04_21_00_characters.sql','F2032B9BF4EDA7EDE5065554724ED392FD91657D','ARCHIVED','2015-05-02 15:43:06',0),('2015_04_28_00_characters.sql','949F62DB3A3461D420A1230ECF7A6A3ED6435703','ARCHIVED','2015-05-02 15:43:06',0),('2015_05_08_00_characters.sql','0F14B7821618D1C872625B6EDDAA9A667B211167','ARCHIVED','2015-07-10 19:32:17',0),('2015_05_22_00_characters.sql','65B82152413FAB23BE413656E59A486A74447FF7','ARCHIVED','2015-07-10 19:32:17',0),('2015_07_08_00_characters.sql','DAB25360ACB5244C8F8E6214CF6BD97160588A5B','ARCHIVED','2015-07-10 19:32:17',0),('2015_07_11_00_characters.sql','B421B6C0E57BD0FD587071358863D9DABF4BA849','ARCHIVED','2015-07-13 21:50:02',0),('2015_07_12_00_characters.sql','E98E7FD61EF6426E7EDE8ED9AD8C15D8D7132589','ARCHIVED','2015-07-13 21:50:02',0),('2015_07_28_00_characters.sql','0711BC3A658D189EF71B0CB68DCFF2E9B781C4A0','ARCHIVED','2015-07-29 16:23:56',0),('2015_08_08_00_characters.sql','EA12BB2DC24FAF2300A96D0888A45BBEA158D5DC','ARCHIVED','2015-08-08 16:34:07',0),('2015_08_12_00_characters.sql','4FD7F89FE5DA51D4E0C33E520719986AA3EBD31B','ARCHIVED','2015-08-12 12:35:20',0),('2015_09_05_00_characters.sql','4C22BB29365BE4B6B95E64DAD84B63CA002304EA','ARCHIVED','2015-09-05 12:35:20',0),('2015_09_09_00_characters.sql','AFC32E693BC17CFD9A17919FE5317B8FE337ACAD','ARCHIVED','2015-09-09 12:35:20',0),('2015_09_10_00_characters.sql','4555A7F35C107E54C13D74D20F141039ED42943E','ARCHIVED','2015-09-10 22:50:42',0),('2015_10_16_00_characters.sql','E3A3FFF0CB42F04A8DCF0CE4362143C16E2083AF','ARCHIVED','2015-10-15 21:54:11',0),('2015_11_06_00_characters_2015_10_12_00.sql','D6F9927BDED72AD0A81D6EC2C6500CBC34A39FA2','ARCHIVED','2015-11-06 23:43:27',0),('2015_11_08_00_characters.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2015-11-08 00:51:45',15),('2015_11_23_00_characters.sql','9FC828E9E48E8E2E9B99A5A0073D6614C5BFC6B5','ARCHIVED','2015-11-22 23:27:34',0),('2016_01_05_00_characters.sql','0EAD24977F40DE2476B4567DA2B477867CC0DA1A','ARCHIVED','2016-01-04 23:07:40',0),('2016_04_05_00_characters_2016_02_10_00_characters.sql','F1B4DA202819CABC7319A4470A2D224A34609E97','ARCHIVED','2016-04-05 20:34:41',0),('2016_04_11_00_characters.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','RELEASED','2016-04-11 02:24:14',30),('2016_04_11_01_characters.sql','CA90F6D99C1EEA7B25BD58BC8368A8D78234BBEF','RELEASED','2016-04-11 18:14:18',0),('2016_05_07_00_characters.sql','D1DB5557B21A552C935564D829B4E98B98149077','RELEASED','2016-05-07 00:00:00',0),('2016_05_26_00_characters.sql','4179ADC32B96FD8D7D4CF5509A470B1ACE00BE85','RELEASED','2016-05-26 17:06:16',0),('2016_07_16_00_characters.sql','EF267FCB92B383FFB33C700508EAF3FBC1F8AC23','RELEASED','2016-07-16 14:45:12',0),('2016_07_19_00_characters.sql','AA2C516FA81B451071EA82F58F447E9D13E5D1BD','RELEASED','2016-07-19 14:36:25',0),('2016_07_19_01_characters.sql','E9AF46AF4C7CC2E2779E44254AEEDF880D020166','RELEASED','2016-07-19 14:36:25',0),('2016_07_19_02_characters.sql','5B1B334449996F3639C9226F587129E03DC4BF6D','RELEASED','2016-07-19 14:36:26',0),('2016_07_19_03_characters.sql','7787C8A67D720492FED4BF60ADB22D3CDE1C536D','RELEASED','2016-07-19 14:36:26',0),('2016_07_19_04_characters.sql','6D4B536094367AC9EF7CDFF41A4F96EB00B25EE5','RELEASED','2016-07-19 14:36:26',0),('2016_07_19_05_characters.sql','12639268DC5F78CE900B59D5C646B10D70842928','RELEASED','2016-07-19 14:36:27',0),('2016_07_19_06_characters.sql','9F5A4B533E6BFBAA718DE5160E1FDCB8471A88BF','RELEASED','2016-07-19 14:36:28',0),('2016_07_19_07_characters.sql','1E8273FFD4340CBD7BB71D2406E23E9EF7230CFA','RELEASED','2016-07-19 14:36:29',0),('2016_07_19_08_characters.sql','FB41FD2F8A7114FEE154021A9D47488C4B12E2A9','RELEASED','2016-07-19 14:36:29',0),('2016_08_15_00_characters.sql','BF0B5F453384210CD77C54E262A19B888AAA4095','RELEASED','2016-08-14 18:14:32',0),('2016_08_25_00_characters.sql','4AD506C3FCE54238EF452AC07EC562BD41A9D50C','RELEASED','2016-08-25 22:54:11',0);
+INSERT INTO `updates` VALUES ('2014_10_20_00_characters.sql','A5882DA0979CF4DAE33DA011EBAA006C24BE7230','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_23_00_characters.sql','E2AC4758133EE19B7F08464A445802154D1261C8','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_23_01_characters.sql','20029E6323D9773B32C34D84FFED1711CC60F09F','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_23_02_characters.sql','8A7A16886EE71E7ACDDB3DDA6D0ECAC2FD2FDCA8','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_24_00_characters.sql','D008FE81AE844FCA686439D6ECC5108FB0DD1EB9','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_25_00_characters.sql','A39C7BE46686B54776BDAB9D7A882D91EDEC51A4','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_26_00_characters.sql','C787954CC35FE34B4101FDE6527F14C027F4947C','ARCHIVED','2015-03-21 15:55:55',0),('2014_11_12_00_characters.sql','B160BB2313F1BD5F3B076A5A9279DC10D4796E34','ARCHIVED','2015-03-21 15:55:55',0),('2014_12_23_00_characters.sql','3D9D648B2387B357F4BD090B33F80682F7924882','ARCHIVED','2015-03-21 15:55:55',0),('2014_12_28_00_characters.sql','5362922FF4483A336311D73082A5727309CD9219','ARCHIVED','2015-03-21 15:55:55',0),('2014_12_31_00_characters.sql','498DDF2DD936CF156D74A8208DC93DCE9FCAB5AA','ARCHIVED','2015-03-21 15:55:55',0),('2015_01_02_00_characters.sql','E5940BE836F253982E07930120422E598D08BDE1','ARCHIVED','2015-03-21 15:55:55',0),('2015_01_10_00_characters.sql','30796056C8623699B2FE1BF626A19D38262E9284','ARCHIVED','2015-03-21 15:55:55',0),('2015_01_16_00_characters.sql','96642760A54C8D799AAFE438049A63AA521656F2','ARCHIVED','2015-03-21 15:55:55',0),('2015_01_27_00_characters.sql','EB710E3EB9F2CAFD84AB62CDC84E898403A80A4F','ARCHIVED','2015-03-21 15:55:55',0),('2015_02_13_00_characters.sql','405BEB4ED207DC6076442A37EE2AFB1F21E274A0','ARCHIVED','2015-03-21 15:55:55',0),('2015_02_13_01_characters.sql','35F582D4F33BF55D1685A1BA89273ED895FD09C5','ARCHIVED','2015-03-21 15:55:55',0),('2015_02_17_00_characters.sql','8D21FC5A55BF8B55D6DCDCE5F02CF2B640230E94','ARCHIVED','2015-03-21 15:55:55',0),('2015_03_10_00_characters.sql','E565B89B145C340067742DFF2DEF1B74F5F1BD4E','ARCHIVED','2015-03-21 15:55:55',0),('2015_03_20_00_characters.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 15:55:55',0),('2015_03_20_01_characters.sql','20BD68468C57FCF7E665B4DA185DCD52FACE8B3F','ARCHIVED','2015-03-21 15:55:55',0),('2015_03_20_02_characters.sql','0296995DCD3676BA9AE6024CA7C91C5F39D927A3','ARCHIVED','2015-03-21 15:56:46',0),('2015_03_29_00_characters.sql','95D6A46BB746A8BD3EE3FE2086DF1A07F7C33B92','ARCHIVED','2015-05-02 15:43:06',0),('2015_04_21_00_characters.sql','F2032B9BF4EDA7EDE5065554724ED392FD91657D','ARCHIVED','2015-05-02 15:43:06',0),('2015_04_28_00_characters.sql','949F62DB3A3461D420A1230ECF7A6A3ED6435703','ARCHIVED','2015-05-02 15:43:06',0),('2015_05_08_00_characters.sql','0F14B7821618D1C872625B6EDDAA9A667B211167','ARCHIVED','2015-07-10 19:32:17',0),('2015_05_22_00_characters.sql','65B82152413FAB23BE413656E59A486A74447FF7','ARCHIVED','2015-07-10 19:32:17',0),('2015_07_08_00_characters.sql','DAB25360ACB5244C8F8E6214CF6BD97160588A5B','ARCHIVED','2015-07-10 19:32:17',0),('2015_07_11_00_characters.sql','B421B6C0E57BD0FD587071358863D9DABF4BA849','ARCHIVED','2015-07-13 21:50:02',0),('2015_07_12_00_characters.sql','E98E7FD61EF6426E7EDE8ED9AD8C15D8D7132589','ARCHIVED','2015-07-13 21:50:02',0),('2015_07_28_00_characters.sql','0711BC3A658D189EF71B0CB68DCFF2E9B781C4A0','ARCHIVED','2015-07-29 16:23:56',0),('2015_08_08_00_characters.sql','EA12BB2DC24FAF2300A96D0888A45BBEA158D5DC','ARCHIVED','2015-08-08 16:34:07',0),('2015_08_12_00_characters.sql','4FD7F89FE5DA51D4E0C33E520719986AA3EBD31B','ARCHIVED','2015-08-12 12:35:20',0),('2015_09_05_00_characters.sql','4C22BB29365BE4B6B95E64DAD84B63CA002304EA','ARCHIVED','2015-09-05 12:35:20',0),('2015_09_09_00_characters.sql','AFC32E693BC17CFD9A17919FE5317B8FE337ACAD','ARCHIVED','2015-09-09 12:35:20',0),('2015_09_10_00_characters.sql','4555A7F35C107E54C13D74D20F141039ED42943E','ARCHIVED','2015-09-10 22:50:42',0),('2015_10_16_00_characters.sql','E3A3FFF0CB42F04A8DCF0CE4362143C16E2083AF','ARCHIVED','2015-10-15 21:54:11',0),('2015_11_06_00_characters_2015_10_12_00.sql','D6F9927BDED72AD0A81D6EC2C6500CBC34A39FA2','ARCHIVED','2015-11-06 23:43:27',0),('2015_11_08_00_characters.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2015-11-08 00:51:45',15),('2015_11_23_00_characters.sql','9FC828E9E48E8E2E9B99A5A0073D6614C5BFC6B5','ARCHIVED','2015-11-22 23:27:34',0),('2016_01_05_00_characters.sql','0EAD24977F40DE2476B4567DA2B477867CC0DA1A','ARCHIVED','2016-01-04 23:07:40',0),('2016_04_05_00_characters_2016_02_10_00_characters.sql','F1B4DA202819CABC7319A4470A2D224A34609E97','ARCHIVED','2016-04-05 20:34:41',0),('2016_04_11_00_characters.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-04-11 02:24:14',30),('2016_04_11_01_characters.sql','CA90F6D99C1EEA7B25BD58BC8368A8D78234BBEF','ARCHIVED','2016-04-11 18:14:18',0),('2016_05_07_00_characters.sql','D1DB5557B21A552C935564D829B4E98B98149077','ARCHIVED','2016-05-07 00:00:00',0),('2016_05_26_00_characters.sql','4179ADC32B96FD8D7D4CF5509A470B1ACE00BE85','ARCHIVED','2016-05-26 17:06:16',0),('2016_07_16_00_characters.sql','EF267FCB92B383FFB33C700508EAF3FBC1F8AC23','ARCHIVED','2016-07-16 14:45:12',0),('2016_07_19_00_characters.sql','AA2C516FA81B451071EA82F58F447E9D13E5D1BD','ARCHIVED','2016-07-19 14:36:25',0),('2016_07_19_01_characters.sql','E9AF46AF4C7CC2E2779E44254AEEDF880D020166','ARCHIVED','2016-07-19 14:36:25',0),('2016_07_19_02_characters.sql','5B1B334449996F3639C9226F587129E03DC4BF6D','ARCHIVED','2016-07-19 14:36:26',0),('2016_07_19_03_characters.sql','7787C8A67D720492FED4BF60ADB22D3CDE1C536D','ARCHIVED','2016-07-19 14:36:26',0),('2016_07_19_04_characters.sql','6D4B536094367AC9EF7CDFF41A4F96EB00B25EE5','ARCHIVED','2016-07-19 14:36:26',0),('2016_07_19_05_characters.sql','12639268DC5F78CE900B59D5C646B10D70842928','ARCHIVED','2016-07-19 14:36:27',0),('2016_07_19_06_characters.sql','9F5A4B533E6BFBAA718DE5160E1FDCB8471A88BF','ARCHIVED','2016-07-19 14:36:28',0),('2016_07_19_07_characters.sql','1E8273FFD4340CBD7BB71D2406E23E9EF7230CFA','ARCHIVED','2016-07-19 14:36:29',0),('2016_07_19_08_characters.sql','FB41FD2F8A7114FEE154021A9D47488C4B12E2A9','ARCHIVED','2016-07-19 14:36:29',0),('2016_08_15_00_characters.sql','BF0B5F453384210CD77C54E262A19B888AAA4095','ARCHIVED','2016-08-14 18:14:32',0),('2016_08_25_00_characters.sql','4AD506C3FCE54238EF452AC07EC562BD41A9D50C','ARCHIVED','2016-08-25 22:54:11',0),('2016_10_17_00_characters.sql','A0EF594CD73690D46A46031137DB0E895F079235','RELEASED','2016-10-16 16:33:05',25);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3329,4 +3330,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-04-11  3:26:26
+-- Dump completed on 2016-10-16 17:35:47
diff --git a/sql/base/dev/hotfixes_database.sql b/sql/base/dev/hotfixes_database.sql
index 2e9d18d05ed..fd6ddee9266 100644
--- a/sql/base/dev/hotfixes_database.sql
+++ b/sql/base/dev/hotfixes_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.6.9-rc, for Win64 (x86_64)
+-- MySQL dump 10.16  Distrib 10.1.6-MariaDB, for Win64 (AMD64)
 --
--- Host: localhost    Database: hotfixes
+-- Host: localhost    Database: hotfixes6
 -- ------------------------------------------------------
--- Server version	5.6.9-rc
+-- Server version	5.7.14-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -23,21 +23,21 @@ DROP TABLE IF EXISTS `achievement`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `achievement` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Faction` int(11) NOT NULL DEFAULT '0',
-  `MapID` int(11) NOT NULL DEFAULT '0',
-  `Supercedes` int(10) unsigned NOT NULL DEFAULT '0',
   `Title` text,
   `Description` text,
-  `Category` int(10) unsigned NOT NULL DEFAULT '0',
-  `Points` int(10) unsigned NOT NULL DEFAULT '0',
-  `UIOrder` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `IconID` int(10) unsigned NOT NULL DEFAULT '0',
   `Reward` text,
-  `MinimumCriteria` int(10) unsigned NOT NULL DEFAULT '0',
-  `SharesCriteria` int(10) unsigned NOT NULL DEFAULT '0',
-  `CriteriaTree` 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',
+  `IconID` 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',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -62,6 +62,23 @@ CREATE TABLE `achievement_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `anim_kit`
+--
+
+DROP TABLE IF EXISTS `anim_kit`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `anim_kit` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `OneShotDuration` int(10) unsigned NOT NULL DEFAULT '0',
+  `OneShotStopAnimKitID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LowDefAnimKitID` 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_group_member`
 --
 
@@ -70,8 +87,8 @@ 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` int(10) unsigned NOT NULL DEFAULT '0',
-  `AreaID` int(10) unsigned NOT NULL DEFAULT '0',
+  `AreaGroupID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AreaID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -124,6 +141,328 @@ CREATE TABLE `area_poi_state` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `area_table`
+--
+
+DROP TABLE IF EXISTS `area_table`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `area_table` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `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',
+  `AmbienceID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ZoneMusic` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `IntroSound` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LiquidTypeID1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LiquidTypeID2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LiquidTypeID3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LiquidTypeID4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `UWZoneMusic` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `UWAmbience` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PvPCombatWorldStateID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SoundProviderPref` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SoundProviderPrefUnderwater` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ExplorationLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `FactionGroupMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MountFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `WildBattlePetLevelMin` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `WildBattlePetLevelMax` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `WindSettingsID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `UWIntroSound` 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 `area_table_locale`
+--
+
+DROP TABLE IF EXISTS `area_table_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `area_table_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `AreaName_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 `area_trigger`
+--
+
+DROP TABLE IF EXISTS `area_trigger`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `area_trigger` (
+  `PosX` float NOT NULL DEFAULT '0',
+  `PosY` float NOT NULL DEFAULT '0',
+  `PosZ` float NOT NULL DEFAULT '0',
+  `Radius` float NOT NULL DEFAULT '0',
+  `BoxLength` float NOT NULL DEFAULT '0',
+  `BoxWidth` float NOT NULL DEFAULT '0',
+  `BoxHeight` float NOT NULL DEFAULT '0',
+  `BoxYaw` float NOT NULL DEFAULT '0',
+  `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PhaseID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PhaseGroupID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ShapeID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AreaTriggerActionSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PhaseUseFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ShapeType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flag` 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 `armor_location`
+--
+
+DROP TABLE IF EXISTS `armor_location`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `armor_location` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Modifier1` float NOT NULL DEFAULT '0',
+  `Modifier2` float NOT NULL DEFAULT '0',
+  `Modifier3` float NOT NULL DEFAULT '0',
+  `Modifier4` float NOT NULL DEFAULT '0',
+  `Modifier5` 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 `artifact`
+--
+
+DROP TABLE IF EXISTS `artifact`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `artifact` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `BarConnectedColor` int(10) unsigned NOT NULL DEFAULT '0',
+  `BarDisconnectedColor` int(10) unsigned NOT NULL DEFAULT '0',
+  `TitleColor` int(10) unsigned NOT NULL DEFAULT '0',
+  `ClassUiTextureKitID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SpecID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ArtifactCategoryID` 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 `artifact_appearance`
+--
+
+DROP TABLE IF EXISTS `artifact_appearance`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `artifact_appearance` (
+  `Name` text,
+  `SwatchColor` int(10) unsigned NOT NULL DEFAULT '0',
+  `ModelDesaturation` float NOT NULL DEFAULT '0',
+  `ModelAlpha` float NOT NULL DEFAULT '0',
+  `ShapeshiftDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ArtifactAppearanceSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Unknown` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `DisplayIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `AppearanceModID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ModifiesShapeshiftFormDisplay` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemAppearanceID` int(10) unsigned NOT NULL DEFAULT '0',
+  `AltItemAppearanceID` 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_appearance_locale`
+--
+
+DROP TABLE IF EXISTS `artifact_appearance_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `artifact_appearance_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 `artifact_appearance_set`
+--
+
+DROP TABLE IF EXISTS `artifact_appearance_set`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `artifact_appearance_set` (
+  `Name` text,
+  `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',
+  `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_appearance_set_locale`
+--
+
+DROP TABLE IF EXISTS `artifact_appearance_set_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `artifact_appearance_set_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name_lang` text,
+  `Name2_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 `artifact_category`
+--
+
+DROP TABLE IF EXISTS `artifact_category`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `artifact_category` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ArtifactKnowledgeCurrencyID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ArtifactKnowledgeMultiplierCurveID` 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 `artifact_locale`
+--
+
+DROP TABLE IF EXISTS `artifact_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `artifact_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 `artifact_power`
+--
+
+DROP TABLE IF EXISTS `artifact_power`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `artifact_power` (
+  `PosX` float NOT NULL DEFAULT '0',
+  `PosY` float NOT NULL DEFAULT '0',
+  `ArtifactID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaxRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `RelicType` 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 `artifact_power_link`
+--
+
+DROP TABLE IF EXISTS `artifact_power_link`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `artifact_power_link` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `FromArtifactPowerID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ToArtifactPowerID` 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 `artifact_power_rank`
+--
+
+DROP TABLE IF EXISTS `artifact_power_rank`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+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',
+  `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_quest_xp`
+--
+
+DROP TABLE IF EXISTS `artifact_quest_xp`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `artifact_quest_xp` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Exp1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Exp2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Exp3` int(10) unsigned NOT NULL DEFAULT '0',
+  `Exp4` int(10) unsigned NOT NULL DEFAULT '0',
+  `Exp5` int(10) unsigned NOT NULL DEFAULT '0',
+  `Exp6` int(10) unsigned NOT NULL DEFAULT '0',
+  `Exp7` int(10) unsigned NOT NULL DEFAULT '0',
+  `Exp8` int(10) unsigned NOT NULL DEFAULT '0',
+  `Exp9` int(10) unsigned NOT NULL DEFAULT '0',
+  `Exp10` 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 `auction_house`
 --
 
@@ -132,10 +471,10 @@ DROP TABLE IF EXISTS `auction_house`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `auction_house` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `FactionID` int(10) unsigned NOT NULL DEFAULT '0',
-  `DepositRate` int(10) unsigned NOT NULL DEFAULT '0',
-  `ConsignmentRate` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
+  `FactionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `DepositRate` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ConsignmentRate` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -158,6 +497,38 @@ CREATE TABLE `auction_house_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `bank_bag_slot_prices`
+--
+
+DROP TABLE IF EXISTS `bank_bag_slot_prices`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `bank_bag_slot_prices` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Cost` 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 `banned_addons`
+--
+
+DROP TABLE IF EXISTS `banned_addons`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `banned_addons` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `Version` text,
+  `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 `barber_shop_style`
 --
 
@@ -165,14 +536,14 @@ DROP TABLE IF EXISTS `barber_shop_style`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `barber_shop_style` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Type` int(10) unsigned NOT NULL DEFAULT '0',
   `DisplayName` text,
   `Description` text,
   `CostModifier` float NOT NULL DEFAULT '0',
-  `Race` int(10) unsigned NOT NULL DEFAULT '0',
-  `Sex` int(10) unsigned NOT NULL DEFAULT '0',
-  `Data` int(10) unsigned NOT NULL DEFAULT '0',
+  `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Race` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Sex` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Data` 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;
@@ -204,8 +575,8 @@ DROP TABLE IF EXISTS `battle_pet_breed_quality`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `battle_pet_breed_quality` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Quality` int(10) unsigned NOT NULL DEFAULT '0',
   `Modifier` float NOT NULL DEFAULT '0',
+  `Quality` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -220,9 +591,9 @@ DROP TABLE IF EXISTS `battle_pet_breed_state`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `battle_pet_breed_state` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `BreedID` int(10) unsigned NOT NULL DEFAULT '0',
-  `State` int(10) unsigned NOT NULL DEFAULT '0',
-  `Value` int(11) 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',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -236,15 +607,15 @@ 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` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `CreatureID` int(10) unsigned NOT NULL DEFAULT '0',
   `IconFileID` int(10) unsigned NOT NULL DEFAULT '0',
   `SummonSpellID` int(10) unsigned NOT NULL DEFAULT '0',
-  `PetType` int(11) NOT NULL DEFAULT '0',
-  `Source` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` 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',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -260,8 +631,8 @@ DROP TABLE IF EXISTS `battle_pet_species_locale`;
 CREATE TABLE `battle_pet_species_locale` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `locale` varchar(4) NOT NULL,
-  `SourceText` text,
-  `Description` text,
+  `SourceText_lang` text,
+  `Description_lang` text,
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -276,15 +647,76 @@ DROP TABLE IF EXISTS `battle_pet_species_state`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `battle_pet_species_state` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpeciesID` int(10) unsigned NOT NULL DEFAULT '0',
-  `State` 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',
+  `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 `battlemaster_list`
+--
+
+DROP TABLE IF EXISTS `battlemaster_list`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `battlemaster_list` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `GameType` text,
+  `MapID1` smallint(6) NOT NULL DEFAULT '0',
+  `MapID2` smallint(6) NOT NULL DEFAULT '0',
+  `MapID3` smallint(6) NOT NULL DEFAULT '0',
+  `MapID4` smallint(6) NOT NULL DEFAULT '0',
+  `MapID5` smallint(6) NOT NULL DEFAULT '0',
+  `MapID6` smallint(6) NOT NULL DEFAULT '0',
+  `MapID7` smallint(6) NOT NULL DEFAULT '0',
+  `MapID8` smallint(6) NOT NULL DEFAULT '0',
+  `MapID9` smallint(6) NOT NULL DEFAULT '0',
+  `MapID10` smallint(6) NOT NULL DEFAULT '0',
+  `MapID11` smallint(6) NOT NULL DEFAULT '0',
+  `MapID12` smallint(6) NOT NULL DEFAULT '0',
+  `MapID13` smallint(6) NOT NULL DEFAULT '0',
+  `MapID14` smallint(6) NOT NULL DEFAULT '0',
+  `MapID15` smallint(6) NOT NULL DEFAULT '0',
+  `MapID16` smallint(6) NOT NULL DEFAULT '0',
+  `HolidayWorldState` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `InstanceType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `GroupsAllowed` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaxGroupSize` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MinLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaxLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RatedPlayers` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MinPlayers` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaxPlayers` 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 `battlemaster_list_locale`
+--
+
+DROP TABLE IF EXISTS `battlemaster_list_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `battlemaster_list_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name_lang` text,
+  `GameType_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 `broadcast_text`
 --
 
@@ -293,19 +725,21 @@ DROP TABLE IF EXISTS `broadcast_text`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `broadcast_text` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Language` int(11) NOT NULL DEFAULT '0',
   `MaleText` text,
   `FemaleText` text,
-  `EmoteID1` int(10) unsigned NOT NULL DEFAULT '0',
-  `EmoteID2` int(10) unsigned NOT NULL DEFAULT '0',
-  `EmoteID3` int(10) unsigned NOT NULL DEFAULT '0',
-  `EmoteDelay1` int(10) unsigned NOT NULL DEFAULT '0',
-  `EmoteDelay2` int(10) unsigned NOT NULL DEFAULT '0',
-  `EmoteDelay3` int(10) unsigned NOT NULL DEFAULT '0',
-  `SoundID` int(10) unsigned NOT NULL DEFAULT '0',
-  `UnkEmoteID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Type` int(10) unsigned NOT NULL DEFAULT '0',
-  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
+  `EmoteID1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteID2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteID3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `UnkEmoteID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Language` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Type` tinyint(3) 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;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -328,6 +762,29 @@ CREATE TABLE `broadcast_text_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `char_sections`
+--
+
+DROP TABLE IF EXISTS `char_sections`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `char_sections` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `TextureFileDataID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `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',
+  `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_start_outfit`
 --
 
@@ -336,10 +793,6 @@ DROP TABLE IF EXISTS `char_start_outfit`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `char_start_outfit` (
   `ID` 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',
   `ItemID1` int(11) NOT NULL DEFAULT '0',
   `ItemID2` int(11) NOT NULL DEFAULT '0',
   `ItemID3` int(11) NOT NULL DEFAULT '0',
@@ -365,13 +818,137 @@ 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',
-  `PetFamilyID` 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',
+  `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_titles`
+--
+
+DROP TABLE IF EXISTS `char_titles`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `char_titles` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `NameMale` text,
+  `NameFemale` text,
+  `MaskID` smallint(5) 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 `char_titles_locale`
+--
+
+DROP TABLE IF EXISTS `char_titles_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `char_titles_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `NameMale_lang` text,
+  `NameFemale_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 `chat_channels`
+--
+
+DROP TABLE IF EXISTS `chat_channels`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!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,
+  `FactionGroup` 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_locale`
+--
+
+DROP TABLE IF EXISTS `chat_channels_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `chat_channels_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name_lang` text,
+  `Shortcut_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 `chr_classes`
+--
+
+DROP TABLE IF EXISTS `chr_classes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `chr_classes` (
+  `PetNameToken` text,
+  `Name` text,
+  `NameFemale` text,
+  `NameMale` text,
+  `Filename` text,
+  `CreateScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SelectScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `LowResScreenFileDataID` 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',
+  `PowerType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpellClassSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `AttackPowerPerStrength` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `AttackPowerPerAgility` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RangedAttackPowerPerAgility` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `IconFileDataID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Unk1` 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 `chr_classes_locale`
+--
+
+DROP TABLE IF EXISTS `chr_classes_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `chr_classes_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name_lang` text,
+  `NameFemale_lang` text,
+  `NameMale_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 `chr_classes_x_power_types`
 --
 
@@ -380,14 +957,134 @@ 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` int(10) unsigned NOT NULL DEFAULT '0',
-  `PowerType` int(10) unsigned NOT NULL DEFAULT '0',
+  `ClassID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PowerType` 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 `chr_races`
+--
+
+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,
+  `CreateScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SelectScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaleCustomizeOffset1` float NOT NULL DEFAULT '0',
+  `MaleCustomizeOffset2` float NOT NULL DEFAULT '0',
+  `MaleCustomizeOffset3` float NOT NULL DEFAULT '0',
+  `FemaleCustomizeOffset1` float NOT NULL DEFAULT '0',
+  `FemaleCustomizeOffset2` float NOT NULL DEFAULT '0',
+  `FemaleCustomizeOffset3` float NOT NULL DEFAULT '0',
+  `LowResScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `FactionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ExplorationSoundID` 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',
+  `UAMaleCreatureSoundDataID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `UAFemaleCreatureSoundDataID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `BaseLanguage` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CreatureType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `TeamID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RaceRelated` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `UnalteredVisualRaceID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CharComponentTextureLayoutID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DefaultClassID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `NeutralRaceID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ItemAppearanceFrameRaceID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CharComponentTexLayoutHiResID` tinyint(3) 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',
+  `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_races_locale`
+--
+
+DROP TABLE IF EXISTS `chr_races_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `chr_races_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name_lang` text,
+  `NameFemale_lang` text,
+  `NameMale_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 `chr_specialization`
+--
+
+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,
+  `BackgroundFile` text,
+  `SpellIconID` smallint(5) 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',
+  `Role` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PrimaryStatOrder` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `AnimReplacementSetID` 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_specialization_locale`
+--
+
+DROP TABLE IF EXISTS `chr_specialization_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `chr_specialization_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name_lang` text,
+  `Name2_lang` text,
+  `Description_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 `chr_upgrade_bucket`
 --
 
@@ -445,15 +1142,15 @@ DROP TABLE IF EXISTS `cinematic_sequences`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `cinematic_sequences` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SoundID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Camera1` int(10) unsigned NOT NULL DEFAULT '0',
-  `Camera2` int(10) unsigned NOT NULL DEFAULT '0',
-  `Camera3` int(10) unsigned NOT NULL DEFAULT '0',
-  `Camera4` int(10) unsigned NOT NULL DEFAULT '0',
-  `Camera5` int(10) unsigned NOT NULL DEFAULT '0',
-  `Camera6` int(10) unsigned NOT NULL DEFAULT '0',
-  `Camera7` int(10) unsigned NOT NULL DEFAULT '0',
-  `Camera8` int(10) unsigned NOT NULL DEFAULT '0',
+  `SoundID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Camera1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Camera2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Camera3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Camera4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Camera5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Camera6` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Camera7` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Camera8` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -468,7 +1165,6 @@ DROP TABLE IF EXISTS `creature`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `creature` (
   `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Type` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `ItemID1` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `ItemID2` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `ItemID3` mediumint(8) unsigned NOT NULL DEFAULT '0',
@@ -485,8 +1181,10 @@ CREATE TABLE `creature` (
   `FemaleName` text NOT NULL,
   `SubName` text NOT NULL,
   `FemaleSubName` text NOT NULL,
-  `Rank` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `InhabitType` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Type` mediumint(3) unsigned NOT NULL DEFAULT '0',
+  `Family` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Classification` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `InhabitType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -502,15 +1200,17 @@ DROP TABLE IF EXISTS `creature_difficulty`;
 CREATE TABLE `creature_difficulty` (
   `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `CreatureID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `FactionID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Expansion` mediumint(8) NOT NULL DEFAULT '0',
-  `MinLevel` mediumint(8) NOT NULL DEFAULT '0',
-  `MaxLevel` mediumint(8) 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',
   `Flags4` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags5` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags6` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags7` int(10) unsigned NOT NULL DEFAULT '0',
+  `FactionTemplateID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Expansion` tinyint(4) NOT NULL DEFAULT '0',
+  `MinLevel` tinyint(4) NOT NULL DEFAULT '0',
+  `MaxLevel` tinyint(4) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -525,52 +1225,152 @@ DROP TABLE IF EXISTS `creature_display_info`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `creature_display_info` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ModelID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SoundID` int(10) unsigned NOT NULL DEFAULT '0',
   `ExtendedDisplayInfoID` int(10) unsigned NOT NULL DEFAULT '0',
   `CreatureModelScale` float NOT NULL DEFAULT '0',
-  `Unknown620` float NOT NULL DEFAULT '0',
-  `CreatureModelAlpha` int(10) unsigned NOT NULL DEFAULT '0',
-  `TextureVariation1` text,
-  `TextureVariation2` text,
-  `TextureVariation3` text,
+  `PlayerModelScale` float 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',
   `PortraitTextureName` text,
   `PortraitCreatureDisplayInfoID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SizeClass` int(10) unsigned NOT NULL DEFAULT '0',
-  `BloodID` int(10) unsigned NOT NULL DEFAULT '0',
-  `NPCSoundID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ParticleColorID` int(10) unsigned NOT NULL DEFAULT '0',
   `CreatureGeosetData` int(10) unsigned NOT NULL DEFAULT '0',
-  `ObjectEffectPackageID` int(10) unsigned NOT NULL DEFAULT '0',
-  `AnimReplacementSetID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `Gender` int(11) NOT NULL DEFAULT '0',
   `StateSpellVisualKitID` int(10) unsigned NOT NULL DEFAULT '0',
+  `InstanceOtherPlayerPetScale` float NOT NULL DEFAULT '0',
+  `ModelID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SoundID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `NPCSoundID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ParticleColorID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ObjectEffectPackageID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AnimReplacementSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CreatureModelAlpha` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SizeClass` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `BloodID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Gender` tinyint(4) NOT NULL DEFAULT '0',
+  `Unk700` tinyint(4) 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_display_info_extra`
+--
+
+DROP TABLE IF EXISTS `creature_display_info_extra`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `creature_display_info_extra` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `HDFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DisplayRaceID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DisplaySexID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DisplayClassID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SkinID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `FaceID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `HairStyleID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `HairColorID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `FacialHairID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CustomDisplayOption1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CustomDisplayOption2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CustomDisplayOption3` 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 `creature_display_info_locale`
+-- Table structure for table `creature_family`
 --
 
-DROP TABLE IF EXISTS `creature_display_info_locale`;
+DROP TABLE IF EXISTS `creature_family`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `creature_display_info_locale` (
+CREATE TABLE `creature_family` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinScale` float NOT NULL DEFAULT '0',
+  `MaxScale` float NOT NULL DEFAULT '0',
+  `Name` text,
+  `IconFile` text,
+  `SkillLine1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SkillLine2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PetFoodMask` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MinScaleLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaxScaleLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PetTalentType` 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_family_locale`
+--
+
+DROP TABLE IF EXISTS `creature_family_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `creature_family_locale` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `locale` varchar(4) NOT NULL,
-  `TextureVariation_lang1` text,
-  `TextureVariation_lang2` text,
-  `TextureVariation_lang3` text,
-  `PortraitTextureName_lang` text,
+  `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 `creature_model_data`
+--
+
+DROP TABLE IF EXISTS `creature_model_data`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `creature_model_data` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ModelScale` float NOT NULL DEFAULT '0',
+  `FootprintTextureLength` float NOT NULL DEFAULT '0',
+  `FootprintTextureWidth` float NOT NULL DEFAULT '0',
+  `FootprintParticleScale` float NOT NULL DEFAULT '0',
+  `CollisionWidth` float NOT NULL DEFAULT '0',
+  `CollisionHeight` float NOT NULL DEFAULT '0',
+  `MountHeight` float NOT NULL DEFAULT '0',
+  `GeoBoxMin1` float NOT NULL DEFAULT '0',
+  `GeoBoxMin2` float NOT NULL DEFAULT '0',
+  `GeoBoxMin3` float NOT NULL DEFAULT '0',
+  `GeoBoxMax1` float NOT NULL DEFAULT '0',
+  `GeoBoxMax2` float NOT NULL DEFAULT '0',
+  `GeoBoxMax3` float NOT NULL DEFAULT '0',
+  `WorldEffectScale` float NOT NULL DEFAULT '0',
+  `AttachedEffectScale` float NOT NULL DEFAULT '0',
+  `MissileCollisionRadius` float NOT NULL DEFAULT '0',
+  `MissileCollisionPush` float NOT NULL DEFAULT '0',
+  `MissileCollisionRaise` float NOT NULL DEFAULT '0',
+  `OverrideLootEffectScale` float NOT NULL DEFAULT '0',
+  `OverrideNameScale` float NOT NULL DEFAULT '0',
+  `OverrideSelectionRadius` float NOT NULL DEFAULT '0',
+  `TamedPetBaseScale` float NOT NULL DEFAULT '0',
+  `HoverHeight` float NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SizeClass` int(10) unsigned NOT NULL DEFAULT '0',
+  `BloodID` int(10) unsigned NOT NULL DEFAULT '0',
+  `FootprintTextureID` int(10) unsigned NOT NULL DEFAULT '0',
+  `FoleyMaterialID` int(10) unsigned NOT NULL DEFAULT '0',
+  `FootstepEffectID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DeathThudEffectID` int(10) unsigned NOT NULL DEFAULT '0',
+  `FootstepShakeSize` int(10) unsigned NOT NULL DEFAULT '0',
+  `DeathThudShakeSize` int(10) unsigned NOT NULL DEFAULT '0',
+  `SoundID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CreatureGeosetDataID` 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 `creature_type`
 --
 
@@ -580,7 +1380,7 @@ DROP TABLE IF EXISTS `creature_type`;
 CREATE TABLE `creature_type` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
-  `Flags` int(10) 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;
@@ -611,17 +1411,17 @@ DROP TABLE IF EXISTS `criteria`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `criteria` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Type` int(10) unsigned NOT NULL DEFAULT '0',
   `Asset` int(10) unsigned NOT NULL DEFAULT '0',
-  `StartEvent` int(10) unsigned NOT NULL DEFAULT '0',
   `StartAsset` int(10) unsigned NOT NULL DEFAULT '0',
-  `StartTimer` int(10) unsigned NOT NULL DEFAULT '0',
-  `FailEvent` int(10) unsigned NOT NULL DEFAULT '0',
   `FailAsset` int(10) unsigned NOT NULL DEFAULT '0',
-  `ModifierTreeId` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `EligibilityWorldStateID` int(10) unsigned NOT NULL DEFAULT '0',
-  `EligibilityWorldStateValue` 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',
+  `FailEvent` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EligibilityWorldStateValue` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -637,12 +1437,12 @@ DROP TABLE IF EXISTS `criteria_tree`;
 CREATE TABLE `criteria_tree` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `CriteriaID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Amount` bigint(20) unsigned NOT NULL DEFAULT '0',
-  `Operator` int(10) unsigned NOT NULL DEFAULT '0',
-  `Parent` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `Amount` int(10) unsigned NOT NULL DEFAULT '0',
   `Description` text,
-  `OrderIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `Parent` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Operator` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `OrderIndex` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -673,17 +1473,17 @@ DROP TABLE IF EXISTS `currency_types`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `currency_types` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `CategoryID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
   `InventoryIcon1` text,
   `InventoryIcon2` text,
-  `SpellWeight` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellCategory` int(10) unsigned NOT NULL DEFAULT '0',
   `MaxQty` int(10) unsigned NOT NULL DEFAULT '0',
   `MaxEarnablePerWeek` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `Quality` 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',
+  `SpellWeight` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -700,8 +1500,6 @@ CREATE TABLE `currency_types_locale` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `locale` varchar(4) NOT NULL,
   `Name_lang` text,
-  `InventoryIcon1_lang` text,
-  `InventoryIcon2_lang` text,
   `Description_lang` text,
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
@@ -709,6 +1507,22 @@ CREATE TABLE `currency_types_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `curve`
+--
+
+DROP TABLE IF EXISTS `curve`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `curve` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Unused` 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 `curve_point`
 --
 
@@ -717,10 +1531,10 @@ DROP TABLE IF EXISTS `curve_point`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `curve_point` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `CurveID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Index` int(10) unsigned NOT NULL DEFAULT '0',
   `X` float NOT NULL DEFAULT '0',
   `Y` float NOT NULL DEFAULT '0',
+  `CurveID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Index` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -735,29 +1549,152 @@ DROP TABLE IF EXISTS `destructible_model_data`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `destructible_model_data` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateDamagedDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateDamagedImpactEffectDoodadSet` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateDamagedAmbientDoodadSet` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateDamagedNameSet` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateDestroyedDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateDestroyedDestructionDoodadSet` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateDestroyedImpactEffectDoodadSet` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateDestroyedAmbientDoodadSet` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateDestroyedNameSet` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateRebuildingDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateRebuildingDestructionDoodadSet` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateRebuildingImpactEffectDoodadSet` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateRebuildingAmbientDoodadSet` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateRebuildingNameSet` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateSmokeDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateSmokeInitDoodadSet` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateSmokeAmbientDoodadSet` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateSmokeNameSet` int(10) unsigned NOT NULL DEFAULT '0',
-  `EjectDirection` int(10) unsigned NOT NULL DEFAULT '0',
-  `RepairGroundFx` int(10) unsigned NOT NULL DEFAULT '0',
-  `DoNotHighlight` int(10) unsigned NOT NULL DEFAULT '0',
-  `HealEffect` int(10) unsigned NOT NULL DEFAULT '0',
-  `HealEffectSpeed` int(10) unsigned NOT NULL DEFAULT '0',
+  `StateDamagedDisplayID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `StateDestroyedDisplayID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `StateRebuildingDisplayID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `StateSmokeDisplayID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `HealEffectSpeed` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `StateDamagedImpactEffectDoodadSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `StateDamagedAmbientDoodadSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `StateDamagedNameSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `StateDestroyedDestructionDoodadSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `StateDestroyedImpactEffectDoodadSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `StateDestroyedAmbientDoodadSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `StateDestroyedNameSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `StateRebuildingDestructionDoodadSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `StateRebuildingImpactEffectDoodadSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `StateRebuildingAmbientDoodadSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `StateRebuildingNameSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `StateSmokeInitDoodadSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `StateSmokeAmbientDoodadSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `StateSmokeNameSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EjectDirection` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DoNotHighlight` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `HealEffect` 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 `difficulty`
+--
+
+DROP TABLE IF EXISTS `difficulty`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `difficulty` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `FallbackDifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `InstanceType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MinPlayers` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaxPlayers` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `OldEnumValue` tinyint(4) NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ToggleDifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `GroupSizeHealthCurveID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `GroupSizeDmgCurveID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `GroupSizeSpellPointsCurveID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ItemBonusTreeModID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `OrderIndex` 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 `difficulty_locale`
+--
+
+DROP TABLE IF EXISTS `difficulty_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `difficulty_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 `dungeon_encounter`
+--
+
+DROP TABLE IF EXISTS `dungeon_encounter`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `dungeon_encounter` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `CreatureDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SpellIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Bit` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `OrderIndex` 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 `dungeon_encounter_locale`
+--
+
+DROP TABLE IF EXISTS `dungeon_encounter_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `dungeon_encounter_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 `durability_costs`
+--
+
+DROP TABLE IF EXISTS `durability_costs`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `durability_costs` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost6` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost7` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost8` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost9` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost10` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost11` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost12` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost13` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost14` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost15` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost16` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost17` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost18` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost19` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost20` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `WeaponSubClassCost21` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ArmorSubClassCost1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ArmorSubClassCost2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ArmorSubClassCost3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ArmorSubClassCost4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ArmorSubClassCost5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ArmorSubClassCost6` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ArmorSubClassCost7` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ArmorSubClassCost8` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -779,39 +1716,193 @@ CREATE TABLE `durability_quality` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `game_tables`
+-- Table structure for table `emotes`
 --
 
-DROP TABLE IF EXISTS `game_tables`;
+DROP TABLE IF EXISTS `emotes`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `game_tables` (
+CREATE TABLE `emotes` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Name` text NOT NULL,
-  `NumRows` int(10) unsigned NOT NULL DEFAULT '0',
-  `NumColumns` int(10) unsigned NOT NULL DEFAULT '0',
-  `VerifiedBuild` smallint(5) NOT NULL,
+  `EmoteSlashCommand` text,
+  `SpellVisualKitID` int(10) unsigned NOT NULL DEFAULT '0',
+  `EmoteFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `AnimID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteSpecProc` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `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=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `game_tables_locale`
+-- Table structure for table `emotes_text`
 --
 
-DROP TABLE IF EXISTS `game_tables_locale`;
+DROP TABLE IF EXISTS `emotes_text`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `game_tables_locale` (
+CREATE TABLE `emotes_text` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `EmoteID` 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 `emotes_text_locale`
+--
+
+DROP TABLE IF EXISTS `emotes_text_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `emotes_text_locale` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `locale` varchar(4) NOT NULL,
-  `Name_lang` text 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 `emotes_text_sound`
+--
+
+DROP TABLE IF EXISTS `emotes_text_sound`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!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',
+  `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 `faction`
+--
+
+DROP TABLE IF EXISTS `faction`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `faction` (
+  `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',
+  `ReputationMax4` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReputationIndex` smallint(6) NOT NULL DEFAULT '0',
+  `ReputationClassMask1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReputationClassMask2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReputationClassMask3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReputationClassMask4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReputationFlags1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReputationFlags2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReputationFlags3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReputationFlags4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ParentFactionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ParentFactionCapIn` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ParentFactionCapOut` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Expansion` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `FriendshipRepID` 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 `faction_locale`
+--
+
+DROP TABLE IF EXISTS `faction_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `faction_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name_lang` text,
+  `Description_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 `faction_template`
+--
+
+DROP TABLE IF EXISTS `faction_template`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `faction_template` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Faction` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Enemies1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Enemies2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Enemies3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Enemies4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Friends1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Friends2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Friends3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Friends4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Mask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `FriendMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EnemyMask` 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 `gameobject_display_info`
+--
+
+DROP TABLE IF EXISTS `gameobject_display_info`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `gameobject_display_info` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `GeoBoxMinX` float NOT NULL DEFAULT '0',
+  `GeoBoxMinY` float NOT NULL DEFAULT '0',
+  `GeoBoxMinZ` float NOT NULL DEFAULT '0',
+  `GeoBoxMaxX` float NOT NULL DEFAULT '0',
+  `GeoBoxMaxY` float NOT NULL DEFAULT '0',
+  `GeoBoxMaxZ` float NOT NULL DEFAULT '0',
+  `OverrideLootEffectScale` float NOT NULL DEFAULT '0',
+  `OverrideNameScale` float NOT NULL DEFAULT '0',
+  `ObjectEffectPackageID` 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 `gameobjects`
 --
 
@@ -819,9 +1910,6 @@ DROP TABLE IF EXISTS `gameobjects`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `gameobjects` (
-  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `MapID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `DisplayID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `PositionX` float NOT NULL DEFAULT '0',
   `PositionY` float NOT NULL DEFAULT '0',
   `PositionZ` float NOT NULL DEFAULT '0',
@@ -830,20 +1918,23 @@ CREATE TABLE `gameobjects` (
   `RotationZ` float NOT NULL DEFAULT '0',
   `RotationW` float NOT NULL DEFAULT '0',
   `Size` float NOT NULL DEFAULT '0',
-  `PhaseUseFlags` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `PhaseID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `PhaseGroupID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Type` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Data0` int(10) NOT NULL DEFAULT '0',
-  `Data1` int(10) NOT NULL DEFAULT '0',
-  `Data2` int(10) NOT NULL DEFAULT '0',
-  `Data3` int(10) NOT NULL DEFAULT '0',
-  `Data4` int(10) NOT NULL DEFAULT '0',
-  `Data5` int(10) NOT NULL DEFAULT '0',
-  `Data6` int(10) NOT NULL DEFAULT '0',
-  `Data7` int(10) NOT NULL DEFAULT '0',
-  `Name` text NOT NULL,
-  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
+  `Data1` int(11) NOT NULL DEFAULT '0',
+  `Data2` int(11) NOT NULL DEFAULT '0',
+  `Data3` int(11) NOT NULL DEFAULT '0',
+  `Data4` int(11) NOT NULL DEFAULT '0',
+  `Data5` int(11) NOT NULL DEFAULT '0',
+  `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',
+  `PhaseGroupID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PhaseUseFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Type` 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 */;
@@ -872,14 +1963,14 @@ DROP TABLE IF EXISTS `garr_ability`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `garr_ability` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
   `Description` text,
   `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
-  `OtherFactionGarrAbilityID` int(10) unsigned NOT NULL DEFAULT '0',
-  `GarrAbilityCategoryID` int(10) unsigned NOT NULL DEFAULT '0',
-  `FollowerTypeID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `OtherFactionGarrAbilityID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `GarrAbilityCategoryID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `FollowerTypeID` 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;
@@ -913,27 +2004,28 @@ 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',
-  `Unknown` int(10) unsigned NOT NULL DEFAULT '0',
-  `Type` int(10) unsigned NOT NULL DEFAULT '0',
-  `Level` int(10) unsigned NOT NULL DEFAULT '0',
   `NameAlliance` text,
   `NameHorde` text,
   `Description` text,
   `Tooltip` text,
-  `BuildDuration` int(10) unsigned NOT NULL DEFAULT '0',
-  `CostCurrencyID` int(10) unsigned NOT NULL DEFAULT '0',
-  `CostCurrencyAmount` int(11) NOT NULL DEFAULT '0',
-  `HordeTexPrefixKitID` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllianceTexPrefixKitID` int(10) unsigned NOT NULL DEFAULT '0',
   `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
-  `BonusAmount` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllianceActivationScenePackageID` int(10) unsigned NOT NULL DEFAULT '0',
-  `HordeActivationScenePackageID` int(10) unsigned NOT NULL DEFAULT '0',
-  `MaxShipments` int(10) unsigned NOT NULL DEFAULT '0',
-  `FollowerRequiredGarrAbilityID` int(10) unsigned NOT NULL DEFAULT '0',
-  `FollowerGarrAbilityEffectID` int(10) unsigned NOT NULL DEFAULT '0',
-  `CostMoney` int(11) NOT NULL DEFAULT '0',
+  `CostCurrencyID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `HordeTexPrefixKitID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AllianceTexPrefixKitID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AllianceActivationScenePackageID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `HordeActivationScenePackageID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `FollowerRequiredGarrAbilityID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `FollowerGarrAbilityEffectID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CostMoney` smallint(6) NOT NULL DEFAULT '0',
+  `Unknown` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Level` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaxShipments` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `GarrTypeID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `BuildDuration` int(11) NOT NULL DEFAULT '0',
+  `CostCurrencyAmount` int(11) NOT NULL DEFAULT '0',
+  `BonusAmount` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -966,12 +2058,12 @@ DROP TABLE IF EXISTS `garr_building_plot_inst`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `garr_building_plot_inst` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `GarrBuildingID` int(10) unsigned NOT NULL DEFAULT '0',
-  `UiTextureAtlasMemberID` int(10) unsigned NOT NULL DEFAULT '0',
-  `GarrSiteLevelPlotInstID` int(10) unsigned NOT NULL DEFAULT '0',
   `LandmarkOffsetX` float NOT NULL DEFAULT '0',
   `LandmarkOffsetY` float NOT NULL DEFAULT '0',
+  `UiTextureAtlasMemberID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `GarrSiteLevelPlotInstID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `GarrBuildingID` 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;
@@ -985,12 +2077,14 @@ DROP TABLE IF EXISTS `garr_class_spec`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `garr_class_spec` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `NameMale` text,
   `NameFemale` text,
   `NameGenderless` text,
-  `ClassAtlasID` int(10) unsigned NOT NULL DEFAULT '0',
-  `GarrFollItemSetID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ClassAtlasID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `GarrFollItemSetID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Limit` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` 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;
@@ -1022,30 +2116,37 @@ DROP TABLE IF EXISTS `garr_follower`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `garr_follower` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `FollowerTypeID` int(10) unsigned NOT NULL DEFAULT '0',
   `HordeCreatureID` int(10) unsigned NOT NULL DEFAULT '0',
   `AllianceCreatureID` int(10) unsigned NOT NULL DEFAULT '0',
-  `HordeUiAnimRaceInfoID` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllianceUiAnimRaceInfoID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Quality` int(10) unsigned NOT NULL DEFAULT '0',
-  `HordeGarrClassSpecID` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllianceGarrClassSpecID` int(10) unsigned NOT NULL DEFAULT '0',
-  `HordeGarrFollItemSetID` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllianceGarrFollItemSetID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Level` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemLevelWeapon` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemLevelArmor` int(10) unsigned NOT NULL DEFAULT '0',
-  `Unknown1` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `HordeSourceText` text,
   `AllianceSourceText` text,
-  `Unknown2` int(11) NOT NULL DEFAULT '0',
-  `Unknown3` int(11) NOT NULL DEFAULT '0',
   `HordePortraitIconID` int(10) unsigned NOT NULL DEFAULT '0',
   `AlliancePortraitIconID` int(10) unsigned NOT NULL DEFAULT '0',
-  `HordeListPortraitTextureKitID` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllianceListPortraitTextureKitID` int(10) unsigned NOT NULL DEFAULT '0',
+  `HordeAddedBroadcastTextID` int(10) unsigned NOT NULL DEFAULT '0',
+  `AllianceAddedBroadcastTextID` int(10) unsigned NOT NULL DEFAULT '0',
+  `HordeGarrFollItemSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AllianceGarrFollItemSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemLevelWeapon` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemLevelArmor` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `HordeListPortraitTextureKitID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AllianceListPortraitTextureKitID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `FollowerTypeID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `HordeUiAnimRaceInfoID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `AllianceUiAnimRaceInfoID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Quality` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `HordeGarrClassSpecID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `AllianceGarrClassSpecID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Level` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Unknown1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Unknown2` tinyint(4) NOT NULL DEFAULT '0',
+  `Unknown3` tinyint(4) NOT NULL DEFAULT '0',
+  `GarrTypeID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaxDurability` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Class` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `HordeFlavorTextGarrStringID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `AllianceFlavorTextGarrStringID` 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;
@@ -1077,9 +2178,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` int(10) unsigned NOT NULL DEFAULT '0',
-  `GarrAbilityID` int(10) unsigned NOT NULL DEFAULT '0',
-  `FactionIndex` 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',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1094,14 +2195,14 @@ DROP TABLE IF EXISTS `garr_plot`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `garr_plot` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `GarrPlotUICategoryID` int(10) unsigned NOT NULL DEFAULT '0',
-  `PlotType` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
-  `MinCount` int(10) unsigned NOT NULL DEFAULT '0',
-  `MaxCount` int(10) unsigned NOT NULL DEFAULT '0',
   `AllianceConstructionGameObjectID` int(10) unsigned NOT NULL DEFAULT '0',
   `HordeConstructionGameObjectID` int(10) unsigned NOT NULL DEFAULT '0',
+  `GarrPlotUICategoryID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PlotType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MinCount` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxCount` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1116,8 +2217,8 @@ DROP TABLE IF EXISTS `garr_plot_building`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `garr_plot_building` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `GarrPlotID` int(10) unsigned NOT NULL DEFAULT '0',
-  `GarrBuildingID` int(10) unsigned NOT NULL DEFAULT '0',
+  `GarrPlotID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `GarrBuildingID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1132,8 +2233,8 @@ DROP TABLE IF EXISTS `garr_plot_instance`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `garr_plot_instance` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `GarrPlotID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
+  `GarrPlotID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1180,16 +2281,16 @@ DROP TABLE IF EXISTS `garr_site_level`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `garr_site_level` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Level` int(10) unsigned NOT NULL DEFAULT '0',
-  `MapID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SiteID` int(10) unsigned NOT NULL DEFAULT '0',
-  `UITextureKitID` int(10) unsigned NOT NULL DEFAULT '0',
   `TownHallX` float NOT NULL DEFAULT '0',
   `TownHallY` float NOT NULL DEFAULT '0',
-  `MovieID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Level2` int(10) unsigned NOT NULL DEFAULT '0',
-  `UpgradeResourceCost` int(10) unsigned NOT NULL DEFAULT '0',
-  `UpgradeMoneyCost` int(10) unsigned NOT NULL DEFAULT '0',
+  `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SiteID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `UpgradeResourceCost` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `UpgradeMoneyCost` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Level` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `UITextureKitID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MovieID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Level2` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1204,27 +2305,129 @@ DROP TABLE IF EXISTS `garr_site_level_plot_inst`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `garr_site_level_plot_inst` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `GarrSiteLevelID` int(10) unsigned NOT NULL DEFAULT '0',
-  `GarrPlotInstanceID` int(10) unsigned NOT NULL DEFAULT '0',
   `LandmarkX` float NOT NULL DEFAULT '0',
   `LandmarkY` float NOT NULL DEFAULT '0',
-  `Unknown` int(10) unsigned NOT NULL DEFAULT '0',
+  `GarrSiteLevelID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `GarrPlotInstanceID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Unknown` 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 `glyph_slot`
+-- Table structure for table `gem_properties`
 --
 
-DROP TABLE IF EXISTS `glyph_slot`;
+DROP TABLE IF EXISTS `gem_properties`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `glyph_slot` (
+CREATE TABLE `gem_properties` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Type` int(10) unsigned NOT NULL DEFAULT '0',
-  `Tooltip` int(10) unsigned NOT NULL DEFAULT '0',
+  `EnchantID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MinItemLevel` 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 `glyph_bindable_spell`
+--
+
+DROP TABLE IF EXISTS `glyph_bindable_spell`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `glyph_bindable_spell` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) 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;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `glyph_properties`
+--
+
+DROP TABLE IF EXISTS `glyph_properties`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `glyph_properties` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `GlyphExclusiveCategoryID` 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 `glyph_required_spec`
+--
+
+DROP TABLE IF EXISTS `glyph_required_spec`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!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',
+  `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 `guild_color_background`
+--
+
+DROP TABLE IF EXISTS `guild_color_background`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `guild_color_background` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Red` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Green` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Blue` 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 `guild_color_border`
+--
+
+DROP TABLE IF EXISTS `guild_color_border`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `guild_color_border` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Red` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Green` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Blue` 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 `guild_color_emblem`
+--
+
+DROP TABLE IF EXISTS `guild_color_emblem`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `guild_color_emblem` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Red` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Green` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Blue` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1239,7 +2442,6 @@ DROP TABLE IF EXISTS `guild_perk_spells`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `guild_perk_spells` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `GuildLevel` 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`)
@@ -1254,18 +2456,18 @@ DROP TABLE IF EXISTS `heirloom`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `heirloom` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `SourceText` text,
-  `Source` 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',
-  `ItemBonusListID1` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemBonusListID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemBonusListID1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemBonusListID2` 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',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1296,16 +2498,6 @@ DROP TABLE IF EXISTS `holidays`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `holidays` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Duration1` int(10) unsigned NOT NULL DEFAULT '0',
-  `Duration2` int(10) unsigned NOT NULL DEFAULT '0',
-  `Duration3` int(10) unsigned NOT NULL DEFAULT '0',
-  `Duration4` int(10) unsigned NOT NULL DEFAULT '0',
-  `Duration5` int(10) unsigned NOT NULL DEFAULT '0',
-  `Duration6` int(10) unsigned NOT NULL DEFAULT '0',
-  `Duration7` int(10) unsigned NOT NULL DEFAULT '0',
-  `Duration8` int(10) unsigned NOT NULL DEFAULT '0',
-  `Duration9` int(10) unsigned NOT NULL DEFAULT '0',
-  `Duration10` int(10) unsigned NOT NULL DEFAULT '0',
   `Date1` int(10) unsigned NOT NULL DEFAULT '0',
   `Date2` int(10) unsigned NOT NULL DEFAULT '0',
   `Date3` int(10) unsigned NOT NULL DEFAULT '0',
@@ -1322,46 +2514,40 @@ 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',
-  `Region` int(10) unsigned NOT NULL DEFAULT '0',
-  `Looping` int(10) unsigned NOT NULL DEFAULT '0',
-  `CalendarFlags1` int(10) unsigned NOT NULL DEFAULT '0',
-  `CalendarFlags2` int(10) unsigned NOT NULL DEFAULT '0',
-  `CalendarFlags3` int(10) unsigned NOT NULL DEFAULT '0',
-  `CalendarFlags4` int(10) unsigned NOT NULL DEFAULT '0',
-  `CalendarFlags5` int(10) unsigned NOT NULL DEFAULT '0',
-  `CalendarFlags6` int(10) unsigned NOT NULL DEFAULT '0',
-  `CalendarFlags7` int(10) unsigned NOT NULL DEFAULT '0',
-  `CalendarFlags8` int(10) unsigned NOT NULL DEFAULT '0',
-  `CalendarFlags9` int(10) unsigned NOT NULL DEFAULT '0',
-  `CalendarFlags10` int(10) unsigned NOT NULL DEFAULT '0',
-  `HolidayNameID` int(10) unsigned NOT NULL DEFAULT '0',
-  `HolidayDescriptionID` int(10) unsigned NOT NULL DEFAULT '0',
   `TextureFilename` text,
-  `Priority` int(10) unsigned NOT NULL DEFAULT '0',
-  `CalendarFilterType` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `Duration1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Duration2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Duration3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Duration4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Duration5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Duration6` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Duration7` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Duration8` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Duration9` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Duration10` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Region` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Looping` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags3` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags4` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags5` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags6` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags7` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags8` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags9` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags10` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `HolidayNameID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `HolidayDescriptionID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Priority` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CalendarFilterType` tinyint(4) 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 `holidays_locale`
---
-
-DROP TABLE IF EXISTS `holidays_locale`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `holidays_locale` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `locale` varchar(4) NOT NULL,
-  `TextureFilename_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 `hotfix_data`
 --
 
@@ -1449,14 +2635,14 @@ DROP TABLE IF EXISTS `item`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Class` int(10) unsigned NOT NULL DEFAULT '0',
-  `SubClass` int(10) unsigned NOT NULL DEFAULT '0',
-  `SoundOverrideSubclass` int(11) NOT NULL DEFAULT '0',
-  `Material` int(11) NOT NULL DEFAULT '0',
-  `InventoryType` int(10) unsigned NOT NULL DEFAULT '0',
-  `Sheath` int(10) unsigned NOT NULL DEFAULT '0',
   `FileDataID` int(10) unsigned NOT NULL DEFAULT '0',
-  `GroupSoundsID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Class` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SubClass` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SoundOverrideSubclass` tinyint(4) NOT NULL DEFAULT '0',
+  `Material` tinyint(4) NOT NULL DEFAULT '0',
+  `InventoryType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Sheath` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `GroupSoundsID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1473,12 +2659,108 @@ CREATE TABLE `item_appearance` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `DisplayID` int(10) unsigned NOT NULL DEFAULT '0',
   `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `UIOrder` int(10) unsigned NOT NULL DEFAULT '0',
+  `ObjectComponentSlot` 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 `item_armor_quality`
+--
+
+DROP TABLE IF EXISTS `item_armor_quality`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_armor_quality` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `QualityMod1` float NOT NULL DEFAULT '0',
+  `QualityMod2` float NOT NULL DEFAULT '0',
+  `QualityMod3` float NOT NULL DEFAULT '0',
+  `QualityMod4` float NOT NULL DEFAULT '0',
+  `QualityMod5` float NOT NULL DEFAULT '0',
+  `QualityMod6` float NOT NULL DEFAULT '0',
+  `QualityMod7` float NOT NULL DEFAULT '0',
+  `ItemLevel` 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_armor_shield`
+--
+
+DROP TABLE IF EXISTS `item_armor_shield`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_armor_shield` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Quality1` float NOT NULL DEFAULT '0',
+  `Quality2` float NOT NULL DEFAULT '0',
+  `Quality3` float NOT NULL DEFAULT '0',
+  `Quality4` float NOT NULL DEFAULT '0',
+  `Quality5` float NOT NULL DEFAULT '0',
+  `Quality6` float NOT NULL DEFAULT '0',
+  `Quality7` float NOT NULL DEFAULT '0',
+  `ItemLevel` 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_armor_total`
+--
+
+DROP TABLE IF EXISTS `item_armor_total`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_armor_total` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Value1` float NOT NULL DEFAULT '0',
+  `Value2` float NOT NULL DEFAULT '0',
+  `Value3` float NOT NULL DEFAULT '0',
+  `Value4` float NOT NULL DEFAULT '0',
+  `ItemLevel` 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_bag_family`
+--
+
+DROP TABLE IF EXISTS `item_bag_family`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_bag_family` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` 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 `item_bag_family_locale`
+--
+
+DROP TABLE IF EXISTS `item_bag_family_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_bag_family_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 `item_bonus`
 --
 
@@ -1487,11 +2769,26 @@ DROP TABLE IF EXISTS `item_bonus`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_bonus` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `BonusListID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Type` int(10) unsigned NOT NULL DEFAULT '0',
   `Value1` int(11) NOT NULL DEFAULT '0',
   `Value2` int(11) NOT NULL DEFAULT '0',
-  `Index` int(10) unsigned 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',
+  `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_bonus_list_level_delta`
+--
+
+DROP TABLE IF EXISTS `item_bonus_list_level_delta`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_bonus_list_level_delta` (
+  `Delta` smallint(6) 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;
@@ -1506,10 +2803,27 @@ 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` int(10) unsigned NOT NULL DEFAULT '0',
-  `BonusTreeModID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SubTreeID` int(10) unsigned NOT NULL DEFAULT '0',
-  `BonusListID` 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',
+  `BonusTreeModID` 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 `item_child_equipment`
+--
+
+DROP TABLE IF EXISTS `item_child_equipment`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!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',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1524,9 +2838,9 @@ DROP TABLE IF EXISTS `item_class`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_class` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `PriceMod` float NOT NULL DEFAULT '0',
   `Name` text,
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1559,8 +2873,117 @@ CREATE TABLE `item_currency_cost` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `ItemId` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`ID`),
-  UNIQUE KEY `idx_itemId` (`ItemId`)
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `item_damage_ammo`
+--
+
+DROP TABLE IF EXISTS `item_damage_ammo`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_damage_ammo` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DPS1` float NOT NULL DEFAULT '0',
+  `DPS2` float NOT NULL DEFAULT '0',
+  `DPS3` float NOT NULL DEFAULT '0',
+  `DPS4` float NOT NULL DEFAULT '0',
+  `DPS5` float NOT NULL DEFAULT '0',
+  `DPS6` float NOT NULL DEFAULT '0',
+  `DPS7` float NOT NULL DEFAULT '0',
+  `ItemLevel` 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_damage_one_hand`
+--
+
+DROP TABLE IF EXISTS `item_damage_one_hand`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_damage_one_hand` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DPS1` float NOT NULL DEFAULT '0',
+  `DPS2` float NOT NULL DEFAULT '0',
+  `DPS3` float NOT NULL DEFAULT '0',
+  `DPS4` float NOT NULL DEFAULT '0',
+  `DPS5` float NOT NULL DEFAULT '0',
+  `DPS6` float NOT NULL DEFAULT '0',
+  `DPS7` float NOT NULL DEFAULT '0',
+  `ItemLevel` 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_damage_one_hand_caster`
+--
+
+DROP TABLE IF EXISTS `item_damage_one_hand_caster`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_damage_one_hand_caster` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DPS1` float NOT NULL DEFAULT '0',
+  `DPS2` float NOT NULL DEFAULT '0',
+  `DPS3` float NOT NULL DEFAULT '0',
+  `DPS4` float NOT NULL DEFAULT '0',
+  `DPS5` float NOT NULL DEFAULT '0',
+  `DPS6` float NOT NULL DEFAULT '0',
+  `DPS7` float NOT NULL DEFAULT '0',
+  `ItemLevel` 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_damage_two_hand`
+--
+
+DROP TABLE IF EXISTS `item_damage_two_hand`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_damage_two_hand` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DPS1` float NOT NULL DEFAULT '0',
+  `DPS2` float NOT NULL DEFAULT '0',
+  `DPS3` float NOT NULL DEFAULT '0',
+  `DPS4` float NOT NULL DEFAULT '0',
+  `DPS5` float NOT NULL DEFAULT '0',
+  `DPS6` float NOT NULL DEFAULT '0',
+  `DPS7` float NOT NULL DEFAULT '0',
+  `ItemLevel` 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_damage_two_hand_caster`
+--
+
+DROP TABLE IF EXISTS `item_damage_two_hand_caster`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_damage_two_hand_caster` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DPS1` float NOT NULL DEFAULT '0',
+  `DPS2` float NOT NULL DEFAULT '0',
+  `DPS3` float NOT NULL DEFAULT '0',
+  `DPS4` float NOT NULL DEFAULT '0',
+  `DPS5` float NOT NULL DEFAULT '0',
+  `DPS6` float NOT NULL DEFAULT '0',
+  `DPS7` float NOT NULL DEFAULT '0',
+  `ItemLevel` 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 */;
 
@@ -1573,12 +2996,12 @@ DROP TABLE IF EXISTS `item_disenchant_loot`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_disenchant_loot` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemClass` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemSubClass` int(11) NOT NULL DEFAULT '0',
-  `ItemQuality` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinItemLevel` int(10) unsigned NOT NULL DEFAULT '0',
-  `MaxItemLevel` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredDisenchantSkill` int(10) unsigned NOT NULL DEFAULT '0',
+  `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',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1594,14 +3017,14 @@ DROP TABLE IF EXISTS `item_effect`;
 CREATE TABLE `item_effect` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
-  `OrderIndex` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Trigger` int(10) unsigned NOT NULL DEFAULT '0',
-  `Charges` int(10) unsigned NOT NULL DEFAULT '0',
   `Cooldown` int(11) NOT NULL DEFAULT '0',
-  `Category` int(10) unsigned NOT NULL DEFAULT '0',
   `CategoryCooldown` int(11) NOT NULL DEFAULT '0',
-  `ChrSpecializationID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Charges` smallint(6) NOT NULL DEFAULT '0',
+  `Category` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ChrSpecializationID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `OrderIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Trigger` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1616,34 +3039,32 @@ DROP TABLE IF EXISTS `item_extended_cost`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_extended_cost` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredArenaSlot` int(10) unsigned NOT NULL DEFAULT '0',
   `RequiredItem1` int(10) unsigned NOT NULL DEFAULT '0',
   `RequiredItem2` int(10) unsigned NOT NULL DEFAULT '0',
   `RequiredItem3` int(10) unsigned NOT NULL DEFAULT '0',
   `RequiredItem4` int(10) unsigned NOT NULL DEFAULT '0',
   `RequiredItem5` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredItemCount1` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredItemCount2` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredItemCount3` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredItemCount4` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredItemCount5` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredPersonalArenaRating` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemPurchaseGroup` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredCurrency1` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredCurrency2` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredCurrency3` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredCurrency4` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredCurrency5` int(10) unsigned NOT NULL DEFAULT '0',
   `RequiredCurrencyCount1` int(10) unsigned NOT NULL DEFAULT '0',
   `RequiredCurrencyCount2` int(10) unsigned NOT NULL DEFAULT '0',
   `RequiredCurrencyCount3` int(10) unsigned NOT NULL DEFAULT '0',
   `RequiredCurrencyCount4` int(10) unsigned NOT NULL DEFAULT '0',
   `RequiredCurrencyCount5` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredFactionId` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredFactionStanding` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequirementFlags` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredAchievement` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredMoney` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredItemCount1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredItemCount2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredItemCount3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredItemCount4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredItemCount5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredPersonalArenaRating` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredCurrency1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredCurrency2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredCurrency3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredCurrency4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredCurrency5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredArenaSlot` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RequiredFactionId` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RequiredFactionStanding` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RequirementFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RequiredAchievement` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1659,8 +3080,8 @@ DROP TABLE IF EXISTS `item_limit_category`;
 CREATE TABLE `item_limit_category` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
-  `Quantity` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `Quantity` 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;
@@ -1690,12 +3111,12 @@ DROP TABLE IF EXISTS `item_modified_appearance`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_modified_appearance` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
-  `AppearanceModID` int(10) unsigned NOT NULL DEFAULT '0',
-  `AppearanceID` int(10) unsigned NOT NULL DEFAULT '0',
-  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Index` int(10) unsigned NOT NULL DEFAULT '0',
+  `AppearanceID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AppearanceModID` tinyint(3) 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;
@@ -1710,9 +3131,9 @@ DROP TABLE IF EXISTS `item_price_base`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_price_base` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemLevel` int(10) unsigned NOT NULL DEFAULT '0',
   `ArmorFactor` float NOT NULL DEFAULT '0',
   `WeaponFactor` float NOT NULL DEFAULT '0',
+  `ItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1727,13 +3148,12 @@ DROP TABLE IF EXISTS `item_random_properties`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_random_properties` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `InternalName` text,
-  `Enchantment1` int(10) unsigned NOT NULL DEFAULT '0',
-  `Enchantment2` int(10) unsigned NOT NULL DEFAULT '0',
-  `Enchantment3` int(10) unsigned NOT NULL DEFAULT '0',
-  `Enchantment4` int(10) unsigned NOT NULL DEFAULT '0',
-  `Enchantment5` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
+  `Enchantment1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Enchantment2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Enchantment3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Enchantment4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Enchantment5` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1749,7 +3169,6 @@ DROP TABLE IF EXISTS `item_random_properties_locale`;
 CREATE TABLE `item_random_properties_locale` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `locale` varchar(4) NOT NULL,
-  `InternalName_lang` text,
   `Name_lang` text,
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
@@ -1766,17 +3185,16 @@ DROP TABLE IF EXISTS `item_random_suffix`;
 CREATE TABLE `item_random_suffix` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
-  `InternalName` text,
-  `Enchantment1` int(10) unsigned NOT NULL DEFAULT '0',
-  `Enchantment2` int(10) unsigned NOT NULL DEFAULT '0',
-  `Enchantment3` int(10) unsigned NOT NULL DEFAULT '0',
-  `Enchantment4` int(10) unsigned NOT NULL DEFAULT '0',
-  `Enchantment5` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllocationPct1` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllocationPct2` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllocationPct3` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllocationPct4` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllocationPct5` int(10) unsigned NOT NULL DEFAULT '0',
+  `Enchantment1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Enchantment2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Enchantment3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Enchantment4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Enchantment5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AllocationPct1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AllocationPct2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AllocationPct3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AllocationPct4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AllocationPct5` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1793,13 +3211,126 @@ CREATE TABLE `item_random_suffix_locale` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `locale` varchar(4) NOT NULL,
   `Name_lang` text,
-  `InternalName_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 `item_search_name`
+--
+
+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',
+  `Name` 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',
+  `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',
+  `AllowableClass` 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 `item_search_name_locale`
+--
+
+DROP TABLE IF EXISTS `item_search_name_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_search_name_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 `item_set`
+--
+
+DROP TABLE IF EXISTS `item_set`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_set` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `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',
+  `ItemID5` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID6` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID7` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID8` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID9` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID10` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID11` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID12` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID13` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID14` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID15` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID16` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID17` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredSkillRank` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredSkill` 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 `item_set_locale`
+--
+
+DROP TABLE IF EXISTS `item_set_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_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 `item_set_spell`
+--
+
+DROP TABLE IF EXISTS `item_set_spell`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+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',
+  `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_sparse`
 --
 
@@ -1808,50 +3339,18 @@ DROP TABLE IF EXISTS `item_sparse`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_sparse` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Quality` 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',
   `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',
-  `InventoryType` int(10) unsigned NOT NULL DEFAULT '0',
   `AllowableClass` int(11) NOT NULL DEFAULT '0',
   `AllowableRace` int(11) NOT NULL DEFAULT '0',
-  `ItemLevel` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredLevel` int(11) NOT NULL DEFAULT '0',
-  `RequiredSkill` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredSkillRank` int(10) unsigned NOT NULL DEFAULT '0',
   `RequiredSpell` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredHonorRank` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredCityRank` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredReputationFaction` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredReputationRank` int(10) unsigned NOT NULL DEFAULT '0',
   `MaxCount` int(10) unsigned NOT NULL DEFAULT '0',
   `Stackable` int(10) unsigned NOT NULL DEFAULT '0',
-  `ContainerSlots` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemStatType1` int(11) NOT NULL DEFAULT '0',
-  `ItemStatType2` int(11) NOT NULL DEFAULT '0',
-  `ItemStatType3` int(11) NOT NULL DEFAULT '0',
-  `ItemStatType4` int(11) NOT NULL DEFAULT '0',
-  `ItemStatType5` int(11) NOT NULL DEFAULT '0',
-  `ItemStatType6` int(11) NOT NULL DEFAULT '0',
-  `ItemStatType7` int(11) NOT NULL DEFAULT '0',
-  `ItemStatType8` int(11) NOT NULL DEFAULT '0',
-  `ItemStatType9` int(11) NOT NULL DEFAULT '0',
-  `ItemStatType10` int(11) NOT NULL DEFAULT '0',
-  `ItemStatValue1` int(11) NOT NULL DEFAULT '0',
-  `ItemStatValue2` int(11) NOT NULL DEFAULT '0',
-  `ItemStatValue3` int(11) NOT NULL DEFAULT '0',
-  `ItemStatValue4` int(11) NOT NULL DEFAULT '0',
-  `ItemStatValue5` int(11) NOT NULL DEFAULT '0',
-  `ItemStatValue6` int(11) NOT NULL DEFAULT '0',
-  `ItemStatValue7` int(11) NOT NULL DEFAULT '0',
-  `ItemStatValue8` int(11) NOT NULL DEFAULT '0',
-  `ItemStatValue9` int(11) NOT NULL DEFAULT '0',
-  `ItemStatValue10` int(11) NOT NULL DEFAULT '0',
   `ItemStatAllocation1` int(11) NOT NULL DEFAULT '0',
   `ItemStatAllocation2` int(11) NOT NULL DEFAULT '0',
   `ItemStatAllocation3` int(11) NOT NULL DEFAULT '0',
@@ -1872,43 +3371,77 @@ CREATE TABLE `item_sparse` (
   `ItemStatSocketCostMultiplier8` float NOT NULL DEFAULT '0',
   `ItemStatSocketCostMultiplier9` float NOT NULL DEFAULT '0',
   `ItemStatSocketCostMultiplier10` float NOT NULL DEFAULT '0',
-  `ScalingStatDistribution` int(10) unsigned NOT NULL DEFAULT '0',
-  `DamageType` int(10) unsigned NOT NULL DEFAULT '0',
-  `Delay` int(10) unsigned NOT NULL DEFAULT '0',
   `RangedModRange` float NOT NULL DEFAULT '0',
-  `Bonding` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
   `Name2` text,
   `Name3` text,
   `Name4` text,
   `Description` text,
-  `PageText` int(10) unsigned NOT NULL DEFAULT '0',
-  `LanguageID` int(10) unsigned NOT NULL DEFAULT '0',
-  `PageMaterial` int(10) unsigned NOT NULL DEFAULT '0',
-  `StartQuest` int(10) unsigned NOT NULL DEFAULT '0',
-  `LockID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Material` int(11) NOT NULL DEFAULT '0',
-  `Sheath` int(10) unsigned NOT NULL DEFAULT '0',
-  `RandomProperty` int(10) unsigned NOT NULL DEFAULT '0',
-  `RandomSuffix` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemSet` int(10) unsigned NOT NULL DEFAULT '0',
-  `Area` int(10) unsigned NOT NULL DEFAULT '0',
-  `Map` int(10) unsigned NOT NULL DEFAULT '0',
   `BagFamily` int(10) unsigned NOT NULL DEFAULT '0',
-  `TotemCategory` int(10) unsigned NOT NULL DEFAULT '0',
-  `SocketColor1` int(10) unsigned NOT NULL DEFAULT '0',
-  `SocketColor2` int(10) unsigned NOT NULL DEFAULT '0',
-  `SocketColor3` int(10) unsigned NOT NULL DEFAULT '0',
-  `SocketBonus` int(10) unsigned NOT NULL DEFAULT '0',
-  `GemProperties` int(10) unsigned NOT NULL DEFAULT '0',
   `ArmorDamageModifier` float NOT NULL DEFAULT '0',
   `Duration` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemLimitCategory` int(10) unsigned NOT NULL DEFAULT '0',
-  `HolidayID` int(10) unsigned NOT NULL DEFAULT '0',
   `StatScalingFactor` float NOT NULL DEFAULT '0',
-  `CurrencySubstitutionID` int(10) unsigned NOT NULL DEFAULT '0',
-  `CurrencySubstitutionCount` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemNameDescriptionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredSkill` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredSkillRank` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredReputationFaction` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemStatValue1` smallint(6) NOT NULL DEFAULT '0',
+  `ItemStatValue2` smallint(6) NOT NULL DEFAULT '0',
+  `ItemStatValue3` smallint(6) NOT NULL DEFAULT '0',
+  `ItemStatValue4` smallint(6) NOT NULL DEFAULT '0',
+  `ItemStatValue5` smallint(6) NOT NULL DEFAULT '0',
+  `ItemStatValue6` smallint(6) NOT NULL DEFAULT '0',
+  `ItemStatValue7` smallint(6) NOT NULL DEFAULT '0',
+  `ItemStatValue8` smallint(6) NOT NULL DEFAULT '0',
+  `ItemStatValue9` smallint(6) NOT NULL DEFAULT '0',
+  `ItemStatValue10` smallint(6) NOT NULL DEFAULT '0',
+  `ScalingStatDistribution` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Delay` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PageText` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `StartQuest` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LockID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RandomProperty` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RandomSuffix` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemSet` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Area` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Map` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SocketBonus` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `GemProperties` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemLimitCategory` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `HolidayID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemNameDescriptionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Quality` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `BuyCount` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `InventoryType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RequiredLevel` tinyint(4) NOT NULL DEFAULT '0',
+  `RequiredHonorRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RequiredCityRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RequiredReputationRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ContainerSlots` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ItemStatType1` tinyint(4) NOT NULL DEFAULT '0',
+  `ItemStatType2` tinyint(4) NOT NULL DEFAULT '0',
+  `ItemStatType3` tinyint(4) NOT NULL DEFAULT '0',
+  `ItemStatType4` tinyint(4) NOT NULL DEFAULT '0',
+  `ItemStatType5` tinyint(4) NOT NULL DEFAULT '0',
+  `ItemStatType6` tinyint(4) NOT NULL DEFAULT '0',
+  `ItemStatType7` tinyint(4) NOT NULL DEFAULT '0',
+  `ItemStatType8` tinyint(4) NOT NULL DEFAULT '0',
+  `ItemStatType9` tinyint(4) NOT NULL DEFAULT '0',
+  `ItemStatType10` tinyint(4) NOT NULL DEFAULT '0',
+  `DamageType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Bonding` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `LanguageID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PageMaterial` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Material` tinyint(4) NOT NULL DEFAULT '0',
+  `Sheath` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `TotemCategory` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SocketColor1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SocketColor2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SocketColor3` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CurrencySubstitutionID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CurrencySubstitutionCount` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ArtifactID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RequiredExpansion` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1943,12 +3476,12 @@ DROP TABLE IF EXISTS `item_spec`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_spec` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinLevel` int(10) unsigned NOT NULL DEFAULT '0',
-  `MaxLevel` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemType` int(10) unsigned NOT NULL DEFAULT '0',
-  `PrimaryStat` int(10) unsigned NOT NULL DEFAULT '0',
-  `SecondaryStat` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpecID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpecID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MinLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaxLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ItemType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PrimaryStat` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SecondaryStat` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1964,22 +3497,28 @@ DROP TABLE IF EXISTS `item_spec_override`;
 CREATE TABLE `item_spec_override` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpecID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpecID` 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_to_battle_pet_species`
+-- Table structure for table `item_upgrade`
 --
 
-DROP TABLE IF EXISTS `item_to_battle_pet_species`;
+DROP TABLE IF EXISTS `item_upgrade`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `item_to_battle_pet_species` (
+CREATE TABLE `item_upgrade` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `BattlePetSpeciesID` int(10) unsigned NOT NULL DEFAULT '0'
+  `CurrencyCost` int(10) unsigned NOT NULL DEFAULT '0',
+  `PrevItemUpgradeID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CurrencyID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemUpgradePathID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ItemLevelBonus` 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 */;
 
@@ -1993,7 +3532,7 @@ DROP TABLE IF EXISTS `item_x_bonus_tree`;
 CREATE TABLE `item_x_bonus_tree` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
-  `BonusTreeID` int(10) 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;
@@ -2007,7 +3546,7 @@ DROP TABLE IF EXISTS `key_chain`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `key_chain` (
-  `Id` int(10) unsigned NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Key1` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Key2` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Key3` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -2041,7 +3580,222 @@ CREATE TABLE `key_chain` (
   `Key31` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Key32` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`Id`)
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `lfg_dungeons`
+--
+
+DROP TABLE IF EXISTS `lfg_dungeons`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `lfg_dungeons` (
+  `Name` text,
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `TextureFilename` text,
+  `Description` text,
+  `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `TargetLevelMax` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MapID` smallint(6) NOT NULL DEFAULT '0',
+  `RandomID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ScenarioID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LastBossJournalEncounterID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `BonusReputationAmount` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MentorItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MinLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `TargetLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `TargetLevelMin` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Faction` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Expansion` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `OrderIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `GroupID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CountTank` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CountHealer` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CountDamage` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MinCountTank` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MinCountHealer` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `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',
+  `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 `lfg_dungeons_locale`
+--
+
+DROP TABLE IF EXISTS `lfg_dungeons_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `lfg_dungeons_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name_lang` text,
+  `Description_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 `light`
+--
+
+DROP TABLE IF EXISTS `light`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `light` (
+  `ID` 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',
+  `FalloffStart` float NOT NULL DEFAULT '0',
+  `FalloffEnd` float NOT NULL DEFAULT '0',
+  `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LightParamsID1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LightParamsID2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LightParamsID3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LightParamsID4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LightParamsID5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LightParamsID6` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LightParamsID7` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LightParamsID8` 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 `liquid_type`
+--
+
+DROP TABLE IF EXISTS `liquid_type`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+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,
+  `Color1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Color2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Float1` float NOT NULL DEFAULT '0',
+  `Float2` float NOT NULL DEFAULT '0',
+  `Float3` float NOT NULL DEFAULT '0',
+  `Float4` float NOT NULL DEFAULT '0',
+  `Float5` float NOT NULL DEFAULT '0',
+  `Float6` float NOT NULL DEFAULT '0',
+  `Float7` float NOT NULL DEFAULT '0',
+  `Float8` float NOT NULL DEFAULT '0',
+  `Float9` float NOT NULL DEFAULT '0',
+  `Float10` float NOT NULL DEFAULT '0',
+  `Float11` float NOT NULL DEFAULT '0',
+  `Float12` float NOT NULL DEFAULT '0',
+  `Float13` float NOT NULL DEFAULT '0',
+  `Float14` float NOT NULL DEFAULT '0',
+  `Float15` float NOT NULL DEFAULT '0',
+  `Float16` float NOT NULL DEFAULT '0',
+  `Float17` float NOT NULL DEFAULT '0',
+  `Float18` float NOT NULL DEFAULT '0',
+  `Int1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Int2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Int3` int(10) unsigned NOT NULL DEFAULT '0',
+  `Int4` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LightID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ParticleMovement` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ParticleTexSlots` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaterialID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DepthTexCount1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DepthTexCount2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DepthTexCount3` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DepthTexCount4` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DepthTexCount5` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DepthTexCount6` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SoundID` 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 `liquid_type_locale`
+--
+
+DROP TABLE IF EXISTS `liquid_type_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `liquid_type_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 `lock`
+--
+
+DROP TABLE IF EXISTS `lock`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `lock` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Index1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Index2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Index3` int(10) unsigned NOT NULL DEFAULT '0',
+  `Index4` int(10) unsigned NOT NULL DEFAULT '0',
+  `Index5` int(10) unsigned NOT NULL DEFAULT '0',
+  `Index6` int(10) unsigned NOT NULL DEFAULT '0',
+  `Index7` int(10) unsigned NOT NULL DEFAULT '0',
+  `Index8` int(10) unsigned NOT NULL DEFAULT '0',
+  `Skill1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Skill2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Skill3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Skill4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Skill5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Skill6` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Skill7` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Skill8` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Type1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Type2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Type3` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Type4` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Type5` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Type6` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Type7` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Type8` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Action1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Action2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Action3` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Action4` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Action5` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Action6` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Action7` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Action8` 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 */;
 
@@ -2077,6 +3831,97 @@ CREATE TABLE `mail_template_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `map`
+--
+
+DROP TABLE IF EXISTS `map`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+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,
+  `AreaTableID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `LoadingScreenID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CorpseMapID` smallint(6) NOT NULL DEFAULT '0',
+  `TimeOfDayOverride` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ParentMapID` smallint(6) NOT NULL DEFAULT '0',
+  `CosmeticParentMapID` smallint(6) NOT NULL DEFAULT '0',
+  `WindSettingsID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `InstanceType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `unk5` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ExpansionID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaxPlayers` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `TimeOffset` 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 `map_difficulty`
+--
+
+DROP TABLE IF EXISTS `map_difficulty`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+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',
+  `ItemBonusTreeModID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Context` 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 `map_difficulty_locale`
+--
+
+DROP TABLE IF EXISTS `map_difficulty_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `map_difficulty_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Message_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 `map_locale`
+--
+
+DROP TABLE IF EXISTS `map_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `map_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `MapName_lang` text,
+  `MapDescription0_lang` text,
+  `MapDescription1_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 `modifier_tree`
 --
 
@@ -2085,12 +3930,13 @@ DROP TABLE IF EXISTS `modifier_tree`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `modifier_tree` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Type` int(10) unsigned NOT NULL DEFAULT '0',
   `Asset1` int(10) unsigned NOT NULL DEFAULT '0',
   `Asset2` int(10) unsigned NOT NULL DEFAULT '0',
-  `Operator` int(10) unsigned NOT NULL DEFAULT '0',
-  `Amount` int(10) unsigned NOT NULL DEFAULT '0',
-  `Parent` int(10) unsigned NOT NULL DEFAULT '0',
+  `Parent` smallint(5) 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',
+  `Amount` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2104,18 +3950,19 @@ DROP TABLE IF EXISTS `mount`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `mount` (
-  `Id` int(10) unsigned NOT NULL DEFAULT '0',
-  `MountTypeId` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellId` int(10) unsigned NOT NULL DEFAULT '0',
   `DisplayId` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
   `Description` text,
   `SourceDescription` text,
-  `Source` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellId` int(10) unsigned NOT NULL DEFAULT '0',
-  `PlayerConditionId` 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',
+  `PlayerConditionId` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Source` 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`)
+  PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2127,14 +3974,14 @@ DROP TABLE IF EXISTS `mount_capability`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `mount_capability` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredRidingSkill` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredArea` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredAura` int(10) unsigned NOT NULL DEFAULT '0',
   `RequiredSpell` int(10) unsigned NOT NULL DEFAULT '0',
   `SpeedModSpell` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredMap` int(11) NOT NULL DEFAULT '0',
+  `RequiredRidingSkill` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredArea` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredMap` smallint(6) NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredAura` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2148,13 +3995,13 @@ DROP TABLE IF EXISTS `mount_locale`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `mount_locale` (
-  `Id` int(10) unsigned NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `locale` varchar(4) NOT NULL,
   `Name_lang` text,
   `Description_lang` text,
   `SourceDescription_lang` text,
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`Id`,`locale`)
+  PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2167,9 +4014,27 @@ DROP TABLE IF EXISTS `mount_type_x_capability`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `mount_type_x_capability` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `MountTypeID` int(10) unsigned NOT NULL DEFAULT '0',
-  `OrderIndex` int(10) unsigned NOT NULL DEFAULT '0',
-  `MountCapabilityID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MountTypeID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MountCapabilityID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `OrderIndex` 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 `movie`
+--
+
+DROP TABLE IF EXISTS `movie`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `movie` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `AudioFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SubtitleFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Volume` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `KeyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2185,8 +4050,8 @@ DROP TABLE IF EXISTS `name_gen`;
 CREATE TABLE `name_gen` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
-  `Race` int(10) unsigned NOT NULL DEFAULT '0',
-  `Sex` int(10) unsigned NOT NULL DEFAULT '0',
+  `Race` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Sex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2218,7 +4083,7 @@ DROP TABLE IF EXISTS `names_profanity`;
 CREATE TABLE `names_profanity` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
-  `Language` int(10) NOT NULL DEFAULT '0',
+  `Language` tinyint(4) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2249,7 +4114,7 @@ DROP TABLE IF EXISTS `names_reserved_locale`;
 CREATE TABLE `names_reserved_locale` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
-  `LocaleMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `LocaleMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2274,24 +4139,39 @@ CREATE TABLE `override_spell_data` (
   `SpellID8` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellID9` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellID10` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `PlayerActionbarFileDataID` int(10) 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 `phase_group`
+-- Table structure for table `phase`
 --
 
-DROP TABLE IF EXISTS `phase_group`;
+DROP TABLE IF EXISTS `phase`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `phase_group` (
+CREATE TABLE `phase` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `PhaseID` int(10) unsigned NOT NULL DEFAULT '0',
-  `PhaseGroupID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` 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 `phase_x_phase_group`
+--
+
+DROP TABLE IF EXISTS `phase_x_phase_group`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `phase_x_phase_group` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PhaseID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PhaseGroupID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2306,63 +4186,122 @@ DROP TABLE IF EXISTS `player_condition`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `player_condition` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinLevel` int(10) unsigned NOT NULL DEFAULT '0',
-  `MaxLevel` int(10) unsigned NOT NULL DEFAULT '0',
   `RaceMask` int(10) unsigned NOT NULL DEFAULT '0',
-  `ClassMask` int(10) unsigned NOT NULL DEFAULT '0',
-  `Gender` int(11) NOT NULL DEFAULT '0',
-  `NativeGender` int(11) NOT NULL DEFAULT '0',
-  `SkillID1` int(10) unsigned NOT NULL DEFAULT '0',
-  `SkillID2` int(10) unsigned NOT NULL DEFAULT '0',
-  `SkillID3` int(10) unsigned NOT NULL DEFAULT '0',
-  `SkillID4` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinSkill1` int(11) NOT NULL DEFAULT '0',
-  `MinSkill2` int(11) NOT NULL DEFAULT '0',
-  `MinSkill3` int(11) NOT NULL DEFAULT '0',
-  `MinSkill4` int(11) NOT NULL DEFAULT '0',
-  `MaxSkill1` int(11) NOT NULL DEFAULT '0',
-  `MaxSkill2` int(11) NOT NULL DEFAULT '0',
-  `MaxSkill3` int(11) NOT NULL DEFAULT '0',
-  `MaxSkill4` int(11) NOT NULL DEFAULT '0',
   `SkillLogic` int(10) unsigned NOT NULL DEFAULT '0',
-  `LanguageID` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinLanguage` int(10) unsigned NOT NULL DEFAULT '0',
-  `MaxLanguage` 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',
-  `MaxFactionID` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinReputation1` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinReputation2` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinReputation3` int(10) unsigned NOT NULL DEFAULT '0',
-  `MaxReputation` int(10) unsigned NOT NULL DEFAULT '0',
   `ReputationLogic` int(10) unsigned NOT NULL DEFAULT '0',
-  `Unknown1` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinPVPRank` int(10) unsigned NOT NULL DEFAULT '0',
-  `MaxPVPRank` int(10) unsigned NOT NULL DEFAULT '0',
-  `PvpMedal` int(10) unsigned NOT NULL DEFAULT '0',
   `PrevQuestLogic` int(10) unsigned NOT NULL DEFAULT '0',
-  `PrevQuestID1` int(10) unsigned NOT NULL DEFAULT '0',
-  `PrevQuestID2` int(10) unsigned NOT NULL DEFAULT '0',
-  `PrevQuestID3` int(10) unsigned NOT NULL DEFAULT '0',
-  `PrevQuestID4` int(10) unsigned NOT NULL DEFAULT '0',
   `CurrQuestLogic` int(10) unsigned NOT NULL DEFAULT '0',
-  `CurrQuestID1` int(10) unsigned NOT NULL DEFAULT '0',
-  `CurrQuestID2` int(10) unsigned NOT NULL DEFAULT '0',
-  `CurrQuestID3` int(10) unsigned NOT NULL DEFAULT '0',
-  `CurrQuestID4` int(10) unsigned NOT NULL DEFAULT '0',
   `CurrentCompletedQuestLogic` int(10) unsigned NOT NULL DEFAULT '0',
-  `CurrentCompletedQuestID1` int(10) unsigned NOT NULL DEFAULT '0',
-  `CurrentCompletedQuestID2` int(10) unsigned NOT NULL DEFAULT '0',
-  `CurrentCompletedQuestID3` int(10) unsigned NOT NULL DEFAULT '0',
-  `CurrentCompletedQuestID4` 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',
+  `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',
+  `AchievementLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `AreaLogic` int(10) 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',
+  `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',
+  `PrevQuestID1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PrevQuestID2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PrevQuestID3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PrevQuestID4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CurrQuestID1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CurrQuestID2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CurrQuestID3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CurrQuestID4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CurrentCompletedQuestID1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CurrentCompletedQuestID2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CurrentCompletedQuestID3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CurrentCompletedQuestID4` smallint(5) 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',
+  `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',
+  `LfgStatus1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `LfgStatus2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `LfgStatus3` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `LfgStatus4` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `LfgCompare1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `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',
-  `ItemLogic` 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',
@@ -2371,77 +4310,27 @@ CREATE TABLE `player_condition` (
   `ItemCount2` int(10) unsigned NOT NULL DEFAULT '0',
   `ItemCount3` int(10) unsigned NOT NULL DEFAULT '0',
   `ItemCount4` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemFlags` int(10) unsigned NOT NULL DEFAULT '0',
-  `Explored1` int(10) unsigned NOT NULL DEFAULT '0',
-  `Explored2` int(10) unsigned NOT NULL DEFAULT '0',
-  `Time1` int(10) unsigned NOT NULL DEFAULT '0',
-  `Time2` int(10) 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` int(10) unsigned NOT NULL DEFAULT '0',
-  `WeatherID` int(10) unsigned NOT NULL DEFAULT '0',
-  `PartyStatus` int(10) unsigned NOT NULL DEFAULT '0',
-  `LifetimeMaxPVPRank` int(10) unsigned NOT NULL DEFAULT '0',
-  `AchievementLogic` int(10) unsigned NOT NULL DEFAULT '0',
-  `Achievement1` int(10) unsigned NOT NULL DEFAULT '0',
-  `Achievement2` int(10) unsigned NOT NULL DEFAULT '0',
-  `Achievement3` int(10) unsigned NOT NULL DEFAULT '0',
-  `Achievement4` int(10) unsigned NOT NULL DEFAULT '0',
   `LfgLogic` int(10) unsigned NOT NULL DEFAULT '0',
-  `LfgStatus1` int(10) unsigned NOT NULL DEFAULT '0',
-  `LfgStatus2` int(10) unsigned NOT NULL DEFAULT '0',
-  `LfgStatus3` int(10) unsigned NOT NULL DEFAULT '0',
-  `LfgStatus4` int(10) unsigned NOT NULL DEFAULT '0',
-  `LfgCompare1` int(10) unsigned NOT NULL DEFAULT '0',
-  `LfgCompare2` int(10) unsigned NOT NULL DEFAULT '0',
-  `LfgCompare3` int(10) unsigned NOT NULL DEFAULT '0',
-  `LfgCompare4` 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',
-  `AreaLogic` int(10) unsigned NOT NULL DEFAULT '0',
-  `AreaID1` int(10) unsigned NOT NULL DEFAULT '0',
-  `AreaID2` int(10) unsigned NOT NULL DEFAULT '0',
-  `AreaID3` int(10) unsigned NOT NULL DEFAULT '0',
-  `AreaID4` int(10) unsigned NOT NULL DEFAULT '0',
   `CurrencyLogic` int(10) 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',
-  `QuestKillID` int(10) unsigned NOT NULL DEFAULT '0',
-  `QuestKillLogic` 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',
-  `MinExpansionLevel` int(11) NOT NULL DEFAULT '0',
-  `MaxExpansionLevel` int(11) NOT NULL DEFAULT '0',
-  `MinExpansionTier` int(11) NOT NULL DEFAULT '0',
-  `MaxExpansionTier` int(11) NOT NULL DEFAULT '0',
-  `MinGuildLevel` int(10) unsigned NOT NULL DEFAULT '0',
-  `MaxGuildLevel` int(10) unsigned NOT NULL DEFAULT '0',
-  `PhaseUseFlags` int(10) unsigned NOT NULL DEFAULT '0',
-  `PhaseID` 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',
-  `MinAvgEquippedItemLevel` int(10) unsigned NOT NULL DEFAULT '0',
-  `MaxAvgEquippedItemLevel` int(10) unsigned NOT NULL DEFAULT '0',
-  `ChrSpecializationIndex` int(11) NOT NULL DEFAULT '0',
-  `ChrSpecializationRole` int(11) NOT NULL DEFAULT '0',
-  `FailureDescription` text,
-  `PowerType` int(11) NOT NULL DEFAULT '0',
-  `PowerTypeComp` int(11) NOT NULL DEFAULT '0',
-  `PowerTypeValue` int(11) NOT NULL DEFAULT '0',
+  `Unknown7001` int(11) NOT NULL DEFAULT '0',
+  `Unknown7002` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2464,6 +4353,93 @@ CREATE TABLE `player_condition_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `power_display`
+--
+
+DROP TABLE IF EXISTS `power_display`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `power_display` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `GlobalStringBaseTag` text,
+  `PowerType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Red` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Green` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Blue` 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 `power_type`
+--
+
+DROP TABLE IF EXISTS `power_type`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `power_type` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PowerTypeToken` text,
+  `PowerCostToken` text,
+  `RegenerationPeace` float NOT NULL DEFAULT '0',
+  `RegenerationCombat` float NOT NULL DEFAULT '0',
+  `MaxPower` smallint(6) NOT NULL DEFAULT '0',
+  `RegenerationDelay` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PowerTypeEnum` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RegenerationMin` tinyint(4) NOT NULL DEFAULT '0',
+  `RegenerationCenter` tinyint(4) NOT NULL DEFAULT '0',
+  `RegenerationMax` tinyint(4) NOT NULL DEFAULT '0',
+  `UIModifier` 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 `pvp_difficulty`
+--
+
+DROP TABLE IF EXISTS `pvp_difficulty`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!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',
+  `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 `quest_faction_reward`
+--
+
+DROP TABLE IF EXISTS `quest_faction_reward`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_faction_reward` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `QuestRewFactionValue1` smallint(6) NOT NULL DEFAULT '0',
+  `QuestRewFactionValue2` smallint(6) NOT NULL DEFAULT '0',
+  `QuestRewFactionValue3` smallint(6) NOT NULL DEFAULT '0',
+  `QuestRewFactionValue4` smallint(6) NOT NULL DEFAULT '0',
+  `QuestRewFactionValue5` smallint(6) NOT NULL DEFAULT '0',
+  `QuestRewFactionValue6` smallint(6) NOT NULL DEFAULT '0',
+  `QuestRewFactionValue7` smallint(6) NOT NULL DEFAULT '0',
+  `QuestRewFactionValue8` smallint(6) NOT NULL DEFAULT '0',
+  `QuestRewFactionValue9` smallint(6) NOT NULL DEFAULT '0',
+  `QuestRewFactionValue10` smallint(6) 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 `quest_money_reward`
 --
 
@@ -2471,7 +4447,7 @@ DROP TABLE IF EXISTS `quest_money_reward`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `quest_money_reward` (
-  `Level` int(10) unsigned NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Money1` int(10) unsigned NOT NULL DEFAULT '0',
   `Money2` int(10) unsigned NOT NULL DEFAULT '0',
   `Money3` int(10) unsigned NOT NULL DEFAULT '0',
@@ -2483,7 +4459,7 @@ CREATE TABLE `quest_money_reward` (
   `Money9` int(10) unsigned NOT NULL DEFAULT '0',
   `Money10` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`Level`)
+  PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2496,10 +4472,10 @@ DROP TABLE IF EXISTS `quest_package_item`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `quest_package_item` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `QuestPackageID` int(10) unsigned NOT NULL DEFAULT '0',
   `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemCount` int(10) unsigned NOT NULL DEFAULT '0',
-  `FilterType` int(10) unsigned NOT NULL DEFAULT '0',
+  `QuestPackageID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemCount` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `FilterType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2515,6 +4491,7 @@ DROP TABLE IF EXISTS `quest_sort`;
 CREATE TABLE `quest_sort` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `SortName` text,
+  `SortOrder` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2545,7 +4522,7 @@ DROP TABLE IF EXISTS `quest_v2`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `quest_v2` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `UniqueBitFlag` int(10) unsigned NOT NULL DEFAULT '0',
+  `UniqueBitFlag` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2560,16 +4537,61 @@ DROP TABLE IF EXISTS `quest_xp`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `quest_xp` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Exp1` int(10) unsigned NOT NULL DEFAULT '0',
-  `Exp2` int(10) unsigned NOT NULL DEFAULT '0',
-  `Exp3` int(10) unsigned NOT NULL DEFAULT '0',
-  `Exp4` int(10) unsigned NOT NULL DEFAULT '0',
-  `Exp5` int(10) unsigned NOT NULL DEFAULT '0',
-  `Exp6` int(10) unsigned NOT NULL DEFAULT '0',
-  `Exp7` int(10) unsigned NOT NULL DEFAULT '0',
-  `Exp8` int(10) unsigned NOT NULL DEFAULT '0',
-  `Exp9` int(10) unsigned NOT NULL DEFAULT '0',
-  `Exp10` int(10) unsigned NOT NULL DEFAULT '0',
+  `Exp1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Exp2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Exp3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Exp4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Exp5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Exp6` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Exp7` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Exp8` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Exp9` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Exp10` 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 `rand_prop_points`
+--
+
+DROP TABLE IF EXISTS `rand_prop_points`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `rand_prop_points` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `EpicPropertiesPoints1` int(10) unsigned NOT NULL DEFAULT '0',
+  `EpicPropertiesPoints2` int(10) unsigned NOT NULL DEFAULT '0',
+  `EpicPropertiesPoints3` int(10) unsigned NOT NULL DEFAULT '0',
+  `EpicPropertiesPoints4` int(10) unsigned NOT NULL DEFAULT '0',
+  `EpicPropertiesPoints5` int(10) unsigned NOT NULL DEFAULT '0',
+  `RarePropertiesPoints1` int(10) unsigned NOT NULL DEFAULT '0',
+  `RarePropertiesPoints2` int(10) unsigned NOT NULL DEFAULT '0',
+  `RarePropertiesPoints3` int(10) unsigned NOT NULL DEFAULT '0',
+  `RarePropertiesPoints4` int(10) unsigned NOT NULL DEFAULT '0',
+  `RarePropertiesPoints5` int(10) unsigned NOT NULL DEFAULT '0',
+  `UncommonPropertiesPoints1` int(10) unsigned NOT NULL DEFAULT '0',
+  `UncommonPropertiesPoints2` int(10) unsigned NOT NULL DEFAULT '0',
+  `UncommonPropertiesPoints3` int(10) unsigned NOT NULL DEFAULT '0',
+  `UncommonPropertiesPoints4` int(10) unsigned NOT NULL DEFAULT '0',
+  `UncommonPropertiesPoints5` 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`
+--
+
+DROP TABLE IF EXISTS `ruleset_item_upgrade`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ruleset_item_upgrade` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemUpgradeID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2584,91 +4606,173 @@ DROP TABLE IF EXISTS `scaling_stat_distribution`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `scaling_stat_distribution` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemLevelCurveID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MinLevel` int(10) unsigned NOT NULL DEFAULT '0',
   `MaxLevel` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemLevelCurveID` 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_entries`
+-- Table structure for table `scene_script`
 --
 
-DROP TABLE IF EXISTS `sound_entries`;
+DROP TABLE IF EXISTS `scene_script`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `sound_entries` (
+CREATE TABLE `scene_script` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SoundType` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
-  `FileDataID1` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID2` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID3` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID4` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID5` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID6` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID7` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID8` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID9` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID10` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID11` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID12` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID13` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID14` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID15` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID16` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID17` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID18` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID19` int(10) unsigned NOT NULL DEFAULT '0',
-  `FileDataID20` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq1` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq2` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq3` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq4` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq5` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq6` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq7` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq8` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq9` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq10` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq11` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq12` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq13` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq14` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq15` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq16` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq17` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq18` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq19` int(10) unsigned NOT NULL DEFAULT '0',
-  `Freq20` int(10) unsigned NOT NULL DEFAULT '0',
+  `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',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `scene_script_package`
+--
+
+DROP TABLE IF EXISTS `scene_script_package`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scene_script_package` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` 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`
+--
+
+DROP TABLE IF EXISTS `skill_line`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `skill_line` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DisplayName` text,
+  `Description` text,
+  `AlternateVerb` text,
+  `SpellIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CategoryID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CanLink` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ParentSkillLineID` 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 `skill_line_ability`
+--
+
+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` (
+  `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',
+  `Unknown703` 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',
+  `ClassMask` 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 `skill_line_locale`
+--
+
+DROP TABLE IF EXISTS `skill_line_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `skill_line_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `DisplayName_lang` text,
+  `Description_lang` text,
+  `AlternateVerb_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 `skill_race_class_info`
+--
+
+DROP TABLE IF EXISTS `skill_race_class_info`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!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',
+  `SkillID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SkillTierID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Availability` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MinLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ClassMask` 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 `sound_kit`
+--
+
+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,
   `VolumeFloat` float NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `MinDistance` float NOT NULL DEFAULT '0',
   `DistanceCutoff` float NOT NULL DEFAULT '0',
-  `EAXDef` int(10) unsigned NOT NULL DEFAULT '0',
-  `SoundEntriesAdvancedID` int(10) 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',
-  `DialogType` int(10) unsigned NOT NULL DEFAULT '0',
-  `BusOverwriteID` int(10) unsigned 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_entries_locale`
+-- Table structure for table `sound_kit_locale`
 --
 
-DROP TABLE IF EXISTS `sound_entries_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_entries_locale` (
+CREATE TABLE `sound_kit_locale` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `locale` varchar(4) NOT NULL,
   `Name_lang` text,
@@ -2685,12 +4789,12 @@ DROP TABLE IF EXISTS `specialization_spells`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `specialization_spells` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpecID` int(10) unsigned NOT NULL DEFAULT '0',
-  `OrderIndex` int(10) unsigned NOT NULL DEFAULT '0',
   `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',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2713,6 +4817,48 @@ CREATE TABLE `specialization_spells_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `spell`
+--
+
+DROP TABLE IF EXISTS `spell`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell` (
+  `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;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `spell_aura_options`
+--
+
+DROP TABLE IF EXISTS `spell_aura_options`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!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',
+  `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ProcChance` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpellProcsPerMinuteID` 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 `spell_aura_restrictions`
 --
 
@@ -2721,14 +4867,16 @@ 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',
-  `CasterAuraState` int(10) unsigned NOT NULL DEFAULT '0',
-  `TargetAuraState` int(10) unsigned NOT NULL DEFAULT '0',
-  `ExcludeCasterAuraState` int(10) unsigned NOT NULL DEFAULT '0',
-  `ExcludeTargetAuraState` 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',
   `ExcludeTargetAuraSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CasterAuraState` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `TargetAuraState` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ExcludeCasterAuraState` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ExcludeTargetAuraState` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2744,8 +4892,8 @@ DROP TABLE IF EXISTS `spell_cast_times`;
 CREATE TABLE `spell_cast_times` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `CastTime` int(11) NOT NULL DEFAULT '0',
-  `CastTimePerLevel` int(11) NOT NULL DEFAULT '0',
   `MinCastTime` int(11) NOT NULL DEFAULT '0',
+  `CastTimePerLevel` smallint(6) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2760,18 +4908,78 @@ DROP TABLE IF EXISTS `spell_casting_requirements`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_casting_requirements` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `FacingCasterFlags` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinFactionID` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinReputation` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredAreasID` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredAuraVision` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiresSpellFocus` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinFactionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredAreasID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiresSpellFocus` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `FacingCasterFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MinReputation` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RequiredAuraVision` 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 `spell_categories`
+--
+
+DROP TABLE IF EXISTS `spell_categories`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!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',
+  `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DefenseType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DispelType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Mechanic` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PreventionType` 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 `spell_category`
+--
+
+DROP TABLE IF EXISTS `spell_category`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_category` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `ChargeRecoveryTime` int(11) NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `UsesPerWeek` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaxCharges` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ChargeCategoryType` 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 `spell_category_locale`
+--
+
+DROP TABLE IF EXISTS `spell_category_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_category_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 `spell_class_options`
 --
 
@@ -2780,12 +4988,32 @@ DROP TABLE IF EXISTS `spell_class_options`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_class_options` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ModalNextSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellClassMask1` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellClassMask2` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellClassMask3` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellClassMask4` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellClassSet` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellClassSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ModalNextSpell` 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 `spell_cooldowns`
+--
+
+DROP TABLE IF EXISTS `spell_cooldowns`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!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',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2800,9 +5028,53 @@ DROP TABLE IF EXISTS `spell_duration`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_duration` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Duration1` int(11) NOT NULL DEFAULT '0',
-  `Duration2` int(11) NOT NULL DEFAULT '0',
-  `Duration3` int(11) NOT NULL DEFAULT '0',
+  `Duration` int(11) NOT NULL DEFAULT '0',
+  `MaxDuration` int(11) NOT NULL DEFAULT '0',
+  `DurationPerLevel` smallint(6) 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`
+--
+
+DROP TABLE IF EXISTS `spell_effect`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_effect` (
+  `EffectAmplitude` float NOT NULL DEFAULT '0',
+  `EffectBonusCoefficient` float NOT NULL DEFAULT '0',
+  `EffectChainAmplitude` float NOT NULL DEFAULT '0',
+  `EffectPointsPerResource` float NOT NULL DEFAULT '0',
+  `EffectRealPointsPerLevel` 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',
+  `EffectPosFacing` float NOT NULL DEFAULT '0',
+  `BonusCoefficientFromAP` float NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DifficultyID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Effect` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectAura` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectAuraPeriod` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectBasePoints` int(11) NOT NULL DEFAULT '0',
+  `EffectChainTargets` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectDieSides` int(11) NOT NULL DEFAULT '0',
+  `EffectItemType` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectMechanic` 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',
+  `EffectTriggerSpell` 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',
+  `EffectIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectAttributes` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2825,6 +5097,135 @@ CREATE TABLE `spell_effect_group_size` (
 /*!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',
+  `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_equipped_items`
+--
+
+DROP TABLE IF EXISTS `spell_equipped_items`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_equipped_items` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
+  `EquippedItemInventoryTypeMask` int(11) NOT NULL DEFAULT '0',
+  `EquippedItemSubClassMask` int(11) NOT NULL DEFAULT '0',
+  `EquippedItemClass` tinyint(4) 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_focus_object`
+--
+
+DROP TABLE IF EXISTS `spell_focus_object`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_focus_object` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` 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 `spell_focus_object_locale`
+--
+
+DROP TABLE IF EXISTS `spell_focus_object_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_focus_object_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 `spell_interrupts`
+--
+
+DROP TABLE IF EXISTS `spell_interrupts`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!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',
+  `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',
+  `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_item_enchantment`
+--
+
+DROP TABLE IF EXISTS `spell_item_enchantment`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_item_enchantment` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `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',
+  `TransmogCost` int(10) unsigned NOT NULL DEFAULT '0',
+  `TextureFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectPointsMin1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EffectPointsMin2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EffectPointsMin3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemVisual` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredSkillID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredSkillRank` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Charges` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Effect1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Effect2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Effect3` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ConditionID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MinLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaxLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ScalingClass` tinyint(4) NOT NULL DEFAULT '0',
+  `ScalingClassRestricted` tinyint(4) 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 `spell_item_enchantment_condition`
 --
 
@@ -2838,11 +5239,6 @@ CREATE TABLE `spell_item_enchantment_condition` (
   `LTOperandType3` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `LTOperandType4` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `LTOperandType5` 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',
   `Operator1` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Operator2` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Operator3` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -2853,22 +5249,43 @@ CREATE TABLE `spell_item_enchantment_condition` (
   `RTOperandType3` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RTOperandType4` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RTOperandType5` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RTOperand1` int(10) unsigned NOT NULL DEFAULT '0',
-  `RTOperand2` int(10) unsigned NOT NULL DEFAULT '0',
-  `RTOperand3` int(10) unsigned NOT NULL DEFAULT '0',
-  `RTOperand4` int(10) unsigned NOT NULL DEFAULT '0',
-  `RTOperand5` int(10) unsigned NOT NULL DEFAULT '0',
+  `RTOperand1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RTOperand2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RTOperand3` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RTOperand4` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RTOperand5` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Logic1` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Logic2` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `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;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `spell_item_enchantment_locale`
+--
+
+DROP TABLE IF EXISTS `spell_item_enchantment_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_item_enchantment_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 `spell_learn_spell`
 --
 
@@ -2886,6 +5303,45 @@ CREATE TABLE `spell_learn_spell` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `spell_levels`
+--
+
+DROP TABLE IF EXISTS `spell_levels`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!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',
+  `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_locale`
+--
+
+DROP TABLE IF EXISTS `spell_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name_lang` text,
+  `NameSubtext_lang` text,
+  `Description_lang` text,
+  `AuraDescription_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 `spell_misc`
 --
 
@@ -2908,14 +5364,14 @@ 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',
-  `CastingTimeIndex` int(10) unsigned NOT NULL DEFAULT '0',
-  `DurationIndex` int(10) unsigned NOT NULL DEFAULT '0',
-  `RangeIndex` int(10) unsigned NOT NULL DEFAULT '0',
   `Speed` float NOT NULL DEFAULT '0',
-  `SpellIconID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ActiveIconID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SchoolMask` int(10) unsigned 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',
+  `SpellIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ActiveIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SchoolMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2929,20 +5385,20 @@ DROP TABLE IF EXISTS `spell_power`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_power` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
-  `PowerIndex` int(10) unsigned NOT NULL DEFAULT '0',
-  `PowerType` int(10) unsigned NOT NULL DEFAULT '0',
   `ManaCost` int(10) unsigned NOT NULL DEFAULT '0',
-  `ManaCostPerLevel` int(10) unsigned NOT NULL DEFAULT '0',
-  `ManaCostPerSecond` int(10) unsigned NOT NULL DEFAULT '0',
-  `ManaCostAdditional` int(10) unsigned NOT NULL DEFAULT '0',
-  `PowerDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
-  `UnitPowerBarID` int(10) unsigned NOT NULL DEFAULT '0',
   `ManaCostPercentage` float NOT NULL DEFAULT '0',
   `ManaCostPercentagePerSecond` float NOT NULL DEFAULT '0',
   `RequiredAura` int(10) unsigned NOT NULL DEFAULT '0',
   `HealthCostPercentage` float NOT NULL DEFAULT '0',
+  `PowerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PowerType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `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',
+  `PowerDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
+  `UnitPowerBarID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2956,11 +5412,45 @@ DROP TABLE IF EXISTS `spell_power_difficulty`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_power_difficulty` (
-  `SpellPowerID` int(10) unsigned NOT NULL DEFAULT '0',
-  `DifficultyID` int(10) unsigned NOT NULL DEFAULT '0',
-  `PowerIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PowerIndex` 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 `spell_procs_per_minute`
+--
+
+DROP TABLE IF EXISTS `spell_procs_per_minute`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_procs_per_minute` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `BaseProcRate` float 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 `spell_procs_per_minute_mod`
+--
+
+DROP TABLE IF EXISTS `spell_procs_per_minute_mod`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_procs_per_minute_mod` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `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',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`SpellPowerID`)
+  PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2995,9 +5485,9 @@ CREATE TABLE `spell_range` (
   `MinRangeFriend` float NOT NULL DEFAULT '0',
   `MaxRangeHostile` float NOT NULL DEFAULT '0',
   `MaxRangeFriend` float NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned 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`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3029,6 +5519,7 @@ DROP TABLE IF EXISTS `spell_reagents`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_reagents` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `Reagent1` int(11) NOT NULL DEFAULT '0',
   `Reagent2` int(11) NOT NULL DEFAULT '0',
   `Reagent3` int(11) NOT NULL DEFAULT '0',
@@ -3037,35 +5528,125 @@ CREATE TABLE `spell_reagents` (
   `Reagent6` int(11) NOT NULL DEFAULT '0',
   `Reagent7` int(11) NOT NULL DEFAULT '0',
   `Reagent8` int(11) NOT NULL DEFAULT '0',
-  `ReagentCount1` int(10) unsigned NOT NULL DEFAULT '0',
-  `ReagentCount2` int(10) unsigned NOT NULL DEFAULT '0',
-  `ReagentCount3` int(10) unsigned NOT NULL DEFAULT '0',
-  `ReagentCount4` int(10) unsigned NOT NULL DEFAULT '0',
-  `ReagentCount5` int(10) unsigned NOT NULL DEFAULT '0',
-  `ReagentCount6` int(10) unsigned NOT NULL DEFAULT '0',
-  `ReagentCount7` int(10) unsigned NOT NULL DEFAULT '0',
-  `ReagentCount8` int(10) unsigned NOT NULL DEFAULT '0',
-  `CurrencyID` int(10) unsigned NOT NULL DEFAULT '0',
-  `CurrencyCount` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReagentCount1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReagentCount2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReagentCount3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReagentCount4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReagentCount5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReagentCount6` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReagentCount7` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReagentCount8` 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 `spell_rune_cost`
+-- Table structure for table `spell_scaling`
 --
 
-DROP TABLE IF EXISTS `spell_rune_cost`;
+DROP TABLE IF EXISTS `spell_scaling`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `spell_rune_cost` (
+CREATE TABLE `spell_scaling` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Blood` int(10) unsigned NOT NULL DEFAULT '0',
-  `Unholy` int(10) unsigned NOT NULL DEFAULT '0',
-  `Frost` int(10) unsigned NOT NULL DEFAULT '0',
-  `Chromatic` int(10) unsigned NOT NULL DEFAULT '0',
-  `RunicPower` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ScalesFromItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ScalingClass` int(11) NOT NULL DEFAULT '0',
+  `MinScalingLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxScalingLevel` 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 `spell_shapeshift`
+--
+
+DROP TABLE IF EXISTS `spell_shapeshift`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_shapeshift` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ShapeshiftExclude1` int(10) unsigned NOT NULL DEFAULT '0',
+  `ShapeshiftExclude2` int(10) unsigned NOT NULL DEFAULT '0',
+  `ShapeshiftMask1` int(10) unsigned NOT NULL DEFAULT '0',
+  `ShapeshiftMask2` int(10) unsigned NOT NULL DEFAULT '0',
+  `StanceBarOrder` 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 `spell_shapeshift_form`
+--
+
+DROP TABLE IF EXISTS `spell_shapeshift_form`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_shapeshift_form` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `WeaponDamageVariance` float NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttackIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CombatRoundTime` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CreatureDisplayID1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CreatureDisplayID2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CreatureDisplayID3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CreatureDisplayID4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID6` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID7` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID8` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MountTypeID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CreatureType` tinyint(4) NOT NULL DEFAULT '0',
+  `BonusActionBar` 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 `spell_shapeshift_form_locale`
+--
+
+DROP TABLE IF EXISTS `spell_shapeshift_form_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_shapeshift_form_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 `spell_target_restrictions`
+--
+
+DROP TABLE IF EXISTS `spell_target_restrictions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!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',
+  `TargetCreatureType` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaxAffectedTargets` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MaxTargetLevel` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3080,10 +5661,11 @@ DROP TABLE IF EXISTS `spell_totems`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_totems` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredTotemCategoryID1` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredTotemCategoryID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `Totem1` int(10) unsigned NOT NULL DEFAULT '0',
   `Totem2` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredTotemCategoryID1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredTotemCategoryID2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3097,20 +5679,109 @@ 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` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
-  `DifficultyID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellVisualID1` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellVisualID2` int(10) unsigned NOT NULL DEFAULT '0',
   `Unk620` float NOT NULL DEFAULT '0',
-  `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellVisualID1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SpellVisualID2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` 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 `summon_properties`
+--
+
+DROP TABLE IF EXISTS `summon_properties`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `summon_properties` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `Category` int(10) unsigned NOT NULL DEFAULT '0',
+  `Faction` int(10) unsigned NOT NULL DEFAULT '0',
+  `Type` int(11) NOT NULL DEFAULT '0',
+  `Slot` 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 `tact_key`
+--
+
+DROP TABLE IF EXISTS `tact_key`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `tact_key` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Key1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key3` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key4` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key5` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key6` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key7` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key8` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key9` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key10` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key11` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key12` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key13` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key14` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key15` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key16` 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 `talent`
+--
+
+DROP TABLE IF EXISTS `talent`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `talent` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `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',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CategoryMask1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CategoryMask2` 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;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `talent_locale`
+--
+
+DROP TABLE IF EXISTS `talent_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `talent_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Description_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 `taxi_nodes`
 --
 
@@ -3118,19 +5789,19 @@ 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',
-  `MapID` 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',
   `Name` text,
   `MountCreatureID1` int(10) unsigned NOT NULL DEFAULT '0',
   `MountCreatureID2` int(10) unsigned NOT NULL DEFAULT '0',
-  `ConditionID` int(10) unsigned NOT NULL DEFAULT '0',
-  `LearnableIndex` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `MapOffsetX` float NOT NULL DEFAULT '0',
   `MapOffsetY` 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',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3160,9 +5831,9 @@ DROP TABLE IF EXISTS `taxi_path`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `taxi_path` (
+  `From` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `To` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `From` int(10) unsigned NOT NULL DEFAULT '0',
-  `To` int(10) unsigned NOT NULL DEFAULT '0',
   `Cost` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -3177,17 +5848,17 @@ DROP TABLE IF EXISTS `taxi_path_node`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `taxi_path_node` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `PathID` int(10) unsigned NOT NULL DEFAULT '0',
-  `NodeIndex` int(10) unsigned NOT NULL DEFAULT '0',
-  `MapID` int(10) unsigned NOT NULL DEFAULT '0',
   `LocX` float NOT NULL DEFAULT '0',
   `LocY` float NOT NULL DEFAULT '0',
   `LocZ` float NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `Delay` int(10) unsigned NOT NULL DEFAULT '0',
-  `ArrivalEventID` int(10) unsigned NOT NULL DEFAULT '0',
-  `DepartureEventID` 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',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3203,8 +5874,8 @@ DROP TABLE IF EXISTS `totem_category`;
 CREATE TABLE `totem_category` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
-  `CategoryType` int(10) unsigned NOT NULL DEFAULT '0',
   `CategoryMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `CategoryType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3234,11 +5905,11 @@ DROP TABLE IF EXISTS `toy`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `toy` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `Description` text,
-  `CategoryFilter` int(10) 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',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3254,7 +5925,7 @@ DROP TABLE IF EXISTS `toy_locale`;
 CREATE TABLE `toy_locale` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `locale` varchar(4) NOT NULL,
-  `Description_lang` text NOT NULL,
+  `Description_lang` text,
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3274,7 +5945,7 @@ CREATE TABLE `transport_animation` (
   `PosX` float NOT NULL DEFAULT '0',
   `PosY` float NOT NULL DEFAULT '0',
   `PosZ` float NOT NULL DEFAULT '0',
-  `SequenceID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SequenceID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3309,13 +5980,8 @@ 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',
-  `MinPower` int(10) unsigned NOT NULL DEFAULT '0',
-  `MaxPower` int(10) unsigned NOT NULL DEFAULT '0',
-  `StartPower` int(10) unsigned NOT NULL DEFAULT '0',
-  `CenterPower` int(10) unsigned NOT NULL DEFAULT '0',
   `RegenerationPeace` float NOT NULL DEFAULT '0',
   `RegenerationCombat` float NOT NULL DEFAULT '0',
-  `BarType` int(10) unsigned NOT NULL DEFAULT '0',
   `FileDataID1` int(10) unsigned NOT NULL DEFAULT '0',
   `FileDataID2` int(10) unsigned NOT NULL DEFAULT '0',
   `FileDataID3` int(10) unsigned NOT NULL DEFAULT '0',
@@ -3328,13 +5994,18 @@ 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',
-  `Flags` 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',
+  `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CenterPower` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `BarType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MinPower` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxPower` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3391,6 +6062,213 @@ CREATE TABLE `updates_include` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `vehicle`
+--
+
+DROP TABLE IF EXISTS `vehicle`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `vehicle` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `TurnSpeed` float NOT NULL DEFAULT '0',
+  `PitchSpeed` float NOT NULL DEFAULT '0',
+  `PitchMin` float NOT NULL DEFAULT '0',
+  `PitchMax` float NOT NULL DEFAULT '0',
+  `MouseLookOffsetPitch` float NOT NULL DEFAULT '0',
+  `CameraFadeDistScalarMin` float NOT NULL DEFAULT '0',
+  `CameraFadeDistScalarMax` float NOT NULL DEFAULT '0',
+  `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',
+  `SeatID4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SeatID5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SeatID6` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SeatID7` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SeatID8` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `VehicleUIIndicatorID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PowerDisplayID1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PowerDisplayID2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PowerDisplayID3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `FlagsB` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `UILocomotionType` 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 `vehicle_seat`
+--
+
+DROP TABLE IF EXISTS `vehicle_seat`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `vehicle_seat` (
+  `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',
+  `AttachmentOffsetX` float NOT NULL DEFAULT '0',
+  `AttachmentOffsetY` float NOT NULL DEFAULT '0',
+  `AttachmentOffsetZ` float NOT NULL DEFAULT '0',
+  `EnterPreDelay` float NOT NULL DEFAULT '0',
+  `EnterSpeed` float NOT NULL DEFAULT '0',
+  `EnterGravity` float NOT NULL DEFAULT '0',
+  `EnterMinDuration` float NOT NULL DEFAULT '0',
+  `EnterMaxDuration` float NOT NULL DEFAULT '0',
+  `EnterMinArcHeight` float NOT NULL DEFAULT '0',
+  `EnterMaxArcHeight` float NOT NULL DEFAULT '0',
+  `ExitPreDelay` float NOT NULL DEFAULT '0',
+  `ExitSpeed` float NOT NULL DEFAULT '0',
+  `ExitGravity` float NOT NULL DEFAULT '0',
+  `ExitMinDuration` float NOT NULL DEFAULT '0',
+  `ExitMaxDuration` float NOT NULL DEFAULT '0',
+  `ExitMinArcHeight` float NOT NULL DEFAULT '0',
+  `ExitMaxArcHeight` float NOT NULL DEFAULT '0',
+  `PassengerYaw` float NOT NULL DEFAULT '0',
+  `PassengerPitch` float NOT NULL DEFAULT '0',
+  `PassengerRoll` float NOT NULL DEFAULT '0',
+  `VehicleEnterAnimDelay` float NOT NULL DEFAULT '0',
+  `VehicleExitAnimDelay` float NOT NULL DEFAULT '0',
+  `CameraEnteringDelay` float NOT NULL DEFAULT '0',
+  `CameraEnteringDuration` float NOT NULL DEFAULT '0',
+  `CameraExitingDelay` float NOT NULL DEFAULT '0',
+  `CameraExitingDuration` float NOT NULL DEFAULT '0',
+  `CameraOffsetX` float NOT NULL DEFAULT '0',
+  `CameraOffsetY` float NOT NULL DEFAULT '0',
+  `CameraOffsetZ` float NOT NULL DEFAULT '0',
+  `CameraPosChaseRate` float NOT NULL DEFAULT '0',
+  `CameraFacingChaseRate` float NOT NULL DEFAULT '0',
+  `CameraEnteringZoom` float NOT NULL DEFAULT '0',
+  `CameraSeatZoomMin` float NOT NULL DEFAULT '0',
+  `CameraSeatZoomMax` float NOT NULL DEFAULT '0',
+  `UISkinFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `EnterAnimStart` smallint(6) NOT NULL DEFAULT '0',
+  `EnterAnimLoop` smallint(6) NOT NULL DEFAULT '0',
+  `RideAnimStart` smallint(6) NOT NULL DEFAULT '0',
+  `RideAnimLoop` smallint(6) NOT NULL DEFAULT '0',
+  `RideUpperAnimStart` smallint(6) NOT NULL DEFAULT '0',
+  `RideUpperAnimLoop` smallint(6) NOT NULL DEFAULT '0',
+  `ExitAnimStart` smallint(6) NOT NULL DEFAULT '0',
+  `ExitAnimLoop` smallint(6) NOT NULL DEFAULT '0',
+  `ExitAnimEnd` smallint(6) NOT NULL DEFAULT '0',
+  `VehicleEnterAnim` smallint(6) NOT NULL DEFAULT '0',
+  `VehicleExitAnim` smallint(6) NOT NULL DEFAULT '0',
+  `VehicleRideAnimLoop` smallint(6) NOT NULL DEFAULT '0',
+  `EnterAnimKitID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RideAnimKitID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ExitAnimKitID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `VehicleEnterAnimKitID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `VehicleRideAnimKitID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `VehicleExitAnimKitID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CameraModeID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AttachmentID` tinyint(4) NOT NULL DEFAULT '0',
+  `PassengerAttachmentID` tinyint(4) NOT NULL DEFAULT '0',
+  `VehicleEnterAnimBone` tinyint(4) NOT NULL DEFAULT '0',
+  `VehicleExitAnimBone` tinyint(4) NOT NULL DEFAULT '0',
+  `VehicleRideAnimLoopBone` tinyint(4) NOT NULL DEFAULT '0',
+  `VehicleAbilityDisplay` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `EnterUISoundID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ExitUISoundID` 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 `wmo_area_table`
+--
+
+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',
+  `AmbienceID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ZoneMusic` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `IntroSound` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AreaTableID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `UWIntroSound` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `UWAmbience` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `NameSet` tinyint(4) NOT NULL DEFAULT '0',
+  `SoundProviderPref` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SoundProviderPrefUnderwater` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `UWZoneMusic` 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 `wmo_area_table_locale`
+--
+
+DROP TABLE IF EXISTS `wmo_area_table_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `wmo_area_table_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `AreaName_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 `world_map_area`
+--
+
+DROP TABLE IF EXISTS `world_map_area`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `world_map_area` (
+  `AreaName` text,
+  `LocLeft` float NOT NULL DEFAULT '0',
+  `LocRight` float NOT NULL DEFAULT '0',
+  `LocTop` float NOT NULL DEFAULT '0',
+  `LocBottom` float 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',
+  `BountyBoardLocation` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `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 `world_map_overlay`
 --
 
@@ -3399,37 +6277,87 @@ DROP TABLE IF EXISTS `world_map_overlay`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `world_map_overlay` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `TextureName` text,
+  `TextureWidth` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `TextureHeight` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MapAreaID` int(10) unsigned NOT NULL DEFAULT '0',
   `AreaID1` int(10) unsigned NOT NULL DEFAULT '0',
   `AreaID2` int(10) unsigned NOT NULL DEFAULT '0',
   `AreaID3` int(10) unsigned NOT NULL DEFAULT '0',
   `AreaID4` int(10) unsigned NOT NULL DEFAULT '0',
-  `TextureName` text,
-  `TextureWidth` int(10) unsigned NOT NULL DEFAULT '0',
-  `TextureHeight` int(10) unsigned NOT NULL DEFAULT '0',
-  `OffsetX` int(10) unsigned NOT NULL DEFAULT '0',
-  `OffsetY` int(10) unsigned NOT NULL DEFAULT '0',
-  `HitRectTop` int(10) unsigned NOT NULL DEFAULT '0',
-  `HitRectLeft` int(10) unsigned NOT NULL DEFAULT '0',
-  `HitRectBottom` int(10) unsigned NOT NULL DEFAULT '0',
-  `HitRectRight` int(10) unsigned NOT NULL DEFAULT '0',
+  `OffsetX` int(11) NOT NULL DEFAULT '0',
+  `OffsetY` int(11) NOT NULL DEFAULT '0',
+  `HitRectTop` int(11) NOT NULL DEFAULT '0',
+  `HitRectLeft` int(11) NOT NULL DEFAULT '0',
+  `HitRectBottom` int(11) NOT NULL DEFAULT '0',
+  `HitRectRight` int(11) NOT NULL DEFAULT '0',
   `PlayerConditionID` 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 `world_map_transforms`
+--
+
+DROP TABLE IF EXISTS `world_map_transforms`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `world_map_transforms` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `RegionMinX` float NOT NULL DEFAULT '0',
+  `RegionMinY` float NOT NULL DEFAULT '0',
+  `RegionMinZ` float NOT NULL DEFAULT '0',
+  `RegionMaxX` float NOT NULL DEFAULT '0',
+  `RegionMaxY` float NOT NULL DEFAULT '0',
+  `RegionMaxZ` float NOT NULL DEFAULT '0',
+  `RegionOffsetX` float NOT NULL DEFAULT '0',
+  `RegionOffsetY` float NOT NULL DEFAULT '0',
+  `RegionScale` float NOT NULL DEFAULT '0',
+  `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `AreaID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `NewMapID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `NewDungeonMapID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `NewAreaID` smallint(5) 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 `world_safe_locs`
+--
+
+DROP TABLE IF EXISTS `world_safe_locs`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `world_safe_locs` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `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`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `world_map_overlay_locale`
+-- Table structure for table `world_safe_locs_locale`
 --
 
-DROP TABLE IF EXISTS `world_map_overlay_locale`;
+DROP TABLE IF EXISTS `world_safe_locs_locale`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `world_map_overlay_locale` (
+CREATE TABLE `world_safe_locs_locale` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `locale` varchar(4) NOT NULL,
-  `TextureName_lang` text,
+  `AreaName_lang` text,
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3444,4 +6372,4 @@ CREATE TABLE `world_map_overlay_locale` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-04-11  2:02:49
+-- Dump completed on 2016-10-16 17:35:49
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index e6973f5ad46..c9eab04e25e 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.6.26, for Win64 (x86_64)
+-- MySQL dump 10.16  Distrib 10.1.6-MariaDB, for Win64 (AMD64)
 --
 -- Host: localhost    Database: world6
 -- ------------------------------------------------------
--- Server version	5.6.26-log
+-- Server version	5.7.14-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -39,23 +39,6 @@ CREATE TABLE `access_requirement` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `achievement_criteria_data`
---
-
-DROP TABLE IF EXISTS `achievement_criteria_data`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `achievement_criteria_data` (
-  `criteria_id` mediumint(8) NOT NULL,
-  `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `value1` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `value2` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `ScriptName` char(64) NOT NULL DEFAULT '',
-  PRIMARY KEY (`criteria_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Achievment system';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `achievement_dbc`
 --
 
@@ -218,6 +201,26 @@ CREATE TABLE `battlemaster_entry` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `blackmarket_template`
+--
+
+DROP TABLE IF EXISTS `blackmarket_template`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `blackmarket_template` (
+  `marketId` int(10) NOT NULL DEFAULT '0',
+  `sellerNpc` mediumint(8) NOT NULL DEFAULT '0',
+  `itemEntry` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `quantity` int(10) NOT NULL DEFAULT '1',
+  `minBid` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `duration` int(10) NOT NULL DEFAULT '0',
+  `chance` float NOT NULL DEFAULT '0',
+  `bonusListIDs` text,
+  PRIMARY KEY (`marketId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `class_expansion_requirement`
 --
 
@@ -325,6 +328,9 @@ CREATE TABLE `creature_addon` (
   `bytes1` int(10) unsigned NOT NULL DEFAULT '0',
   `bytes2` int(10) unsigned NOT NULL DEFAULT '0',
   `emote` int(10) unsigned NOT NULL DEFAULT '0',
+  `aiAnimKit` smallint(6) NOT NULL DEFAULT '0',
+  `movementAnimKit` smallint(6) NOT NULL DEFAULT '0',
+  `meleeAnimKit` smallint(6) NOT NULL DEFAULT '0',
   `auras` text,
   PRIMARY KEY (`guid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -426,6 +432,7 @@ CREATE TABLE `creature_model_info` (
   `BoundingRadius` float NOT NULL DEFAULT '0',
   `CombatReach` float NOT NULL DEFAULT '0',
   `DisplayID_Other_Gender` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(5) DEFAULT '0',
   PRIMARY KEY (`DisplayID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Creature System (Model related info)';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -542,8 +549,9 @@ CREATE TABLE `creature_template` (
   `gossip_menu_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `minlevel` smallint(5) NOT NULL DEFAULT '1',
   `maxlevel` smallint(5) NOT NULL DEFAULT '1',
-  `exp` smallint(6) NOT NULL DEFAULT '0',
-  `exp_unk` smallint(2) NOT NULL DEFAULT '0',
+  `HealthScalingExpansion` mediumint(5) NOT NULL DEFAULT '0',
+  `RequiredExpansion` mediumint(5) NOT NULL DEFAULT '0',
+  `VignetteID` mediumint(5) NOT NULL DEFAULT '0',
   `faction` smallint(5) unsigned NOT NULL DEFAULT '0',
   `npcflag` bigint(20) unsigned NOT NULL DEFAULT '0',
   `speed_walk` float NOT NULL DEFAULT '1' COMMENT 'Result of 2.5/2.5, most common value',
@@ -623,6 +631,9 @@ CREATE TABLE `creature_template_addon` (
   `bytes1` int(10) unsigned NOT NULL DEFAULT '0',
   `bytes2` int(10) unsigned NOT NULL DEFAULT '0',
   `emote` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `aiAnimKit` smallint(6) NOT NULL DEFAULT '0',
+  `movementAnimKit` smallint(6) NOT NULL DEFAULT '0',
+  `meleeAnimKit` smallint(6) NOT NULL DEFAULT '0',
   `auras` text,
   PRIMARY KEY (`entry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -673,6 +684,23 @@ CREATE TABLE `creature_text` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `criteria_data`
+--
+
+DROP TABLE IF EXISTS `criteria_data`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `criteria_data` (
+  `criteria_id` mediumint(8) NOT NULL,
+  `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `value1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `value2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ScriptName` char(64) NOT NULL DEFAULT '',
+  PRIMARY KEY (`criteria_id`,`type`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Achievment system';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `disables`
 --
 
@@ -1178,8 +1206,6 @@ CREATE TABLE `gameobject_template` (
   `IconName` varchar(100) NOT NULL DEFAULT '',
   `castBarCaption` varchar(100) NOT NULL DEFAULT '',
   `unk1` varchar(100) NOT NULL DEFAULT '',
-  `faction` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `flags` int(10) unsigned NOT NULL DEFAULT '0',
   `size` float NOT NULL DEFAULT '1',
   `Data0` int(10) NOT NULL DEFAULT '0',
   `Data1` int(10) NOT NULL DEFAULT '0',
@@ -1214,7 +1240,7 @@ CREATE TABLE `gameobject_template` (
   `Data30` int(10) NOT NULL DEFAULT '0',
   `Data31` int(10) NOT NULL DEFAULT '0',
   `Data32` int(10) NOT NULL DEFAULT '0',
-  `unkInt32` int(10) NOT NULL DEFAULT '0',
+  `RequiredLevel` int(10) NOT NULL DEFAULT '0',
   `AIName` char(64) NOT NULL DEFAULT '',
   `ScriptName` varchar(64) NOT NULL DEFAULT '',
   `VerifiedBuild` smallint(5) DEFAULT '0',
@@ -1224,6 +1250,23 @@ CREATE TABLE `gameobject_template` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `gameobject_template_addon`
+--
+
+DROP TABLE IF EXISTS `gameobject_template_addon`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `gameobject_template_addon` (
+  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `faction` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `mingold` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `maxgold` mediumint(8) 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 `gameobject_template_locale`
 --
 
@@ -1661,6 +1704,20 @@ CREATE TABLE `milling_loot_template` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `mount_definitions`
+--
+
+DROP TABLE IF EXISTS `mount_definitions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `mount_definitions` (
+  `spellId` int(10) unsigned NOT NULL,
+  `otherFactionSpellId` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`spellId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `npc_spellclick_spells`
 --
 
@@ -1773,6 +1830,8 @@ CREATE TABLE `page_text` (
   `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `Text` longtext,
   `NextPageID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionID` int(11) NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Item System';
@@ -1974,7 +2033,6 @@ CREATE TABLE `player_levelstats` (
   `agi` smallint(6) unsigned NOT NULL COMMENT 'agility',
   `sta` smallint(6) unsigned NOT NULL COMMENT 'stamina',
   `inte` smallint(6) unsigned NOT NULL COMMENT 'intellect',
-  `spi` smallint(6) unsigned NOT NULL COMMENT 'spirit',
   PRIMARY KEY (`race`,`class`,`level`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='Stores levels stats.';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2042,7 +2100,8 @@ CREATE TABLE `playercreateinfo_cast_spell` (
   `raceMask` int(10) unsigned NOT NULL DEFAULT '0',
   `classMask` int(10) unsigned NOT NULL DEFAULT '0',
   `spell` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `note` varchar(255) DEFAULT NULL
+  `note` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`raceMask`,`classMask`,`spell`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2273,7 +2332,7 @@ CREATE TABLE `quest_objectives` (
   `ObjectID` int(10) NOT NULL DEFAULT '0',
   `Amount` int(10) NOT NULL DEFAULT '0',
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `UnkFloat` float NOT NULL DEFAULT '0',
+  `ProgressBarWeight` float NOT NULL DEFAULT '0',
   `Description` text,
   `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -2410,11 +2469,16 @@ CREATE TABLE `quest_template` (
   `RewardMoneyDifficulty` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardMoneyMultiplier` float NOT NULL DEFAULT '1',
   `RewardBonusMoney` int(10) unsigned NOT NULL DEFAULT '0',
-  `RewardDisplaySpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardDisplaySpell1` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardDisplaySpell2` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardDisplaySpell3` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardSpell` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardHonor` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardKillHonor` int(10) unsigned NOT NULL DEFAULT '0',
   `StartItem` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardArtifactXPDifficulty` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardArtifactXPMultiplier` float NOT NULL DEFAULT '1',
+  `RewardArtifactCategoryID` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `FlagsEx` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardItem1` int(10) unsigned NOT NULL DEFAULT '0',
@@ -2456,7 +2520,6 @@ CREATE TABLE `quest_template` (
   `POIy` float NOT NULL DEFAULT '0',
   `POIPriority` int(11) NOT NULL DEFAULT '0',
   `RewardTitle` int(10) unsigned NOT NULL DEFAULT '0',
-  `RewardTalents` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardArenaPoints` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardSkillLineID` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardNumSkillUps` int(10) unsigned NOT NULL DEFAULT '0',
@@ -2465,18 +2528,23 @@ CREATE TABLE `quest_template` (
   `RewardFactionID1` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardFactionValue1` int(11) NOT NULL DEFAULT '0',
   `RewardFactionOverride1` int(11) NOT NULL DEFAULT '0',
+  `RewardFactionCapIn1` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardFactionID2` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardFactionValue2` int(11) NOT NULL DEFAULT '0',
   `RewardFactionOverride2` int(11) NOT NULL DEFAULT '0',
+  `RewardFactionCapIn2` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardFactionID3` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardFactionValue3` int(11) NOT NULL DEFAULT '0',
   `RewardFactionOverride3` int(11) NOT NULL DEFAULT '0',
+  `RewardFactionCapIn3` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardFactionID4` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardFactionValue4` int(11) NOT NULL DEFAULT '0',
   `RewardFactionOverride4` int(11) NOT NULL DEFAULT '0',
+  `RewardFactionCapIn4` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardFactionID5` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardFactionValue5` int(11) NOT NULL DEFAULT '0',
   `RewardFactionOverride5` int(11) NOT NULL DEFAULT '0',
+  `RewardFactionCapIn5` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardFactionFlags` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardCurrencyID1` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardCurrencyQty1` int(10) unsigned NOT NULL DEFAULT '0',
@@ -2491,6 +2559,7 @@ CREATE TABLE `quest_template` (
   `AreaGroupID` int(10) unsigned NOT NULL DEFAULT '0',
   `TimeAllowed` int(10) unsigned NOT NULL DEFAULT '0',
   `AllowableRaces` int(11) NOT NULL DEFAULT '-1',
+  `QuestRewardID` int(10) unsigned NOT NULL DEFAULT '0',
   `LogTitle` text,
   `LogDescription` text,
   `QuestDescription` text,
@@ -2659,6 +2728,22 @@ CREATE TABLE `reputation_spillover_template` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `scene_template`
+--
+
+DROP TABLE IF EXISTS `scene_template`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scene_template` (
+  `SceneId` int(10) unsigned NOT NULL,
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `ScriptPackageID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ScriptName` varchar(64) NOT NULL DEFAULT '',
+  PRIMARY KEY (`SceneId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `script_waypoint`
 --
 
@@ -3069,22 +3154,6 @@ CREATE TABLE `spell_proc_event` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `spell_ranks`
---
-
-DROP TABLE IF EXISTS `spell_ranks`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `spell_ranks` (
-  `first_spell_id` int(10) unsigned NOT NULL DEFAULT '0',
-  `spell_id` int(10) unsigned NOT NULL DEFAULT '0',
-  `rank` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`first_spell_id`,`rank`),
-  UNIQUE KEY `spell_id` (`spell_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Spell Rank Data';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `spell_required`
 --
 
@@ -3362,7 +3431,7 @@ CREATE TABLE `vehicle_template_accessory` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `version`
+-- Temporary table structure for view `version`
 --
 
 DROP TABLE IF EXISTS `version`;
@@ -3470,4 +3539,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-04-11  2:02:48
+-- Dump completed on 2016-10-16 17:35:48
diff --git a/sql/updates/auth/6.x/2016_04_11_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_04_11_00_auth.sql
index be8a4d21b66..be8a4d21b66 100644
--- a/sql/updates/auth/6.x/2016_04_11_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_04_11_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_04_17_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_04_17_00_auth.sql
index 52ba3a0038e..52ba3a0038e 100644
--- a/sql/updates/auth/6.x/2016_04_17_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_04_17_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_05_07_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_05_07_00_auth.sql
index 48f9cbd8fe2..48f9cbd8fe2 100644
--- a/sql/updates/auth/6.x/2016_05_07_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_05_07_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_05_19_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_05_19_00_auth.sql
index 0b584bd4d7b..0b584bd4d7b 100644
--- a/sql/updates/auth/6.x/2016_05_19_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_05_19_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_07_19_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_07_19_00_auth.sql
index 5cbb737f518..5cbb737f518 100644
--- a/sql/updates/auth/6.x/2016_07_19_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_07_19_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_07_19_01_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_07_19_01_auth.sql
index 854872a48d0..854872a48d0 100644
--- a/sql/updates/auth/6.x/2016_07_19_01_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_07_19_01_auth.sql
diff --git a/sql/updates/auth/6.x/2016_07_23_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_07_23_00_auth.sql
index b3024cfa479..b3024cfa479 100644
--- a/sql/updates/auth/6.x/2016_07_23_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_07_23_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_07_23_01_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_07_23_01_auth.sql
index 4ac99acee21..4ac99acee21 100644
--- a/sql/updates/auth/6.x/2016_07_23_01_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_07_23_01_auth.sql
diff --git a/sql/updates/auth/6.x/2016_07_30_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_07_30_00_auth.sql
index 5b81f14f1b5..5b81f14f1b5 100644
--- a/sql/updates/auth/6.x/2016_07_30_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_07_30_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_08_07_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_08_07_00_auth.sql
index 30c5b111bda..30c5b111bda 100644
--- a/sql/updates/auth/6.x/2016_08_07_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_08_07_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_08_11_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_08_11_00_auth.sql
index e4450d9f449..e4450d9f449 100644
--- a/sql/updates/auth/6.x/2016_08_11_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_08_11_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_08_13_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_08_13_00_auth.sql
index fe3b4138332..fe3b4138332 100644
--- a/sql/updates/auth/6.x/2016_08_13_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_08_13_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_08_26_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_08_26_00_auth.sql
index 36485d9e775..36485d9e775 100644
--- a/sql/updates/auth/6.x/2016_08_26_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_08_26_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_08_27_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_08_27_00_auth.sql
index 0f009864244..0f009864244 100644
--- a/sql/updates/auth/6.x/2016_08_27_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_08_27_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_08_30_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_08_30_00_auth.sql
index eec93895bc0..eec93895bc0 100644
--- a/sql/updates/auth/6.x/2016_08_30_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_08_30_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_09_02_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_09_02_00_auth.sql
index 75e474f10df..75e474f10df 100644
--- a/sql/updates/auth/6.x/2016_09_02_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_09_02_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_09_03_00_auth_2016_05_11_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_09_03_00_auth_2016_05_11_00_auth.sql
index d1a6f3e6023..d1a6f3e6023 100644
--- a/sql/updates/auth/6.x/2016_09_03_00_auth_2016_05_11_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_09_03_00_auth_2016_05_11_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_09_03_01_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_09_03_01_auth.sql
index 5092f093bfb..5092f093bfb 100644
--- a/sql/updates/auth/6.x/2016_09_03_01_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_09_03_01_auth.sql
diff --git a/sql/updates/auth/6.x/2016_09_03_02_auth_2016_06_06_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_09_03_02_auth_2016_06_06_00_auth.sql
index 0e203d847ae..0e203d847ae 100644
--- a/sql/updates/auth/6.x/2016_09_03_02_auth_2016_06_06_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_09_03_02_auth_2016_06_06_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_09_03_03_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_09_03_03_auth.sql
index 2d680b0ffe6..2d680b0ffe6 100644
--- a/sql/updates/auth/6.x/2016_09_03_03_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_09_03_03_auth.sql
diff --git a/sql/updates/auth/6.x/2016_09_15_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_09_15_00_auth.sql
index 8b0f5f76c1c..8b0f5f76c1c 100644
--- a/sql/updates/auth/6.x/2016_09_15_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_09_15_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_09_21_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_09_21_00_auth.sql
index c0b0a3a00f3..c0b0a3a00f3 100644
--- a/sql/updates/auth/6.x/2016_09_21_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_09_21_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_09_25_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_09_25_00_auth.sql
index 0720f6b6964..0720f6b6964 100644
--- a/sql/updates/auth/6.x/2016_09_25_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_09_25_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_10_01_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_10_01_00_auth.sql
index de3ddcc1d2c..de3ddcc1d2c 100644
--- a/sql/updates/auth/6.x/2016_10_01_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_10_01_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_10_06_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_10_06_00_auth.sql
index b791f67e6cc..b791f67e6cc 100644
--- a/sql/updates/auth/6.x/2016_10_06_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_10_06_00_auth.sql
diff --git a/sql/updates/auth/6.x/2016_10_12_00_auth.sql b/sql/old/6.x/auth/04_2016_10_17/2016_10_12_00_auth.sql
index 0b07236a068..0b07236a068 100644
--- a/sql/updates/auth/6.x/2016_10_12_00_auth.sql
+++ b/sql/old/6.x/auth/04_2016_10_17/2016_10_12_00_auth.sql
diff --git a/sql/updates/characters/6.x/2016_04_11_00_characters.sql b/sql/old/6.x/characters/04_2016_10_17/2016_04_11_00_characters.sql
index be8a4d21b66..be8a4d21b66 100644
--- a/sql/updates/characters/6.x/2016_04_11_00_characters.sql
+++ b/sql/old/6.x/characters/04_2016_10_17/2016_04_11_00_characters.sql
diff --git a/sql/updates/characters/6.x/2016_04_11_01_characters.sql b/sql/old/6.x/characters/04_2016_10_17/2016_04_11_01_characters.sql
index bdc6532b1e2..bdc6532b1e2 100644
--- a/sql/updates/characters/6.x/2016_04_11_01_characters.sql
+++ b/sql/old/6.x/characters/04_2016_10_17/2016_04_11_01_characters.sql
diff --git a/sql/updates/characters/6.x/2016_05_07_00_characters.sql b/sql/old/6.x/characters/04_2016_10_17/2016_05_07_00_characters.sql
index d9a7fbb4096..d9a7fbb4096 100644
--- a/sql/updates/characters/6.x/2016_05_07_00_characters.sql
+++ b/sql/old/6.x/characters/04_2016_10_17/2016_05_07_00_characters.sql
diff --git a/sql/updates/characters/6.x/2016_05_26_00_characters.sql b/sql/old/6.x/characters/04_2016_10_17/2016_05_26_00_characters.sql
index 41a5222ac16..41a5222ac16 100644
--- a/sql/updates/characters/6.x/2016_05_26_00_characters.sql
+++ b/sql/old/6.x/characters/04_2016_10_17/2016_05_26_00_characters.sql
diff --git a/sql/updates/characters/6.x/2016_07_16_00_characters.sql b/sql/old/6.x/characters/04_2016_10_17/2016_07_16_00_characters.sql
index 01602f703ea..01602f703ea 100644
--- a/sql/updates/characters/6.x/2016_07_16_00_characters.sql
+++ b/sql/old/6.x/characters/04_2016_10_17/2016_07_16_00_characters.sql
diff --git a/sql/updates/characters/6.x/2016_07_19_00_characters.sql b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_00_characters.sql
index 3cc4003e724..3cc4003e724 100644
--- a/sql/updates/characters/6.x/2016_07_19_00_characters.sql
+++ b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_00_characters.sql
diff --git a/sql/updates/characters/6.x/2016_07_19_01_characters.sql b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_01_characters.sql
index a2a74c11cb2..a2a74c11cb2 100644
--- a/sql/updates/characters/6.x/2016_07_19_01_characters.sql
+++ b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_01_characters.sql
diff --git a/sql/updates/characters/6.x/2016_07_19_02_characters.sql b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_02_characters.sql
index 03320194c94..03320194c94 100644
--- a/sql/updates/characters/6.x/2016_07_19_02_characters.sql
+++ b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_02_characters.sql
diff --git a/sql/updates/characters/6.x/2016_07_19_03_characters.sql b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_03_characters.sql
index c231fcff007..c231fcff007 100644
--- a/sql/updates/characters/6.x/2016_07_19_03_characters.sql
+++ b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_03_characters.sql
diff --git a/sql/updates/characters/6.x/2016_07_19_04_characters.sql b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_04_characters.sql
index ed820fc55df..ed820fc55df 100644
--- a/sql/updates/characters/6.x/2016_07_19_04_characters.sql
+++ b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_04_characters.sql
diff --git a/sql/updates/characters/6.x/2016_07_19_05_characters.sql b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_05_characters.sql
index 1b6c28cb328..1b6c28cb328 100644
--- a/sql/updates/characters/6.x/2016_07_19_05_characters.sql
+++ b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_05_characters.sql
diff --git a/sql/updates/characters/6.x/2016_07_19_06_characters.sql b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_06_characters.sql
index 96d45a97a01..96d45a97a01 100644
--- a/sql/updates/characters/6.x/2016_07_19_06_characters.sql
+++ b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_06_characters.sql
diff --git a/sql/updates/characters/6.x/2016_07_19_07_characters.sql b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_07_characters.sql
index 4efb4172e19..4efb4172e19 100644
--- a/sql/updates/characters/6.x/2016_07_19_07_characters.sql
+++ b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_07_characters.sql
diff --git a/sql/updates/characters/6.x/2016_07_19_08_characters.sql b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_08_characters.sql
index 993f227ce30..993f227ce30 100644
--- a/sql/updates/characters/6.x/2016_07_19_08_characters.sql
+++ b/sql/old/6.x/characters/04_2016_10_17/2016_07_19_08_characters.sql
diff --git a/sql/updates/characters/6.x/2016_08_15_00_characters.sql b/sql/old/6.x/characters/04_2016_10_17/2016_08_15_00_characters.sql
index 2bc7bae21f3..2bc7bae21f3 100644
--- a/sql/updates/characters/6.x/2016_08_15_00_characters.sql
+++ b/sql/old/6.x/characters/04_2016_10_17/2016_08_15_00_characters.sql
diff --git a/sql/updates/characters/6.x/2016_08_25_00_characters.sql b/sql/old/6.x/characters/04_2016_10_17/2016_08_25_00_characters.sql
index ce9ac4f01c3..ce9ac4f01c3 100644
--- a/sql/updates/characters/6.x/2016_08_25_00_characters.sql
+++ b/sql/old/6.x/characters/04_2016_10_17/2016_08_25_00_characters.sql
diff --git a/sql/updates/hotfixes/6.x/2016_04_11_00_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_04_11_00_hotfixes.sql
index be8a4d21b66..be8a4d21b66 100644
--- a/sql/updates/hotfixes/6.x/2016_04_11_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_04_11_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_04_24_00_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_04_24_00_hotfixes.sql
index fb26bfbb47c..fb26bfbb47c 100644
--- a/sql/updates/hotfixes/6.x/2016_04_24_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_04_24_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_05_01_00_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_05_01_00_hotfixes.sql
index a6a16302f8a..a6a16302f8a 100644
--- a/sql/updates/hotfixes/6.x/2016_05_01_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_05_01_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_05_02_00_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_05_02_00_hotfixes.sql
index 8a20e13d4c5..8a20e13d4c5 100644
--- a/sql/updates/hotfixes/6.x/2016_05_02_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_05_02_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_06_21_00_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_06_21_00_hotfixes.sql
index e2ca7d2ce65..e2ca7d2ce65 100644
--- a/sql/updates/hotfixes/6.x/2016_06_21_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_06_21_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_07_19_00_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_00_hotfixes.sql
index b5a3512b1e1..b5a3512b1e1 100644
--- a/sql/updates/hotfixes/6.x/2016_07_19_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_07_19_01_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_01_hotfixes.sql
index 3f94f33dc1e..3f94f33dc1e 100644
--- a/sql/updates/hotfixes/6.x/2016_07_19_01_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_07_19_02_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_02_hotfixes.sql
index 959b3275e9d..959b3275e9d 100644
--- a/sql/updates/hotfixes/6.x/2016_07_19_02_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_02_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_07_19_03_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_03_hotfixes.sql
index d8bf16bf9d6..d8bf16bf9d6 100644
--- a/sql/updates/hotfixes/6.x/2016_07_19_03_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_03_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_07_19_04_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_04_hotfixes.sql
index f165d7f8ae2..f165d7f8ae2 100644
--- a/sql/updates/hotfixes/6.x/2016_07_19_04_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_04_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_07_19_05_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_05_hotfixes.sql
index bbb0075ac6b..bbb0075ac6b 100644
--- a/sql/updates/hotfixes/6.x/2016_07_19_05_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_05_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_07_19_06_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_06_hotfixes.sql
index 4d76e75fbf3..4d76e75fbf3 100644
--- a/sql/updates/hotfixes/6.x/2016_07_19_06_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_06_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_07_19_07_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_07_hotfixes.sql
index 6cce565b905..6cce565b905 100644
--- a/sql/updates/hotfixes/6.x/2016_07_19_07_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_07_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_07_19_08_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_08_hotfixes.sql
index faa3cabc66e..faa3cabc66e 100644
--- a/sql/updates/hotfixes/6.x/2016_07_19_08_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_08_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_07_19_09_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_09_hotfixes.sql
index bcd51ae80b9..bcd51ae80b9 100644
--- a/sql/updates/hotfixes/6.x/2016_07_19_09_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_09_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_07_19_10_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_10_hotfixes.sql
index ac0e9d5a81b..ac0e9d5a81b 100644
--- a/sql/updates/hotfixes/6.x/2016_07_19_10_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_10_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_07_19_11_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_11_hotfixes.sql
index 1d9354f9d15..1d9354f9d15 100644
--- a/sql/updates/hotfixes/6.x/2016_07_19_11_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_07_19_11_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_08_09_00_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_08_09_00_hotfixes.sql
index 9947375b24e..9947375b24e 100644
--- a/sql/updates/hotfixes/6.x/2016_08_09_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_08_09_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_08_15_00_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_08_15_00_hotfixes.sql
index 8c8a9df6f63..8c8a9df6f63 100644
--- a/sql/updates/hotfixes/6.x/2016_08_15_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_08_15_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_08_25_00_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_08_25_00_hotfixes.sql
index 5ce42a281cd..5ce42a281cd 100644
--- a/sql/updates/hotfixes/6.x/2016_08_25_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_08_25_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_08_28_00_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_08_28_00_hotfixes.sql
index fe6907252f1..fe6907252f1 100644
--- a/sql/updates/hotfixes/6.x/2016_08_28_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_08_28_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_08_28_01_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_08_28_01_hotfixes.sql
index 1e684cf064e..1e684cf064e 100644
--- a/sql/updates/hotfixes/6.x/2016_08_28_01_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_08_28_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_08_28_02_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_08_28_02_hotfixes.sql
index 5ddecac7a6c..5ddecac7a6c 100644
--- a/sql/updates/hotfixes/6.x/2016_08_28_02_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_08_28_02_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_09_07_00_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_09_07_00_hotfixes.sql
index d8a2b719212..d8a2b719212 100644
--- a/sql/updates/hotfixes/6.x/2016_09_07_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_09_07_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_09_08_00_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_09_08_00_hotfixes.sql
index 80e773b7a14..80e773b7a14 100644
--- a/sql/updates/hotfixes/6.x/2016_09_08_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_09_08_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_09_20_00_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_09_20_00_hotfixes.sql
index 7e216121dfd..7e216121dfd 100644
--- a/sql/updates/hotfixes/6.x/2016_09_20_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_09_20_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_09_25_00_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_09_25_00_hotfixes.sql
index 16008ba7501..16008ba7501 100644
--- a/sql/updates/hotfixes/6.x/2016_09_25_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_09_25_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_10_08_00_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_10_08_00_hotfixes.sql
index a4750d4b7f9..a4750d4b7f9 100644
--- a/sql/updates/hotfixes/6.x/2016_10_08_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_10_08_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/6.x/2016_10_09_00_hotfixes.sql b/sql/old/6.x/hotfixes/04_2016_10_17/2016_10_09_00_hotfixes.sql
index b594584b34d..b594584b34d 100644
--- a/sql/updates/hotfixes/6.x/2016_10_09_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/04_2016_10_17/2016_10_09_00_hotfixes.sql
diff --git a/sql/updates/world/6.x/2016_04_11_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_11_00_world.sql
index ce23f38b840..ce23f38b840 100644
--- a/sql/updates/world/6.x/2016_04_11_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_11_00_world.sql
diff --git a/sql/updates/world/6.x/2016_04_11_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_11_01_world.sql
index deb85a59222..deb85a59222 100644
--- a/sql/updates/world/6.x/2016_04_11_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_11_01_world.sql
diff --git a/sql/updates/world/6.x/2016_04_11_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_11_02_world.sql
index 2c362b80564..2c362b80564 100644
--- a/sql/updates/world/6.x/2016_04_11_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_11_02_world.sql
diff --git a/sql/updates/world/6.x/2016_04_11_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_11_03_world.sql
index 8ce24c917f9..8ce24c917f9 100644
--- a/sql/updates/world/6.x/2016_04_11_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_11_03_world.sql
diff --git a/sql/updates/world/6.x/2016_04_14_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_14_00_world.sql
index bf81e4ae857..bf81e4ae857 100644
--- a/sql/updates/world/6.x/2016_04_14_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_14_00_world.sql
diff --git a/sql/updates/world/6.x/2016_04_14_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_14_01_world.sql
index d6630007c03..d6630007c03 100644
--- a/sql/updates/world/6.x/2016_04_14_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_14_01_world.sql
diff --git a/sql/updates/world/6.x/2016_04_14_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_14_02_world.sql
index 5aca3fdd938..5aca3fdd938 100644
--- a/sql/updates/world/6.x/2016_04_14_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_14_02_world.sql
diff --git a/sql/updates/world/6.x/2016_04_16_00_world_2016_04_16_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_16_00_world_2016_04_16_01_world.sql
index a3e86dd40a8..a3e86dd40a8 100644
--- a/sql/updates/world/6.x/2016_04_16_00_world_2016_04_16_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_16_00_world_2016_04_16_01_world.sql
diff --git a/sql/updates/world/6.x/2016_04_16_01_world_2016_04_16_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_16_01_world_2016_04_16_00_world.sql
index 9219a4ef316..9219a4ef316 100644
--- a/sql/updates/world/6.x/2016_04_16_01_world_2016_04_16_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_16_01_world_2016_04_16_00_world.sql
diff --git a/sql/updates/world/6.x/2016_04_16_02_world_2016_04_16_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_16_02_world_2016_04_16_02_world.sql
index 82982753067..82982753067 100644
--- a/sql/updates/world/6.x/2016_04_16_02_world_2016_04_16_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_16_02_world_2016_04_16_02_world.sql
diff --git a/sql/updates/world/6.x/2016_04_16_03_world_2016_04_16_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_16_03_world_2016_04_16_03_world.sql
index c6a6e1b07de..c6a6e1b07de 100644
--- a/sql/updates/world/6.x/2016_04_16_03_world_2016_04_16_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_16_03_world_2016_04_16_03_world.sql
diff --git a/sql/updates/world/6.x/2016_04_16_04_world_2016_04_16_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_16_04_world_2016_04_16_04_world.sql
index 75d241b62f4..75d241b62f4 100644
--- a/sql/updates/world/6.x/2016_04_16_04_world_2016_04_16_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_16_04_world_2016_04_16_04_world.sql
diff --git a/sql/updates/world/6.x/2016_04_17_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_17_00_world.sql
index ebfbdb1d008..ebfbdb1d008 100644
--- a/sql/updates/world/6.x/2016_04_17_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_17_00_world.sql
diff --git a/sql/updates/world/6.x/2016_04_17_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_17_01_world.sql
index f57f73c925d..f57f73c925d 100644
--- a/sql/updates/world/6.x/2016_04_17_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_17_01_world.sql
diff --git a/sql/updates/world/6.x/2016_04_17_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_17_02_world.sql
index e63928925df..e63928925df 100644
--- a/sql/updates/world/6.x/2016_04_17_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_17_02_world.sql
diff --git a/sql/updates/world/6.x/2016_04_17_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_17_03_world.sql
index 3dc63f55637..3dc63f55637 100644
--- a/sql/updates/world/6.x/2016_04_17_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_17_03_world.sql
diff --git a/sql/updates/world/6.x/2016_04_17_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_17_04_world.sql
index c03969b14b3..c03969b14b3 100644
--- a/sql/updates/world/6.x/2016_04_17_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_17_04_world.sql
diff --git a/sql/updates/world/6.x/2016_04_20_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_20_00_world.sql
index 776254b8fb9..776254b8fb9 100644
--- a/sql/updates/world/6.x/2016_04_20_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_20_00_world.sql
diff --git a/sql/updates/world/6.x/2016_04_20_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_20_01_world.sql
index 19bd02a91f5..19bd02a91f5 100644
--- a/sql/updates/world/6.x/2016_04_20_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_20_01_world.sql
diff --git a/sql/updates/world/6.x/2016_04_20_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_20_02_world.sql
index 75c00f89035..75c00f89035 100644
--- a/sql/updates/world/6.x/2016_04_20_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_20_02_world.sql
diff --git a/sql/updates/world/6.x/2016_04_20_03_world_2016_04_20_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_20_03_world_2016_04_20_03_world.sql
index 11fc8de7329..11fc8de7329 100644
--- a/sql/updates/world/6.x/2016_04_20_03_world_2016_04_20_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_20_03_world_2016_04_20_03_world.sql
diff --git a/sql/updates/world/6.x/2016_04_24_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_24_00_world.sql
index ea698467b7e..ea698467b7e 100644
--- a/sql/updates/world/6.x/2016_04_24_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_24_00_world.sql
diff --git a/sql/updates/world/6.x/2016_04_27_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_27_00_world.sql
index 64fe6e10bf2..64fe6e10bf2 100644
--- a/sql/updates/world/6.x/2016_04_27_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_27_00_world.sql
diff --git a/sql/updates/world/6.x/2016_04_27_01_world_2016_04_23_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_27_01_world_2016_04_23_01_world.sql
index d1be7adacfc..d1be7adacfc 100644
--- a/sql/updates/world/6.x/2016_04_27_01_world_2016_04_23_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_27_01_world_2016_04_23_01_world.sql
diff --git a/sql/updates/world/6.x/2016_04_27_02_world_2015_04_22_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_27_02_world_2015_04_22_00_world.sql
index e98ef9cf7e6..e98ef9cf7e6 100644
--- a/sql/updates/world/6.x/2016_04_27_02_world_2015_04_22_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_27_02_world_2015_04_22_00_world.sql
diff --git a/sql/updates/world/6.x/2016_04_27_03_world_2016_04_23_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_27_03_world_2016_04_23_00_world.sql
index fe5d5c7ccb6..fe5d5c7ccb6 100644
--- a/sql/updates/world/6.x/2016_04_27_03_world_2016_04_23_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_27_03_world_2016_04_23_00_world.sql
diff --git a/sql/updates/world/6.x/2016_04_27_04_world_2016_04_23_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_27_04_world_2016_04_23_02_world.sql
index e3806947c9c..e3806947c9c 100644
--- a/sql/updates/world/6.x/2016_04_27_04_world_2016_04_23_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_27_04_world_2016_04_23_02_world.sql
diff --git a/sql/updates/world/6.x/2016_04_28_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_28_04_world.sql
index 784238cfc52..784238cfc52 100644
--- a/sql/updates/world/6.x/2016_04_28_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_28_04_world.sql
diff --git a/sql/updates/world/6.x/2016_04_29_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_29_00_world.sql
index d7d20370dc1..d7d20370dc1 100644
--- a/sql/updates/world/6.x/2016_04_29_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_29_00_world.sql
diff --git a/sql/updates/world/6.x/2016_04_29_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_04_29_01_world.sql
index de2f228fee6..de2f228fee6 100644
--- a/sql/updates/world/6.x/2016_04_29_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_04_29_01_world.sql
diff --git a/sql/updates/world/6.x/2016_05_01_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_01_00_world.sql
index b5af5b75596..b5af5b75596 100644
--- a/sql/updates/world/6.x/2016_05_01_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_01_00_world.sql
diff --git a/sql/updates/world/6.x/2016_05_01_01_world_2016_03_07_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_01_01_world_2016_03_07_01_world.sql
index d74f4296903..d74f4296903 100644
--- a/sql/updates/world/6.x/2016_05_01_01_world_2016_03_07_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_01_01_world_2016_03_07_01_world.sql
diff --git a/sql/updates/world/6.x/2016_05_01_02_world_2016_05_01_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_01_02_world_2016_05_01_00_world.sql
index 5a4d6c3197e..5a4d6c3197e 100644
--- a/sql/updates/world/6.x/2016_05_01_02_world_2016_05_01_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_01_02_world_2016_05_01_00_world.sql
diff --git a/sql/updates/world/6.x/2016_05_02_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_02_00_world.sql
index 2aad74cc49d..2aad74cc49d 100644
--- a/sql/updates/world/6.x/2016_05_02_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_02_00_world.sql
diff --git a/sql/updates/world/6.x/2016_05_04_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_04_00_world.sql
index bce6487d63f..bce6487d63f 100644
--- a/sql/updates/world/6.x/2016_05_04_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_04_00_world.sql
diff --git a/sql/updates/world/6.x/2016_05_07_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_07_00_world.sql
index 4d1fb2e867b..4d1fb2e867b 100644
--- a/sql/updates/world/6.x/2016_05_07_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_07_00_world.sql
diff --git a/sql/updates/world/6.x/2016_05_10_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_10_00_world.sql
index 6a7c27196d7..6a7c27196d7 100644
--- a/sql/updates/world/6.x/2016_05_10_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_10_00_world.sql
diff --git a/sql/updates/world/6.x/2016_05_12_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_12_00_world.sql
index 5f59ab00d6a..5f59ab00d6a 100644
--- a/sql/updates/world/6.x/2016_05_12_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_12_00_world.sql
diff --git a/sql/updates/world/6.x/2016_05_20_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_20_00_world.sql
index c9bc0a4cbf4..c9bc0a4cbf4 100644
--- a/sql/updates/world/6.x/2016_05_20_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_20_00_world.sql
diff --git a/sql/updates/world/6.x/2016_05_26_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_26_00_world.sql
index f907fd8a6c1..f907fd8a6c1 100644
--- a/sql/updates/world/6.x/2016_05_26_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_26_00_world.sql
diff --git a/sql/updates/world/6.x/2016_05_26_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_26_01_world.sql
index fe75d9e51fa..fe75d9e51fa 100644
--- a/sql/updates/world/6.x/2016_05_26_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_26_01_world.sql
diff --git a/sql/updates/world/6.x/2016_05_26_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_26_02_world.sql
index 7ce86e26d2b..7ce86e26d2b 100644
--- a/sql/updates/world/6.x/2016_05_26_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_26_02_world.sql
diff --git a/sql/updates/world/6.x/2016_05_26_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_26_03_world.sql
index 3dd9e5e8f21..3dd9e5e8f21 100644
--- a/sql/updates/world/6.x/2016_05_26_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_26_03_world.sql
diff --git a/sql/updates/world/6.x/2016_05_26_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_26_04_world.sql
index 268b44c9616..268b44c9616 100644
--- a/sql/updates/world/6.x/2016_05_26_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_26_04_world.sql
diff --git a/sql/updates/world/6.x/2016_05_26_05_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_26_05_world.sql
index 766dbbb8e49..766dbbb8e49 100644
--- a/sql/updates/world/6.x/2016_05_26_05_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_26_05_world.sql
diff --git a/sql/updates/world/6.x/2016_05_26_06_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_26_06_world.sql
index 343bc6f0a17..343bc6f0a17 100644
--- a/sql/updates/world/6.x/2016_05_26_06_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_26_06_world.sql
diff --git a/sql/updates/world/6.x/2016_05_26_07_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_26_07_world.sql
index d97a3204978..d97a3204978 100644
--- a/sql/updates/world/6.x/2016_05_26_07_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_26_07_world.sql
diff --git a/sql/updates/world/6.x/2016_05_27_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_27_00_world.sql
index 4d4230e5d72..4d4230e5d72 100644
--- a/sql/updates/world/6.x/2016_05_27_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_27_00_world.sql
diff --git a/sql/updates/world/6.x/2016_05_30_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_30_00_world.sql
index a8929689e1a..a8929689e1a 100644
--- a/sql/updates/world/6.x/2016_05_30_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_30_00_world.sql
diff --git a/sql/updates/world/6.x/2016_05_30_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_30_01_world.sql
index 9ed0b8128f4..9ed0b8128f4 100644
--- a/sql/updates/world/6.x/2016_05_30_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_30_01_world.sql
diff --git a/sql/updates/world/6.x/2016_05_30_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_30_02_world.sql
index 7c287da579f..7c287da579f 100644
--- a/sql/updates/world/6.x/2016_05_30_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_30_02_world.sql
diff --git a/sql/updates/world/6.x/2016_05_30_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_30_03_world.sql
index 3f7906f0df2..3f7906f0df2 100644
--- a/sql/updates/world/6.x/2016_05_30_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_30_03_world.sql
diff --git a/sql/updates/world/6.x/2016_05_30_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_30_04_world.sql
index 16e6ffab042..16e6ffab042 100644
--- a/sql/updates/world/6.x/2016_05_30_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_30_04_world.sql
diff --git a/sql/updates/world/6.x/2016_05_31_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_31_00_world.sql
index d32fafbb906..d32fafbb906 100644
--- a/sql/updates/world/6.x/2016_05_31_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_31_00_world.sql
diff --git a/sql/updates/world/6.x/2016_05_31_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_31_01_world.sql
index 0a11cc583cb..0a11cc583cb 100644
--- a/sql/updates/world/6.x/2016_05_31_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_31_01_world.sql
diff --git a/sql/updates/world/6.x/2016_05_31_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_31_02_world.sql
index 2517207fd32..2517207fd32 100644
--- a/sql/updates/world/6.x/2016_05_31_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_31_02_world.sql
diff --git a/sql/updates/world/6.x/2016_05_31_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_31_03_world.sql
index 3d2b75d26c6..3d2b75d26c6 100644
--- a/sql/updates/world/6.x/2016_05_31_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_31_03_world.sql
diff --git a/sql/updates/world/6.x/2016_05_31_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_31_04_world.sql
index 4c1cc0586e4..4c1cc0586e4 100644
--- a/sql/updates/world/6.x/2016_05_31_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_31_04_world.sql
diff --git a/sql/updates/world/6.x/2016_05_31_05_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_31_05_world.sql
index 9f960d52763..9f960d52763 100644
--- a/sql/updates/world/6.x/2016_05_31_05_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_31_05_world.sql
diff --git a/sql/updates/world/6.x/2016_05_31_06_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_05_31_06_world.sql
index dfef4f8d9d9..dfef4f8d9d9 100644
--- a/sql/updates/world/6.x/2016_05_31_06_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_05_31_06_world.sql
diff --git a/sql/updates/world/6.x/2016_06_05_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_05_00_world.sql
index 6de35c03ea0..6de35c03ea0 100644
--- a/sql/updates/world/6.x/2016_06_05_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_05_00_world.sql
diff --git a/sql/updates/world/6.x/2016_06_05_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_05_01_world.sql
index a05c0962722..a05c0962722 100644
--- a/sql/updates/world/6.x/2016_06_05_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_05_01_world.sql
diff --git a/sql/updates/world/6.x/2016_06_05_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_05_02_world.sql
index b6135cf1189..b6135cf1189 100644
--- a/sql/updates/world/6.x/2016_06_05_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_05_02_world.sql
diff --git a/sql/updates/world/6.x/2016_06_05_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_05_03_world.sql
index ea17874ede8..ea17874ede8 100644
--- a/sql/updates/world/6.x/2016_06_05_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_05_03_world.sql
diff --git a/sql/updates/world/6.x/2016_06_05_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_05_04_world.sql
index 36b52243afd..36b52243afd 100644
--- a/sql/updates/world/6.x/2016_06_05_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_05_04_world.sql
diff --git a/sql/updates/world/6.x/2016_06_07_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_07_00_world.sql
index ac66e65b9a7..ac66e65b9a7 100644
--- a/sql/updates/world/6.x/2016_06_07_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_07_00_world.sql
diff --git a/sql/updates/world/6.x/2016_06_07_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_07_01_world.sql
index 858aa3ab006..858aa3ab006 100644
--- a/sql/updates/world/6.x/2016_06_07_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_07_01_world.sql
diff --git a/sql/updates/world/6.x/2016_06_07_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_07_02_world.sql
index e333f8064ef..e333f8064ef 100644
--- a/sql/updates/world/6.x/2016_06_07_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_07_02_world.sql
diff --git a/sql/updates/world/6.x/2016_06_07_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_07_03_world.sql
index 55cc3797e5b..55cc3797e5b 100644
--- a/sql/updates/world/6.x/2016_06_07_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_07_03_world.sql
diff --git a/sql/updates/world/6.x/2016_06_07_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_07_04_world.sql
index 4c0d3628bdb..4c0d3628bdb 100644
--- a/sql/updates/world/6.x/2016_06_07_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_07_04_world.sql
diff --git a/sql/updates/world/6.x/2016_06_07_05_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_07_05_world.sql
index db99efb192a..db99efb192a 100644
--- a/sql/updates/world/6.x/2016_06_07_05_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_07_05_world.sql
diff --git a/sql/updates/world/6.x/2016_06_07_06_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_07_06_world.sql
index 9f28f41fbc4..9f28f41fbc4 100644
--- a/sql/updates/world/6.x/2016_06_07_06_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_07_06_world.sql
diff --git a/sql/updates/world/6.x/2016_06_10_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_10_00_world.sql
index da4abb77d23..da4abb77d23 100644
--- a/sql/updates/world/6.x/2016_06_10_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_10_00_world.sql
diff --git a/sql/updates/world/6.x/2016_06_13_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_13_00_world.sql
index 29813fb9283..29813fb9283 100644
--- a/sql/updates/world/6.x/2016_06_13_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_13_00_world.sql
diff --git a/sql/updates/world/6.x/2016_06_13_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_13_01_world.sql
index f788b053f85..f788b053f85 100644
--- a/sql/updates/world/6.x/2016_06_13_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_13_01_world.sql
diff --git a/sql/updates/world/6.x/2016_06_13_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_13_02_world.sql
index 6fb53afab4a..6fb53afab4a 100644
--- a/sql/updates/world/6.x/2016_06_13_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_13_02_world.sql
diff --git a/sql/updates/world/6.x/2016_06_13_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_13_03_world.sql
index d2d015ac95d..d2d015ac95d 100644
--- a/sql/updates/world/6.x/2016_06_13_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_13_03_world.sql
diff --git a/sql/updates/world/6.x/2016_06_13_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_13_04_world.sql
index fe0f90bc1f3..fe0f90bc1f3 100644
--- a/sql/updates/world/6.x/2016_06_13_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_13_04_world.sql
diff --git a/sql/updates/world/6.x/2016_06_13_05_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_13_05_world.sql
index c074b7d46a2..c074b7d46a2 100644
--- a/sql/updates/world/6.x/2016_06_13_05_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_13_05_world.sql
diff --git a/sql/updates/world/6.x/2016_06_13_06_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_13_06_world.sql
index e24e6862de8..e24e6862de8 100644
--- a/sql/updates/world/6.x/2016_06_13_06_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_13_06_world.sql
diff --git a/sql/updates/world/6.x/2016_06_13_07_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_13_07_world.sql
index be5d6ef6900..be5d6ef6900 100644
--- a/sql/updates/world/6.x/2016_06_13_07_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_13_07_world.sql
diff --git a/sql/updates/world/6.x/2016_06_14_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_14_00_world.sql
index 4f597165174..4f597165174 100644
--- a/sql/updates/world/6.x/2016_06_14_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_14_00_world.sql
diff --git a/sql/updates/world/6.x/2016_06_15_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_15_00_world.sql
index cd2de3f62ff..cd2de3f62ff 100644
--- a/sql/updates/world/6.x/2016_06_15_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_15_00_world.sql
diff --git a/sql/updates/world/6.x/2016_06_15_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_15_01_world.sql
index a24ec70a972..a24ec70a972 100644
--- a/sql/updates/world/6.x/2016_06_15_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_15_01_world.sql
diff --git a/sql/updates/world/6.x/2016_06_15_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_15_02_world.sql
index 830b14012c0..830b14012c0 100644
--- a/sql/updates/world/6.x/2016_06_15_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_15_02_world.sql
diff --git a/sql/updates/world/6.x/2016_06_15_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_15_03_world.sql
index f1b024e2d30..f1b024e2d30 100644
--- a/sql/updates/world/6.x/2016_06_15_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_15_03_world.sql
diff --git a/sql/updates/world/6.x/2016_06_15_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_15_04_world.sql
index be66984e8e0..be66984e8e0 100644
--- a/sql/updates/world/6.x/2016_06_15_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_15_04_world.sql
diff --git a/sql/updates/world/6.x/2016_06_15_05_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_15_05_world.sql
index 7e833b44ea8..7e833b44ea8 100644
--- a/sql/updates/world/6.x/2016_06_15_05_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_15_05_world.sql
diff --git a/sql/updates/world/6.x/2016_06_15_06_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_15_06_world.sql
index 6d63a4ca441..6d63a4ca441 100644
--- a/sql/updates/world/6.x/2016_06_15_06_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_15_06_world.sql
diff --git a/sql/updates/world/6.x/2016_06_15_07_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_15_07_world.sql
index cc6aa2db566..cc6aa2db566 100644
--- a/sql/updates/world/6.x/2016_06_15_07_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_15_07_world.sql
diff --git a/sql/updates/world/6.x/2016_06_15_08_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_15_08_world.sql
index 1a7d606352f..1a7d606352f 100644
--- a/sql/updates/world/6.x/2016_06_15_08_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_15_08_world.sql
diff --git a/sql/updates/world/6.x/2016_06_16_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_16_00_world.sql
index 49d6c2debd4..49d6c2debd4 100644
--- a/sql/updates/world/6.x/2016_06_16_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_16_00_world.sql
diff --git a/sql/updates/world/6.x/2016_06_17_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_17_00_world.sql
index af5e1dca844..af5e1dca844 100644
--- a/sql/updates/world/6.x/2016_06_17_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_17_00_world.sql
diff --git a/sql/updates/world/6.x/2016_06_17_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_17_01_world.sql
index e5bc16000ce..e5bc16000ce 100644
--- a/sql/updates/world/6.x/2016_06_17_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_17_01_world.sql
diff --git a/sql/updates/world/6.x/2016_06_19_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_19_00_world.sql
index e125222ebf3..e125222ebf3 100644
--- a/sql/updates/world/6.x/2016_06_19_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_19_00_world.sql
diff --git a/sql/updates/world/6.x/2016_06_19_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_19_01_world.sql
index 8b139241f60..8b139241f60 100644
--- a/sql/updates/world/6.x/2016_06_19_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_19_01_world.sql
diff --git a/sql/updates/world/6.x/2016_06_20_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_20_00_world.sql
index 0a24574d5b6..0a24574d5b6 100644
--- a/sql/updates/world/6.x/2016_06_20_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_20_00_world.sql
diff --git a/sql/updates/world/6.x/2016_06_20_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_20_01_world.sql
index 35c5bf01c16..35c5bf01c16 100644
--- a/sql/updates/world/6.x/2016_06_20_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_20_01_world.sql
diff --git a/sql/updates/world/6.x/2016_06_20_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_20_02_world.sql
index 38034246657..38034246657 100644
--- a/sql/updates/world/6.x/2016_06_20_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_20_02_world.sql
diff --git a/sql/updates/world/6.x/2016_06_23_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_23_00_world.sql
index 42f23376051..42f23376051 100644
--- a/sql/updates/world/6.x/2016_06_23_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_23_00_world.sql
diff --git a/sql/updates/world/6.x/2016_06_23_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_23_01_world.sql
index 843ee299caa..843ee299caa 100644
--- a/sql/updates/world/6.x/2016_06_23_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_23_01_world.sql
diff --git a/sql/updates/world/6.x/2016_06_23_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_23_02_world.sql
index 43f2c02dcf2..43f2c02dcf2 100644
--- a/sql/updates/world/6.x/2016_06_23_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_23_02_world.sql
diff --git a/sql/updates/world/6.x/2016_06_25_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_25_00_world.sql
index b82331b7a19..b82331b7a19 100644
--- a/sql/updates/world/6.x/2016_06_25_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_25_00_world.sql
diff --git a/sql/updates/world/6.x/2016_06_26_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_26_00_world.sql
index ead8bc25478..ead8bc25478 100644
--- a/sql/updates/world/6.x/2016_06_26_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_26_00_world.sql
diff --git a/sql/updates/world/6.x/2016_06_28_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_28_00_world.sql
index f56a204ba5c..f56a204ba5c 100644
--- a/sql/updates/world/6.x/2016_06_28_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_28_00_world.sql
diff --git a/sql/updates/world/6.x/2016_06_28_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_28_01_world.sql
index b5414324100..b5414324100 100644
--- a/sql/updates/world/6.x/2016_06_28_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_28_01_world.sql
diff --git a/sql/updates/world/6.x/2016_06_30_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_06_30_00_world.sql
index 4684bf97b77..4684bf97b77 100644
--- a/sql/updates/world/6.x/2016_06_30_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_06_30_00_world.sql
diff --git a/sql/updates/world/6.x/2016_07_05_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_05_00_world.sql
index e81a39afd96..e81a39afd96 100644
--- a/sql/updates/world/6.x/2016_07_05_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_05_00_world.sql
diff --git a/sql/updates/world/6.x/2016_07_05_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_05_02_world.sql
index 2921c19b0c1..2921c19b0c1 100644
--- a/sql/updates/world/6.x/2016_07_05_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_05_02_world.sql
diff --git a/sql/updates/world/6.x/2016_07_15_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_15_00_world.sql
index 8a2581c86c1..8a2581c86c1 100644
--- a/sql/updates/world/6.x/2016_07_15_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_15_00_world.sql
diff --git a/sql/updates/world/6.x/2016_07_16_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_16_00_world.sql
index 17d8e51f40f..17d8e51f40f 100644
--- a/sql/updates/world/6.x/2016_07_16_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_16_00_world.sql
diff --git a/sql/updates/world/6.x/2016_07_16_01_world_2016_07_16_06_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_16_01_world_2016_07_16_06_world.sql
index a8e9510c965..a8e9510c965 100644
--- a/sql/updates/world/6.x/2016_07_16_01_world_2016_07_16_06_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_16_01_world_2016_07_16_06_world.sql
diff --git a/sql/updates/world/6.x/2016_07_16_02_world_2016_07_16_07_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_16_02_world_2016_07_16_07_world.sql
index 75af8add3d1..75af8add3d1 100644
--- a/sql/updates/world/6.x/2016_07_16_02_world_2016_07_16_07_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_16_02_world_2016_07_16_07_world.sql
diff --git a/sql/updates/world/6.x/2016_07_16_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_16_03_world.sql
index 937d4f0c365..937d4f0c365 100644
--- a/sql/updates/world/6.x/2016_07_16_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_16_03_world.sql
diff --git a/sql/updates/world/6.x/2016_07_19_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_19_00_world.sql
index 5614bf76476..5614bf76476 100644
--- a/sql/updates/world/6.x/2016_07_19_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_19_00_world.sql
diff --git a/sql/updates/world/6.x/2016_07_19_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_19_01_world.sql
index c4b7fca6d19..c4b7fca6d19 100644
--- a/sql/updates/world/6.x/2016_07_19_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_19_01_world.sql
diff --git a/sql/updates/world/6.x/2016_07_22_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_22_00_world.sql
index f4559afeeb6..f4559afeeb6 100644
--- a/sql/updates/world/6.x/2016_07_22_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_22_00_world.sql
diff --git a/sql/updates/world/6.x/2016_07_23_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_23_00_world.sql
index 1c5917acdb4..1c5917acdb4 100644
--- a/sql/updates/world/6.x/2016_07_23_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_23_00_world.sql
diff --git a/sql/updates/world/6.x/2016_07_29_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_29_00_world.sql
index 05e2ed584c5..05e2ed584c5 100644
--- a/sql/updates/world/6.x/2016_07_29_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_29_00_world.sql
diff --git a/sql/updates/world/6.x/2016_07_29_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_29_01_world.sql
index c61ac420a7d..c61ac420a7d 100644
--- a/sql/updates/world/6.x/2016_07_29_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_29_01_world.sql
diff --git a/sql/updates/world/6.x/2016_07_29_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_29_02_world.sql
index 4a792b52fc6..4a792b52fc6 100644
--- a/sql/updates/world/6.x/2016_07_29_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_29_02_world.sql
diff --git a/sql/updates/world/6.x/2016_07_29_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_29_03_world.sql
index 11191e04bd2..11191e04bd2 100644
--- a/sql/updates/world/6.x/2016_07_29_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_29_03_world.sql
diff --git a/sql/updates/world/6.x/2016_07_29_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_29_04_world.sql
index 14018959658..14018959658 100644
--- a/sql/updates/world/6.x/2016_07_29_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_29_04_world.sql
diff --git a/sql/updates/world/6.x/2016_07_30_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_30_00_world.sql
index 39e8c59c703..39e8c59c703 100644
--- a/sql/updates/world/6.x/2016_07_30_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_30_00_world.sql
diff --git a/sql/updates/world/6.x/2016_07_30_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_30_01_world.sql
index 16f1b3507e3..16f1b3507e3 100644
--- a/sql/updates/world/6.x/2016_07_30_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_30_01_world.sql
diff --git a/sql/updates/world/6.x/2016_07_30_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_30_02_world.sql
index 8a27e2eab01..8a27e2eab01 100644
--- a/sql/updates/world/6.x/2016_07_30_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_30_02_world.sql
diff --git a/sql/updates/world/6.x/2016_07_30_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_30_03_world.sql
index 49905814880..49905814880 100644
--- a/sql/updates/world/6.x/2016_07_30_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_30_03_world.sql
diff --git a/sql/updates/world/6.x/2016_07_31_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_31_00_world.sql
index 0c33bceea44..0c33bceea44 100644
--- a/sql/updates/world/6.x/2016_07_31_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_31_00_world.sql
diff --git a/sql/updates/world/6.x/2016_07_31_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_31_01_world.sql
index 3b57a3776fc..3b57a3776fc 100644
--- a/sql/updates/world/6.x/2016_07_31_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_31_01_world.sql
diff --git a/sql/updates/world/6.x/2016_07_31_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_31_02_world.sql
index 1697d307d02..1697d307d02 100644
--- a/sql/updates/world/6.x/2016_07_31_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_31_02_world.sql
diff --git a/sql/updates/world/6.x/2016_07_31_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_31_03_world.sql
index d7304bed63d..d7304bed63d 100644
--- a/sql/updates/world/6.x/2016_07_31_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_31_03_world.sql
diff --git a/sql/updates/world/6.x/2016_07_31_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_31_04_world.sql
index a50b85bc8e2..a50b85bc8e2 100644
--- a/sql/updates/world/6.x/2016_07_31_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_31_04_world.sql
diff --git a/sql/updates/world/6.x/2016_07_31_05_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_31_05_world.sql
index 173a365fa51..173a365fa51 100644
--- a/sql/updates/world/6.x/2016_07_31_05_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_31_05_world.sql
diff --git a/sql/updates/world/6.x/2016_07_31_06_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_31_06_world.sql
index 058a5e51def..058a5e51def 100644
--- a/sql/updates/world/6.x/2016_07_31_06_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_31_06_world.sql
diff --git a/sql/updates/world/6.x/2016_07_31_07_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_07_31_07_world.sql
index b60abc9ebcf..b60abc9ebcf 100644
--- a/sql/updates/world/6.x/2016_07_31_07_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_07_31_07_world.sql
diff --git a/sql/updates/world/6.x/2016_08_01_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_01_00_world.sql
index 24c05ae826d..24c05ae826d 100644
--- a/sql/updates/world/6.x/2016_08_01_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_01_00_world.sql
diff --git a/sql/updates/world/6.x/2016_08_01_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_01_01_world.sql
index 7d5e71b0d88..7d5e71b0d88 100644
--- a/sql/updates/world/6.x/2016_08_01_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_01_01_world.sql
diff --git a/sql/updates/world/6.x/2016_08_01_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_01_02_world.sql
index f4e64be1552..f4e64be1552 100644
--- a/sql/updates/world/6.x/2016_08_01_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_01_02_world.sql
diff --git a/sql/updates/world/6.x/2016_08_01_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_01_03_world.sql
index bb84723321b..bb84723321b 100644
--- a/sql/updates/world/6.x/2016_08_01_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_01_03_world.sql
diff --git a/sql/updates/world/6.x/2016_08_01_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_01_04_world.sql
index 4d85d20812e..4d85d20812e 100644
--- a/sql/updates/world/6.x/2016_08_01_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_01_04_world.sql
diff --git a/sql/updates/world/6.x/2016_08_01_05_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_01_05_world.sql
index b4f9c144e00..b4f9c144e00 100644
--- a/sql/updates/world/6.x/2016_08_01_05_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_01_05_world.sql
diff --git a/sql/updates/world/6.x/2016_08_02_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_02_00_world.sql
index 2ffad6597a7..2ffad6597a7 100644
--- a/sql/updates/world/6.x/2016_08_02_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_02_00_world.sql
diff --git a/sql/updates/world/6.x/2016_08_04_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_04_02_world.sql
index 416d99c2727..416d99c2727 100644
--- a/sql/updates/world/6.x/2016_08_04_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_04_02_world.sql
diff --git a/sql/updates/world/6.x/2016_08_13_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_13_00_world.sql
index 39350dbc4d2..39350dbc4d2 100644
--- a/sql/updates/world/6.x/2016_08_13_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_13_00_world.sql
diff --git a/sql/updates/world/6.x/2016_08_15_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_15_00_world.sql
index 7253a22ea73..7253a22ea73 100644
--- a/sql/updates/world/6.x/2016_08_15_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_15_00_world.sql
diff --git a/sql/updates/world/6.x/2016_08_20_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_20_00_world.sql
index 16e4f2e962f..16e4f2e962f 100644
--- a/sql/updates/world/6.x/2016_08_20_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_20_00_world.sql
diff --git a/sql/updates/world/6.x/2016_08_20_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_20_01_world.sql
index 65aa90cd227..65aa90cd227 100644
--- a/sql/updates/world/6.x/2016_08_20_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_20_01_world.sql
diff --git a/sql/updates/world/6.x/2016_08_20_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_20_02_world.sql
index cc197fcbf2b..cc197fcbf2b 100644
--- a/sql/updates/world/6.x/2016_08_20_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_20_02_world.sql
diff --git a/sql/updates/world/6.x/2016_08_20_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_20_03_world.sql
index 624d2f51f08..624d2f51f08 100644
--- a/sql/updates/world/6.x/2016_08_20_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_20_03_world.sql
diff --git a/sql/updates/world/6.x/2016_08_20_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_20_04_world.sql
index bf5e03fab5a..bf5e03fab5a 100644
--- a/sql/updates/world/6.x/2016_08_20_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_20_04_world.sql
diff --git a/sql/updates/world/6.x/2016_08_20_05_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_20_05_world.sql
index 4bb27226cac..4bb27226cac 100644
--- a/sql/updates/world/6.x/2016_08_20_05_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_20_05_world.sql
diff --git a/sql/updates/world/6.x/2016_08_20_06_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_20_06_world.sql
index 646202d365d..646202d365d 100644
--- a/sql/updates/world/6.x/2016_08_20_06_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_20_06_world.sql
diff --git a/sql/updates/world/6.x/2016_08_20_07_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_20_07_world.sql
index 4686b9f980d..4686b9f980d 100644
--- a/sql/updates/world/6.x/2016_08_20_07_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_20_07_world.sql
diff --git a/sql/updates/world/6.x/2016_08_21_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_21_00_world.sql
index 0b3c6d0ad12..0b3c6d0ad12 100644
--- a/sql/updates/world/6.x/2016_08_21_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_21_00_world.sql
diff --git a/sql/updates/world/6.x/2016_08_21_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_21_01_world.sql
index a6256d08971..a6256d08971 100644
--- a/sql/updates/world/6.x/2016_08_21_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_21_01_world.sql
diff --git a/sql/updates/world/6.x/2016_08_21_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_21_02_world.sql
index d1d18293d12..d1d18293d12 100644
--- a/sql/updates/world/6.x/2016_08_21_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_21_02_world.sql
diff --git a/sql/updates/world/6.x/2016_08_21_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_21_03_world.sql
index 763a682341f..763a682341f 100644
--- a/sql/updates/world/6.x/2016_08_21_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_21_03_world.sql
diff --git a/sql/updates/world/6.x/2016_08_21_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_21_04_world.sql
index 8ced73b77be..8ced73b77be 100644
--- a/sql/updates/world/6.x/2016_08_21_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_21_04_world.sql
diff --git a/sql/updates/world/6.x/2016_08_21_05_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_21_05_world.sql
index 80cbea9d463..80cbea9d463 100644
--- a/sql/updates/world/6.x/2016_08_21_05_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_21_05_world.sql
diff --git a/sql/updates/world/6.x/2016_08_28_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_28_00_world.sql
index 2b83caa16a1..2b83caa16a1 100644
--- a/sql/updates/world/6.x/2016_08_28_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_28_00_world.sql
diff --git a/sql/updates/world/6.x/2016_08_28_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_28_01_world.sql
index 26e0a2c45c0..26e0a2c45c0 100644
--- a/sql/updates/world/6.x/2016_08_28_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_28_01_world.sql
diff --git a/sql/updates/world/6.x/2016_08_28_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_28_02_world.sql
index 6b20cdedbb8..6b20cdedbb8 100644
--- a/sql/updates/world/6.x/2016_08_28_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_28_02_world.sql
diff --git a/sql/updates/world/6.x/2016_08_29_00_world_.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_29_00_world_.sql
index 6f948e61cf5..6f948e61cf5 100644
--- a/sql/updates/world/6.x/2016_08_29_00_world_.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_29_00_world_.sql
diff --git a/sql/updates/world/6.x/2016_08_29_01_world_.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_29_01_world_.sql
index 732f5788318..732f5788318 100644
--- a/sql/updates/world/6.x/2016_08_29_01_world_.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_29_01_world_.sql
diff --git a/sql/updates/world/6.x/2016_08_29_02_world_.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_29_02_world_.sql
index 40f5111b6fa..40f5111b6fa 100644
--- a/sql/updates/world/6.x/2016_08_29_02_world_.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_29_02_world_.sql
diff --git a/sql/updates/world/6.x/2016_08_29_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_29_03_world.sql
index 9cffbb87b18..9cffbb87b18 100644
--- a/sql/updates/world/6.x/2016_08_29_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_29_03_world.sql
diff --git a/sql/updates/world/6.x/2016_08_29_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_29_04_world.sql
index b2ba2d8acc8..b2ba2d8acc8 100644
--- a/sql/updates/world/6.x/2016_08_29_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_29_04_world.sql
diff --git a/sql/updates/world/6.x/2016_08_30_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_30_00_world.sql
index aca9004e25e..aca9004e25e 100644
--- a/sql/updates/world/6.x/2016_08_30_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_30_00_world.sql
diff --git a/sql/updates/world/6.x/2016_08_31_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_08_31_00_world.sql
index 58dc29e9826..58dc29e9826 100644
--- a/sql/updates/world/6.x/2016_08_31_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_08_31_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_01_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_01_00_world.sql
index 1d8da985d7d..1d8da985d7d 100644
--- a/sql/updates/world/6.x/2016_09_01_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_01_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_02_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_02_00_world.sql
index de9a296acf9..de9a296acf9 100644
--- a/sql/updates/world/6.x/2016_09_02_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_02_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_02_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_02_01_world.sql
index 2f2b88394eb..2f2b88394eb 100644
--- a/sql/updates/world/6.x/2016_09_02_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_02_01_world.sql
diff --git a/sql/updates/world/6.x/2016_09_03_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_03_00_world.sql
index d0decbec755..d0decbec755 100644
--- a/sql/updates/world/6.x/2016_09_03_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_03_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_03_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_03_01_world.sql
index 5368a599c0e..5368a599c0e 100644
--- a/sql/updates/world/6.x/2016_09_03_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_03_01_world.sql
diff --git a/sql/updates/world/6.x/2016_09_03_02_world_2016_05_11_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_03_02_world_2016_05_11_00_world.sql
index 8552142ede2..8552142ede2 100644
--- a/sql/updates/world/6.x/2016_09_03_02_world_2016_05_11_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_03_02_world_2016_05_11_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_03_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_03_03_world.sql
index 23a8e224718..23a8e224718 100644
--- a/sql/updates/world/6.x/2016_09_03_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_03_03_world.sql
diff --git a/sql/updates/world/6.x/2016_09_03_04_world_2016_06_06_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_03_04_world_2016_06_06_01_world.sql
index fc47dc4bf14..fc47dc4bf14 100644
--- a/sql/updates/world/6.x/2016_09_03_04_world_2016_06_06_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_03_04_world_2016_06_06_01_world.sql
diff --git a/sql/updates/world/6.x/2016_09_03_05_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_03_05_world.sql
index 65606455064..65606455064 100644
--- a/sql/updates/world/6.x/2016_09_03_05_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_03_05_world.sql
diff --git a/sql/updates/world/6.x/2016_09_04_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_04_00_world.sql
index 1415fa9a4aa..1415fa9a4aa 100644
--- a/sql/updates/world/6.x/2016_09_04_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_04_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_04_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_04_01_world.sql
index 3f1357aa692..3f1357aa692 100644
--- a/sql/updates/world/6.x/2016_09_04_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_04_01_world.sql
diff --git a/sql/updates/world/6.x/2016_09_04_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_04_02_world.sql
index 0b81bba663e..0b81bba663e 100644
--- a/sql/updates/world/6.x/2016_09_04_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_04_02_world.sql
diff --git a/sql/updates/world/6.x/2016_09_04_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_04_03_world.sql
index 8c373b76e8a..8c373b76e8a 100644
--- a/sql/updates/world/6.x/2016_09_04_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_04_03_world.sql
diff --git a/sql/updates/world/6.x/2016_09_05_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_05_00_world.sql
index 5353f5efa83..5353f5efa83 100644
--- a/sql/updates/world/6.x/2016_09_05_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_05_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_05_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_05_01_world.sql
index 38087563dfc..38087563dfc 100644
--- a/sql/updates/world/6.x/2016_09_05_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_05_01_world.sql
diff --git a/sql/updates/world/6.x/2016_09_05_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_05_02_world.sql
index 9393d115328..9393d115328 100644
--- a/sql/updates/world/6.x/2016_09_05_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_05_02_world.sql
diff --git a/sql/updates/world/6.x/2016_09_05_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_05_03_world.sql
index edf9fd8a9a8..edf9fd8a9a8 100644
--- a/sql/updates/world/6.x/2016_09_05_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_05_03_world.sql
diff --git a/sql/updates/world/6.x/2016_09_05_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_05_04_world.sql
index 2914a4ce700..2914a4ce700 100644
--- a/sql/updates/world/6.x/2016_09_05_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_05_04_world.sql
diff --git a/sql/updates/world/6.x/2016_09_05_05_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_05_05_world.sql
index 47712fba3f6..47712fba3f6 100644
--- a/sql/updates/world/6.x/2016_09_05_05_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_05_05_world.sql
diff --git a/sql/updates/world/6.x/2016_09_05_06_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_05_06_world.sql
index ae57c352afe..ae57c352afe 100644
--- a/sql/updates/world/6.x/2016_09_05_06_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_05_06_world.sql
diff --git a/sql/updates/world/6.x/2016_09_05_07_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_05_07_world.sql
index 3fc51a7b1d2..3fc51a7b1d2 100644
--- a/sql/updates/world/6.x/2016_09_05_07_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_05_07_world.sql
diff --git a/sql/updates/world/6.x/2016_09_05_08_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_05_08_world.sql
index bec89165bdc..bec89165bdc 100644
--- a/sql/updates/world/6.x/2016_09_05_08_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_05_08_world.sql
diff --git a/sql/updates/world/6.x/2016_09_05_09_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_05_09_world.sql
index 44f8ca1c8b6..44f8ca1c8b6 100644
--- a/sql/updates/world/6.x/2016_09_05_09_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_05_09_world.sql
diff --git a/sql/updates/world/6.x/2016_09_05_10_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_05_10_world.sql
index 5862ca3e63c..5862ca3e63c 100644
--- a/sql/updates/world/6.x/2016_09_05_10_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_05_10_world.sql
diff --git a/sql/updates/world/6.x/2016_09_05_11_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_05_11_world.sql
index 1de4b34e3a4..1de4b34e3a4 100644
--- a/sql/updates/world/6.x/2016_09_05_11_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_05_11_world.sql
diff --git a/sql/updates/world/6.x/2016_09_05_12_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_05_12_world.sql
index 0fc0f0afd1b..0fc0f0afd1b 100644
--- a/sql/updates/world/6.x/2016_09_05_12_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_05_12_world.sql
diff --git a/sql/updates/world/6.x/2016_09_05_13_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_05_13_world.sql
index 169f5965ef1..169f5965ef1 100644
--- a/sql/updates/world/6.x/2016_09_05_13_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_05_13_world.sql
diff --git a/sql/updates/world/6.x/2016_09_05_14_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_05_14_world.sql
index e32f5249aaf..e32f5249aaf 100644
--- a/sql/updates/world/6.x/2016_09_05_14_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_05_14_world.sql
diff --git a/sql/updates/world/6.x/2016_09_05_15_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_05_15_world.sql
index 246ccadef8b..246ccadef8b 100644
--- a/sql/updates/world/6.x/2016_09_05_15_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_05_15_world.sql
diff --git a/sql/updates/world/6.x/2016_09_06_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_06_00_world.sql
index 711a65fdce4..711a65fdce4 100644
--- a/sql/updates/world/6.x/2016_09_06_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_06_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_06_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_06_01_world.sql
index 9c7cb9803bf..9c7cb9803bf 100644
--- a/sql/updates/world/6.x/2016_09_06_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_06_01_world.sql
diff --git a/sql/updates/world/6.x/2016_09_06_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_06_02_world.sql
index a15932933e4..a15932933e4 100644
--- a/sql/updates/world/6.x/2016_09_06_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_06_02_world.sql
diff --git a/sql/updates/world/6.x/2016_09_06_03_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_06_03_world.sql
index 61469a5f5bb..61469a5f5bb 100644
--- a/sql/updates/world/6.x/2016_09_06_03_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_06_03_world.sql
diff --git a/sql/updates/world/6.x/2016_09_06_04_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_06_04_world.sql
index 8aa8845f362..8aa8845f362 100644
--- a/sql/updates/world/6.x/2016_09_06_04_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_06_04_world.sql
diff --git a/sql/updates/world/6.x/2016_09_06_05_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_06_05_world.sql
index f3148731a30..f3148731a30 100644
--- a/sql/updates/world/6.x/2016_09_06_05_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_06_05_world.sql
diff --git a/sql/updates/world/6.x/2016_09_07_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_07_00_world.sql
index a002cdacb53..a002cdacb53 100644
--- a/sql/updates/world/6.x/2016_09_07_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_07_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_07_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_07_01_world.sql
index d3dab06b568..d3dab06b568 100644
--- a/sql/updates/world/6.x/2016_09_07_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_07_01_world.sql
diff --git a/sql/updates/world/6.x/2016_09_08_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_08_00_world.sql
index f086e4a6482..f086e4a6482 100644
--- a/sql/updates/world/6.x/2016_09_08_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_08_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_08_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_08_01_world.sql
index 417f4df51f5..417f4df51f5 100644
--- a/sql/updates/world/6.x/2016_09_08_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_08_01_world.sql
diff --git a/sql/updates/world/6.x/2016_09_10_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_10_00_world.sql
index b9587a32919..b9587a32919 100644
--- a/sql/updates/world/6.x/2016_09_10_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_10_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_11_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_11_00_world.sql
index b4a98d41f8a..b4a98d41f8a 100644
--- a/sql/updates/world/6.x/2016_09_11_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_11_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_11_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_11_01_world.sql
index ee789e0d406..ee789e0d406 100644
--- a/sql/updates/world/6.x/2016_09_11_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_11_01_world.sql
diff --git a/sql/updates/world/6.x/2016_09_12_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_12_00_world.sql
index e54f8965f22..e54f8965f22 100644
--- a/sql/updates/world/6.x/2016_09_12_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_12_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_13_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_13_00_world.sql
index 25263e20398..25263e20398 100644
--- a/sql/updates/world/6.x/2016_09_13_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_13_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_13_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_13_01_world.sql
index 980ec8fec4a..980ec8fec4a 100644
--- a/sql/updates/world/6.x/2016_09_13_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_13_01_world.sql
diff --git a/sql/updates/world/6.x/2016_09_14_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_14_00_world.sql
index 3d59c9b6947..3d59c9b6947 100644
--- a/sql/updates/world/6.x/2016_09_14_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_14_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_15_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_15_00_world.sql
index 2bc3cda70e3..2bc3cda70e3 100644
--- a/sql/updates/world/6.x/2016_09_15_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_15_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_16_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_16_00_world.sql
index ecd01cca28f..ecd01cca28f 100644
--- a/sql/updates/world/6.x/2016_09_16_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_16_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_18_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_18_00_world.sql
index 48bff308a59..48bff308a59 100644
--- a/sql/updates/world/6.x/2016_09_18_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_18_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_19_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_19_00_world.sql
index b91c94a7271..b91c94a7271 100644
--- a/sql/updates/world/6.x/2016_09_19_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_19_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_21_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_21_00_world.sql
index 8cb251fefb8..8cb251fefb8 100644
--- a/sql/updates/world/6.x/2016_09_21_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_21_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_23_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_23_00_world.sql
index 7f076eabac5..7f076eabac5 100644
--- a/sql/updates/world/6.x/2016_09_23_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_23_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_24_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_24_00_world.sql
index 2c48aa42e84..2c48aa42e84 100644
--- a/sql/updates/world/6.x/2016_09_24_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_24_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_25_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_25_00_world.sql
index 609d0013964..609d0013964 100644
--- a/sql/updates/world/6.x/2016_09_25_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_25_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_25_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_25_01_world.sql
index 20222feb8f3..20222feb8f3 100644
--- a/sql/updates/world/6.x/2016_09_25_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_25_01_world.sql
diff --git a/sql/updates/world/6.x/2016_09_26_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_26_00_world.sql
index c02a6eb776b..c02a6eb776b 100644
--- a/sql/updates/world/6.x/2016_09_26_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_26_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_26_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_26_01_world.sql
index a3d792d23dc..a3d792d23dc 100644
--- a/sql/updates/world/6.x/2016_09_26_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_26_01_world.sql
diff --git a/sql/updates/world/6.x/2016_09_27_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_27_00_world.sql
index 09be7ece573..09be7ece573 100644
--- a/sql/updates/world/6.x/2016_09_27_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_27_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_27_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_27_01_world.sql
index 2cc1b223945..2cc1b223945 100644
--- a/sql/updates/world/6.x/2016_09_27_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_27_01_world.sql
diff --git a/sql/updates/world/6.x/2016_09_28_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_28_00_world.sql
index cab24f66855..cab24f66855 100644
--- a/sql/updates/world/6.x/2016_09_28_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_28_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_28_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_28_01_world.sql
index a0fd8aec43f..a0fd8aec43f 100644
--- a/sql/updates/world/6.x/2016_09_28_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_28_01_world.sql
diff --git a/sql/updates/world/6.x/2016_09_29_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_29_00_world.sql
index 87c635657d8..87c635657d8 100644
--- a/sql/updates/world/6.x/2016_09_29_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_29_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_29_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_29_01_world.sql
index a92cb95031c..a92cb95031c 100644
--- a/sql/updates/world/6.x/2016_09_29_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_29_01_world.sql
diff --git a/sql/updates/world/6.x/2016_09_29_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_29_02_world.sql
index 1c2e95736cc..1c2e95736cc 100644
--- a/sql/updates/world/6.x/2016_09_29_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_29_02_world.sql
diff --git a/sql/updates/world/6.x/2016_09_30_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_30_00_world.sql
index d63a1321c1c..d63a1321c1c 100644
--- a/sql/updates/world/6.x/2016_09_30_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_30_00_world.sql
diff --git a/sql/updates/world/6.x/2016_09_30_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_09_30_01_world.sql
index 49e468a5d98..49e468a5d98 100644
--- a/sql/updates/world/6.x/2016_09_30_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_09_30_01_world.sql
diff --git a/sql/updates/world/6.x/2016_10_01_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_10_01_00_world.sql
index 2a51293f498..2a51293f498 100644
--- a/sql/updates/world/6.x/2016_10_01_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_10_01_00_world.sql
diff --git a/sql/updates/world/6.x/2016_10_01_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_10_01_01_world.sql
index 7173dc4e91a..7173dc4e91a 100644
--- a/sql/updates/world/6.x/2016_10_01_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_10_01_01_world.sql
diff --git a/sql/updates/world/6.x/2016_10_02_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_10_02_00_world.sql
index dd3aa2f68ca..dd3aa2f68ca 100644
--- a/sql/updates/world/6.x/2016_10_02_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_10_02_00_world.sql
diff --git a/sql/updates/world/6.x/2016_10_04_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_10_04_00_world.sql
index f7700cd47cb..f7700cd47cb 100644
--- a/sql/updates/world/6.x/2016_10_04_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_10_04_00_world.sql
diff --git a/sql/updates/world/6.x/2016_10_05_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_10_05_00_world.sql
index 96df99d5e56..96df99d5e56 100644
--- a/sql/updates/world/6.x/2016_10_05_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_10_05_00_world.sql
diff --git a/sql/updates/world/6.x/2016_10_05_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_10_05_01_world.sql
index 91f00127c05..91f00127c05 100644
--- a/sql/updates/world/6.x/2016_10_05_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_10_05_01_world.sql
diff --git a/sql/updates/world/6.x/2016_10_09_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_10_09_00_world.sql
index c4fe9f56bf9..c4fe9f56bf9 100644
--- a/sql/updates/world/6.x/2016_10_09_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_10_09_00_world.sql
diff --git a/sql/updates/world/6.x/2016_10_15_00_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_10_15_00_world.sql
index d42f8e06332..d42f8e06332 100644
--- a/sql/updates/world/6.x/2016_10_15_00_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_10_15_00_world.sql
diff --git a/sql/updates/world/6.x/2016_10_15_01_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_10_15_01_world.sql
index 0419bc42124..0419bc42124 100644
--- a/sql/updates/world/6.x/2016_10_15_01_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_10_15_01_world.sql
diff --git a/sql/updates/world/6.x/2016_10_15_02_world.sql b/sql/old/6.x/world/04_2016_10_17/2016_10_15_02_world.sql
index 7bfaa3f858b..7bfaa3f858b 100644
--- a/sql/updates/world/6.x/2016_10_15_02_world.sql
+++ b/sql/old/6.x/world/04_2016_10_17/2016_10_15_02_world.sql
diff --git a/sql/updates/auth/6.x/2016_10_17_00_auth.sql b/sql/updates/auth/6.x/2016_10_17_00_auth.sql
new file mode 100644
index 00000000000..4e3ed5809bf
--- /dev/null
+++ b/sql/updates/auth/6.x/2016_10_17_00_auth.sql
@@ -0,0 +1 @@
+UPDATE `updates` SET `state`='ARCHIVED'; -- TDB 703.00
diff --git a/sql/updates/auth/6.x/dummy b/sql/updates/auth/6.x/dummy
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/sql/updates/auth/6.x/dummy
+++ /dev/null
diff --git a/sql/updates/characters/6.x/2016_10_17_00_characters.sql b/sql/updates/characters/6.x/2016_10_17_00_characters.sql
new file mode 100644
index 00000000000..4e3ed5809bf
--- /dev/null
+++ b/sql/updates/characters/6.x/2016_10_17_00_characters.sql
@@ -0,0 +1 @@
+UPDATE `updates` SET `state`='ARCHIVED'; -- TDB 703.00
diff --git a/sql/updates/characters/6.x/dummy b/sql/updates/characters/6.x/dummy
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/sql/updates/characters/6.x/dummy
+++ /dev/null
diff --git a/sql/updates/hotfixes/6.x/2016_10_17_00_hotfixes.sql b/sql/updates/hotfixes/6.x/2016_10_17_00_hotfixes.sql
new file mode 100644
index 00000000000..4e3ed5809bf
--- /dev/null
+++ b/sql/updates/hotfixes/6.x/2016_10_17_00_hotfixes.sql
@@ -0,0 +1 @@
+UPDATE `updates` SET `state`='ARCHIVED'; -- TDB 703.00
diff --git a/sql/updates/hotfixes/6.x/dummy b/sql/updates/hotfixes/6.x/dummy
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/sql/updates/hotfixes/6.x/dummy
+++ /dev/null
diff --git a/sql/updates/world/6.x/2016_10_17_00_world.sql b/sql/updates/world/6.x/2016_10_17_00_world.sql
new file mode 100644
index 00000000000..ed811f52fd7
--- /dev/null
+++ b/sql/updates/world/6.x/2016_10_17_00_world.sql
@@ -0,0 +1,3 @@
+UPDATE `version` SET `db_version`='TDB 703.00', `cache_id`=5 LIMIT 1;
+
+UPDATE `updates` SET `state`='ARCHIVED';