diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake
index 4f0288eee4e..854ff6e3c4b 100644
--- a/revision_data.h.in.cmake
+++ b/revision_data.h.in.cmake
@@ -9,7 +9,7 @@
  #define _SOURCE_DIRECTORY          R"(@CMAKE_SOURCE_DIR@)"
  #define _BUILD_DIRECTORY           R"(@BUILDDIR@)"
  #define _MYSQL_EXECUTABLE          R"(@MYSQL_EXECUTABLE@)"
- #define _FULL_DATABASE             "TDB_full_world_434.27_2018_02_16.sql"
+ #define _FULL_DATABASE             "TDB_full_world_434.28_2018_03_16.sql"
  #define VER_COMPANYNAME_STR        "TrinityCore Developers"
  #define VER_LEGALCOPYRIGHT_STR     "(c)2008-2018 TrinityCore"
  #define VER_FILEVERSION            0,0,0
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 329d3557a34..b97343966c7 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -2004,7 +2004,8 @@ INSERT INTO `updates` VALUES
 ('2018_01_06_00_auth.sql','CD9B826B9D95697DC412DEF780E814FA3991D6CD','ARCHIVED','2018-01-06 01:40:04',0),
 ('2018_01_15_00_auth.sql','1C5C28490B27D86EBC14F6034AA4D34E66D5545D','ARCHIVED','2018-01-15 01:40:04',0),
 ('2018_02_16_00_auth.sql','1AAD2FC649CBE8093ECE5908EBBBB31EC326166A','ARCHIVED','2018-02-16 01:40:04',0),
-('2018_03_06_00_auth_from_335_was_2018_03_06_00_auth.sql','3F8EA885898CE0F9D47043A832602D77','ARCHIVED','2018-02-16 01:40:04',0);
+('2018_03_06_00_auth_from_335_was_2018_03_06_00_auth.sql','3F8EA885898CE0F9D47043A832602D77','ARCHIVED','2018-02-16 01:40:04',0),
+('2018_03_16_00_auth.sql','E77AFBFE7C1DEC8839AECC40140ED1AF55B56A10','ARCHIVED','2018-03-16 01:40:04',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index b5fa46f8c5f..a61e0598866 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2876,7 +2876,8 @@ INSERT INTO `updates` VALUES
 ('2017_11_28_00_characters.sql','6FF1F84B8985ADFC7FF97F0BF8E53403CF13C320','ARCHIVED','2017-11-28 00:00:00',0),
 ('2017_12_17_00_characters.sql','937E8F51DC74AC41FF8F213CE36C69DDEB878D6A','ARCHIVED','2017-12-17 00:00:00',0),
 ('2018_01_15_00_characters.sql','43C8E4549E1AA9610B377BC7139C88C63D0DC193','ARCHIVED','2018-01-15 00:00:00',0),
-('2018_02_16_00_characters.sql','F1254689CE8A0B0AF149E557830287FF583B8D91','ARCHIVED','2018-02-16 00:00:00',0);
+('2018_02_16_00_characters.sql','F1254689CE8A0B0AF149E557830287FF583B8D91','ARCHIVED','2018-02-16 00:00:00',0),
+('2018_03_16_00_characters.sql','722EAFB7F508882F584DCAE61F97F1A11EDE126E','ARCHIVED','2018-03-16 00:00:00',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index 3509515db54..6b426d60307 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -3186,6 +3186,7 @@ CREATE TABLE `smart_scripts` (
   `event_param2` int(10) unsigned NOT NULL DEFAULT '0',
   `event_param3` int(10) unsigned NOT NULL DEFAULT '0',
   `event_param4` int(10) unsigned NOT NULL DEFAULT '0',
+  `event_param5` int(10) unsigned NOT NULL DEFAULT '0',
   `action_type` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `action_param1` int(10) unsigned NOT NULL DEFAULT '0',
   `action_param2` int(10) unsigned NOT NULL DEFAULT '0',
diff --git a/sql/updates/auth/4.3.4/2018_02_16_00_auth.sql b/sql/old/4.3.4/auth/27_2018_03_16/2018_02_16_00_auth.sql
similarity index 100%
rename from sql/updates/auth/4.3.4/2018_02_16_00_auth.sql
rename to sql/old/4.3.4/auth/27_2018_03_16/2018_02_16_00_auth.sql
diff --git a/sql/updates/auth/4.3.4/2018_03_06_00_auth_from_335_was_2018_03_06_00_auth.sql b/sql/old/4.3.4/auth/27_2018_03_16/2018_03_06_00_auth_from_335_was_2018_03_06_00_auth.sql
similarity index 100%
rename from sql/updates/auth/4.3.4/2018_03_06_00_auth_from_335_was_2018_03_06_00_auth.sql
rename to sql/old/4.3.4/auth/27_2018_03_16/2018_03_06_00_auth_from_335_was_2018_03_06_00_auth.sql
diff --git a/sql/updates/characters/4.3.4/2018_02_16_00_characters.sql b/sql/old/4.3.4/characters/27_2018_03_16/2018_02_16_00_characters.sql
similarity index 100%
rename from sql/updates/characters/4.3.4/2018_02_16_00_characters.sql
rename to sql/old/4.3.4/characters/27_2018_03_16/2018_02_16_00_characters.sql
diff --git a/sql/updates/world/4.3.4/2018_02_16_24_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_16_24_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_16_24_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_16_24_world.sql
diff --git a/sql/updates/world/4.3.4/2018_02_17_00_world_from_335_was_2018_02_16_02_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_17_00_world_from_335_was_2018_02_16_02_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_17_00_world_from_335_was_2018_02_16_02_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_17_00_world_from_335_was_2018_02_16_02_world.sql
diff --git a/sql/updates/world/4.3.4/2018_02_18_00_world_from_335_was_2018_02_17_00_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_18_00_world_from_335_was_2018_02_17_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_18_00_world_from_335_was_2018_02_17_00_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_18_00_world_from_335_was_2018_02_17_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_18_01_world_from_335_was_2018_02_17_01_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_18_01_world_from_335_was_2018_02_17_01_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_18_01_world_from_335_was_2018_02_17_01_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_18_01_world_from_335_was_2018_02_17_01_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_18_02_world_from_335_was_2018_02_17_02_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_18_02_world_from_335_was_2018_02_17_02_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_18_02_world_from_335_was_2018_02_17_02_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_18_02_world_from_335_was_2018_02_17_02_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_18_03_world_from_335_was_2018_02_17_03_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_18_03_world_from_335_was_2018_02_17_03_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_18_03_world_from_335_was_2018_02_17_03_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_18_03_world_from_335_was_2018_02_17_03_world.sql
diff --git a/sql/updates/world/4.3.4/2018_02_18_04_world_from_335_was_2018_02_17_04_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_18_04_world_from_335_was_2018_02_17_04_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_18_04_world_from_335_was_2018_02_17_04_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_18_04_world_from_335_was_2018_02_17_04_world.sql
diff --git a/sql/updates/world/4.3.4/2018_02_18_05_world_from_335_was_2018_02_17_05_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_18_05_world_from_335_was_2018_02_17_05_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_18_05_world_from_335_was_2018_02_17_05_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_18_05_world_from_335_was_2018_02_17_05_world.sql
diff --git a/sql/updates/world/4.3.4/2018_02_18_06_world_from_335_was_2018_02_17_06_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_18_06_world_from_335_was_2018_02_17_06_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_18_06_world_from_335_was_2018_02_17_06_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_18_06_world_from_335_was_2018_02_17_06_world.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_00_world_from_335_was_2018_02_19_01_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_00_world_from_335_was_2018_02_19_01_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_00_world_from_335_was_2018_02_19_01_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_00_world_from_335_was_2018_02_19_01_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_01_world_from_335_was_2018_02_19_02_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_01_world_from_335_was_2018_02_19_02_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_01_world_from_335_was_2018_02_19_02_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_01_world_from_335_was_2018_02_19_02_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_02_world_from_335_was_2018_02_19_03_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_02_world_from_335_was_2018_02_19_03_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_02_world_from_335_was_2018_02_19_03_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_02_world_from_335_was_2018_02_19_03_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_03_world_from_335_was_2018_02_19_04_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_03_world_from_335_was_2018_02_19_04_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_03_world_from_335_was_2018_02_19_04_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_03_world_from_335_was_2018_02_19_04_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_04_world_from_335_was_2018_02_19_05_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_04_world_from_335_was_2018_02_19_05_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_04_world_from_335_was_2018_02_19_05_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_04_world_from_335_was_2018_02_19_05_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_05_world_from_335_was_2018_02_19_06_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_05_world_from_335_was_2018_02_19_06_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_05_world_from_335_was_2018_02_19_06_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_05_world_from_335_was_2018_02_19_06_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_06_world_from_335_was_2018_02_19_07_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_06_world_from_335_was_2018_02_19_07_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_06_world_from_335_was_2018_02_19_07_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_06_world_from_335_was_2018_02_19_07_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_07_world_from_335_was_2018_02_19_08_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_07_world_from_335_was_2018_02_19_08_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_07_world_from_335_was_2018_02_19_08_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_07_world_from_335_was_2018_02_19_08_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_08_world_from_335_was_2018_02_19_09_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_08_world_from_335_was_2018_02_19_09_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_08_world_from_335_was_2018_02_19_09_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_08_world_from_335_was_2018_02_19_09_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_09_world_from_335_was_2018_02_19_10_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_09_world_from_335_was_2018_02_19_10_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_09_world_from_335_was_2018_02_19_10_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_09_world_from_335_was_2018_02_19_10_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_10_world_from_335_was_2018_02_19_11_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_10_world_from_335_was_2018_02_19_11_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_10_world_from_335_was_2018_02_19_11_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_10_world_from_335_was_2018_02_19_11_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_11_world_from_335_was_2018_02_19_12_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_11_world_from_335_was_2018_02_19_12_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_11_world_from_335_was_2018_02_19_12_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_11_world_from_335_was_2018_02_19_12_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_12_world_from_335_was_2018_02_19_13_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_12_world_from_335_was_2018_02_19_13_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_12_world_from_335_was_2018_02_19_13_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_12_world_from_335_was_2018_02_19_13_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_13_world_from_335_was_2018_02_19_14_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_13_world_from_335_was_2018_02_19_14_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_13_world_from_335_was_2018_02_19_14_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_13_world_from_335_was_2018_02_19_14_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_14_world_from_335_was_2018_02_19_15_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_14_world_from_335_was_2018_02_19_15_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_14_world_from_335_was_2018_02_19_15_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_14_world_from_335_was_2018_02_19_15_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_15_world_from_335_was_2018_02_19_16_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_15_world_from_335_was_2018_02_19_16_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_15_world_from_335_was_2018_02_19_16_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_15_world_from_335_was_2018_02_19_16_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_16_world_from_335_was_2018_02_19_17_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_16_world_from_335_was_2018_02_19_17_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_16_world_from_335_was_2018_02_19_17_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_16_world_from_335_was_2018_02_19_17_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_20_17_world_from_335_was_2018_02_19_18_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_20_17_world_from_335_was_2018_02_19_18_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_20_17_world_from_335_was_2018_02_19_18_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_20_17_world_from_335_was_2018_02_19_18_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_02_24_00_world_from_335_was_2018_02_21_01_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_24_00_world_from_335_was_2018_02_21_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_24_00_world_from_335_was_2018_02_21_01_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_24_00_world_from_335_was_2018_02_21_01_world.sql
diff --git a/sql/updates/world/4.3.4/2018_02_24_01_world_from_335_was_2018_02_23_00_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_02_24_01_world_from_335_was_2018_02_23_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_02_24_01_world_from_335_was_2018_02_23_00_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_02_24_01_world_from_335_was_2018_02_23_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_00_world_from_335_was_2018_02_24_00_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_00_world_from_335_was_2018_02_24_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_00_world_from_335_was_2018_02_24_00_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_00_world_from_335_was_2018_02_24_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_01_world_from_335_was_2018_02_24_01_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_01_world_from_335_was_2018_02_24_01_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_01_world_from_335_was_2018_02_24_01_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_01_world_from_335_was_2018_02_24_01_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_02_world_from_335_was_2018_02_24_02_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_02_world_from_335_was_2018_02_24_02_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_02_world_from_335_was_2018_02_24_02_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_02_world_from_335_was_2018_02_24_02_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_03_world_from_335_was_2018_02_24_03_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_03_world_from_335_was_2018_02_24_03_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_03_world_from_335_was_2018_02_24_03_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_03_world_from_335_was_2018_02_24_03_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_04_world_from_335_was_2018_02_24_04_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_04_world_from_335_was_2018_02_24_04_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_04_world_from_335_was_2018_02_24_04_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_04_world_from_335_was_2018_02_24_04_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_05_world_from_335_was_2018_02_24_05_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_05_world_from_335_was_2018_02_24_05_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_05_world_from_335_was_2018_02_24_05_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_05_world_from_335_was_2018_02_24_05_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_06_world_from_335_was_2018_02_25_00_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_06_world_from_335_was_2018_02_25_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_06_world_from_335_was_2018_02_25_00_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_06_world_from_335_was_2018_02_25_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_07_world_from_335_was_2018_02_28_00_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_07_world_from_335_was_2018_02_28_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_07_world_from_335_was_2018_02_28_00_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_07_world_from_335_was_2018_02_28_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_08_world_from_335_was_2018_02_28_01_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_08_world_from_335_was_2018_02_28_01_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_08_world_from_335_was_2018_02_28_01_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_08_world_from_335_was_2018_02_28_01_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_09_world_from_335_was_2018_02_28_02_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_09_world_from_335_was_2018_02_28_02_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_09_world_from_335_was_2018_02_28_02_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_09_world_from_335_was_2018_02_28_02_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_10_world_from_335_was_2018_02_28_03_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_10_world_from_335_was_2018_02_28_03_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_10_world_from_335_was_2018_02_28_03_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_10_world_from_335_was_2018_02_28_03_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_11_world_from_335_was_2018_02_28_04_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_11_world_from_335_was_2018_02_28_04_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_11_world_from_335_was_2018_02_28_04_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_11_world_from_335_was_2018_02_28_04_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_12_world_from_335_was_2018_02_28_05_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_12_world_from_335_was_2018_02_28_05_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_12_world_from_335_was_2018_02_28_05_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_12_world_from_335_was_2018_02_28_05_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_13_world_from_335_was_2018_02_28_06_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_13_world_from_335_was_2018_02_28_06_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_13_world_from_335_was_2018_02_28_06_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_13_world_from_335_was_2018_02_28_06_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_14_world_from_335_was_2018_03_01_00_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_14_world_from_335_was_2018_03_01_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_14_world_from_335_was_2018_03_01_00_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_14_world_from_335_was_2018_03_01_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_15_world_from_335_was_2018_03_03_00_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_15_world_from_335_was_2018_03_03_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_15_world_from_335_was_2018_03_03_00_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_15_world_from_335_was_2018_03_03_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_16_world_from_335_was_2018_03_03_01_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_16_world_from_335_was_2018_03_03_01_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_16_world_from_335_was_2018_03_03_01_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_16_world_from_335_was_2018_03_03_01_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_17_world_from_335_was_2018_03_03_02_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_17_world_from_335_was_2018_03_03_02_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_17_world_from_335_was_2018_03_03_02_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_17_world_from_335_was_2018_03_03_02_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_18_world_from_335_was_2018_03_03_03_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_18_world_from_335_was_2018_03_03_03_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_18_world_from_335_was_2018_03_03_03_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_18_world_from_335_was_2018_03_03_03_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_19_world_from_335_was_2018_03_03_04_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_19_world_from_335_was_2018_03_03_04_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_19_world_from_335_was_2018_03_03_04_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_19_world_from_335_was_2018_03_03_04_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_20_world_from_335_was_2018_03_03_05_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_20_world_from_335_was_2018_03_03_05_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_20_world_from_335_was_2018_03_03_05_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_20_world_from_335_was_2018_03_03_05_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_21_world_from_335_was_2018_03_03_06_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_21_world_from_335_was_2018_03_03_06_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_21_world_from_335_was_2018_03_03_06_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_21_world_from_335_was_2018_03_03_06_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_22_world_from_335_was_2018_03_03_07_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_22_world_from_335_was_2018_03_03_07_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_22_world_from_335_was_2018_03_03_07_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_22_world_from_335_was_2018_03_03_07_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_23_world_from_335_was_2018_03_03_08_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_23_world_from_335_was_2018_03_03_08_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_23_world_from_335_was_2018_03_03_08_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_23_world_from_335_was_2018_03_03_08_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_05_24_world_from_335_was_2018_03_04_00_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_05_24_world_from_335_was_2018_03_04_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_05_24_world_from_335_was_2018_03_04_00_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_05_24_world_from_335_was_2018_03_04_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_06_00_world_from_335_was_2018_03_06_00_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_06_00_world_from_335_was_2018_03_06_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_06_00_world_from_335_was_2018_03_06_00_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_06_00_world_from_335_was_2018_03_06_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_06_01_world_from_335_was_2018_03_06_01_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_06_01_world_from_335_was_2018_03_06_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_06_01_world_from_335_was_2018_03_06_01_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_06_01_world_from_335_was_2018_03_06_01_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_06_02_world_from_335_was_2018_03_06_02_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_06_02_world_from_335_was_2018_03_06_02_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_06_02_world_from_335_was_2018_03_06_02_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_06_02_world_from_335_was_2018_03_06_02_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_06_03_world_from_335_was_2018_03_06_03_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_06_03_world_from_335_was_2018_03_06_03_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_06_03_world_from_335_was_2018_03_06_03_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_06_03_world_from_335_was_2018_03_06_03_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_06_04_world_from_335_was_2018_03_06_04_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_06_04_world_from_335_was_2018_03_06_04_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_06_04_world_from_335_was_2018_03_06_04_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_06_04_world_from_335_was_2018_03_06_04_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_06_05_world_from_335_was_2018_03_06_05_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_06_05_world_from_335_was_2018_03_06_05_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_06_05_world_from_335_was_2018_03_06_05_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_06_05_world_from_335_was_2018_03_06_05_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_06_06_world_from_335_was_2018_03_06_06_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_06_06_world_from_335_was_2018_03_06_06_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_06_06_world_from_335_was_2018_03_06_06_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_06_06_world_from_335_was_2018_03_06_06_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_08_00_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_08_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_08_00_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_08_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_00_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_00_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_01_world_from_335_was_2018_03_07_00_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_01_world_from_335_was_2018_03_07_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_01_world_from_335_was_2018_03_07_00_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_01_world_from_335_was_2018_03_07_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_02_world_from_335_was_2018_03_08_00_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_02_world_from_335_was_2018_03_08_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_02_world_from_335_was_2018_03_08_00_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_02_world_from_335_was_2018_03_08_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_03_world_from_335_was_2018_03_08_01_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_03_world_from_335_was_2018_03_08_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_03_world_from_335_was_2018_03_08_01_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_03_world_from_335_was_2018_03_08_01_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_04_world_from_335_was_2018_03_08_02_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_04_world_from_335_was_2018_03_08_02_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_04_world_from_335_was_2018_03_08_02_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_04_world_from_335_was_2018_03_08_02_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_05_world_from_335_was_2018_03_08_03_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_05_world_from_335_was_2018_03_08_03_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_05_world_from_335_was_2018_03_08_03_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_05_world_from_335_was_2018_03_08_03_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_06_world_from_335_was_2018_03_08_04_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_06_world_from_335_was_2018_03_08_04_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_06_world_from_335_was_2018_03_08_04_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_06_world_from_335_was_2018_03_08_04_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_07_world_from_335_was_2018_03_08_05_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_07_world_from_335_was_2018_03_08_05_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_07_world_from_335_was_2018_03_08_05_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_07_world_from_335_was_2018_03_08_05_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_08_world_from_335_was_2018_03_08_06_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_08_world_from_335_was_2018_03_08_06_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_08_world_from_335_was_2018_03_08_06_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_08_world_from_335_was_2018_03_08_06_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_09_world_from_335_was_2018_03_08_07_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_09_world_from_335_was_2018_03_08_07_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_09_world_from_335_was_2018_03_08_07_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_09_world_from_335_was_2018_03_08_07_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_10_world_from_335_was_2018_03_08_08_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_10_world_from_335_was_2018_03_08_08_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_10_world_from_335_was_2018_03_08_08_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_10_world_from_335_was_2018_03_08_08_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_11_world_from_335_was_2018_03_08_09_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_11_world_from_335_was_2018_03_08_09_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_11_world_from_335_was_2018_03_08_09_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_11_world_from_335_was_2018_03_08_09_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_12_world_from_335_was_2018_03_08_10_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_12_world_from_335_was_2018_03_08_10_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_12_world_from_335_was_2018_03_08_10_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_12_world_from_335_was_2018_03_08_10_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_13_world_from_335_was_2018_03_08_12_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_13_world_from_335_was_2018_03_08_12_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_13_world_from_335_was_2018_03_08_12_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_13_world_from_335_was_2018_03_08_12_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_14_world_from_335_was_2018_03_08_13_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_14_world_from_335_was_2018_03_08_13_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_14_world_from_335_was_2018_03_08_13_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_14_world_from_335_was_2018_03_08_13_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_15_world_from_335_was_2018_03_09_00_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_15_world_from_335_was_2018_03_09_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_15_world_from_335_was_2018_03_09_00_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_15_world_from_335_was_2018_03_09_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_16_world_from_335_was_2018_03_09_01_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_16_world_from_335_was_2018_03_09_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_16_world_from_335_was_2018_03_09_01_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_16_world_from_335_was_2018_03_09_01_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_17_world_from_335_was_2018_03_09_02_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_17_world_from_335_was_2018_03_09_02_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_17_world_from_335_was_2018_03_09_02_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_17_world_from_335_was_2018_03_09_02_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_18_world_from_335_was_2018_03_09_04_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_18_world_from_335_was_2018_03_09_04_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_18_world_from_335_was_2018_03_09_04_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_18_world_from_335_was_2018_03_09_04_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_19_world_from_335_was_2018_03_09_05_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_19_world_from_335_was_2018_03_09_05_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_19_world_from_335_was_2018_03_09_05_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_19_world_from_335_was_2018_03_09_05_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_20_world_from_335_was_2018_03_09_06_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_20_world_from_335_was_2018_03_09_06_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_20_world_from_335_was_2018_03_09_06_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_20_world_from_335_was_2018_03_09_06_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_21_world_from_335_was_2018_03_09_07_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_21_world_from_335_was_2018_03_09_07_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_21_world_from_335_was_2018_03_09_07_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_21_world_from_335_was_2018_03_09_07_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_22_world_from_335_was_2018_03_09_08_world_335.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_22_world_from_335_was_2018_03_09_08_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_22_world_from_335_was_2018_03_09_08_world_335.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_22_world_from_335_was_2018_03_09_08_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_03_09_23_world_from_335_was_2018_03_09_09_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_09_23_world_from_335_was_2018_03_09_09_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_09_23_world_from_335_was_2018_03_09_09_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_09_23_world_from_335_was_2018_03_09_09_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_10_00_world_from_335_2018_03_10_00_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_10_00_world_from_335_2018_03_10_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_10_00_world_from_335_2018_03_10_00_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_10_00_world_from_335_2018_03_10_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_10_01_world_from_335_2018_03_10_01_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_10_01_world_from_335_2018_03_10_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_10_01_world_from_335_2018_03_10_01_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_10_01_world_from_335_2018_03_10_01_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_10_02_world_from_335_2018_03_10_02_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_10_02_world_from_335_2018_03_10_02_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_10_02_world_from_335_2018_03_10_02_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_10_02_world_from_335_2018_03_10_02_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_12_00_world_from_335_2018_03_10_03_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_12_00_world_from_335_2018_03_10_03_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_12_00_world_from_335_2018_03_10_03_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_12_00_world_from_335_2018_03_10_03_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_12_01_world_from_335_2018_03_11_00_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_12_01_world_from_335_2018_03_11_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_12_01_world_from_335_2018_03_11_00_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_12_01_world_from_335_2018_03_11_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_03_12_02_world_from_335_2018_03_12_00_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_12_02_world_from_335_2018_03_12_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_03_12_02_world_from_335_2018_03_12_00_world.sql
rename to sql/old/4.3.4/world/27_2018_03_16/2018_03_12_02_world_from_335_2018_03_12_00_world.sql
diff --git a/sql/old/4.3.4/world/27_2018_03_16/2018_03_15_00_world_from_335_2018_03_13_01_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_15_00_world_from_335_2018_03_13_01_world.sql
new file mode 100644
index 00000000000..c051b060f83
--- /dev/null
+++ b/sql/old/4.3.4/world/27_2018_03_16/2018_03_15_00_world_from_335_2018_03_13_01_world.sql
@@ -0,0 +1,3 @@
+-- 
+UPDATE `creature_template_addon` SET `auras`="31261" WHERE `entry` IN (20561);
+UPDATE `smart_scripts` SET `action_type`=41, `action_param1`=0 WHERE `entryorguid` IN (20561) AND `source_type`=0 AND `id`=2;
diff --git a/sql/old/4.3.4/world/27_2018_03_16/2018_03_15_01_world_from_335_2018_03_15_00_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_15_01_world_from_335_2018_03_15_00_world.sql
new file mode 100644
index 00000000000..0ade27aee5a
--- /dev/null
+++ b/sql/old/4.3.4/world/27_2018_03_16/2018_03_15_01_world_from_335_2018_03_15_00_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `smart_scripts` SET `event_param1`=18000, `event_param2`=18000, `event_param3`=18000, `event_param4`=18000 WHERE `entryorguid` IN (-111996, -112005) AND `source_type`=0 AND `id`=0;
diff --git a/sql/old/4.3.4/world/27_2018_03_16/2018_03_15_02_world_from_335_2018_03_15_01_world.sql b/sql/old/4.3.4/world/27_2018_03_16/2018_03_15_02_world_from_335_2018_03_15_01_world.sql
new file mode 100644
index 00000000000..63a3150a7ed
--- /dev/null
+++ b/sql/old/4.3.4/world/27_2018_03_16/2018_03_15_02_world_from_335_2018_03_15_01_world.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_custom_attr` WHERE `entry`=6788;
+INSERT INTO `spell_custom_attr` (`entry`, `attributes`) VALUES
+(6788, 0x40);
diff --git a/sql/updates/auth/4.3.4/2018_03_16_00_auth.sql b/sql/updates/auth/4.3.4/2018_03_16_00_auth.sql
new file mode 100644
index 00000000000..1f10777e894
--- /dev/null
+++ b/sql/updates/auth/4.3.4/2018_03_16_00_auth.sql
@@ -0,0 +1,2 @@
+-- TDB 4.3.4-28 auth database
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/characters/4.3.4/2018_03_16_00_characters.sql b/sql/updates/characters/4.3.4/2018_03_16_00_characters.sql
new file mode 100644
index 00000000000..dcb54742a20
--- /dev/null
+++ b/sql/updates/characters/4.3.4/2018_03_16_00_characters.sql
@@ -0,0 +1,2 @@
+-- TDB 4.3.4-28 characters database
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/world/4.3.4/2018_03_16_00_world.sql b/sql/updates/world/4.3.4/2018_03_16_00_world.sql
new file mode 100644
index 00000000000..b1e6907dd19
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_16_00_world.sql
@@ -0,0 +1,3 @@
+UPDATE `version` SET `db_version`='TDB 434.28', `cache_id`=28 LIMIT 1;
+
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index f6d29747876..ab3444547e6 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -1736,7 +1736,7 @@ void ObjectMgr::LoadLinkedRespawn()
     }
     while (result->NextRow());
 
-    TC_LOG_INFO("server.loading", ">> Loaded " UI64FMTD " linked respawns in %u ms", uint64(_linkedRespawnStore.size()), GetMSTimeDiffToNow(oldMSTime));
+    TC_LOG_INFO("server.loading", ">> Loaded %lu linked respawns in %u ms", uint64(_linkedRespawnStore.size()), GetMSTimeDiffToNow(oldMSTime));
 }
 
 bool ObjectMgr::SetCreatureLinkedRespawn(ObjectGuid::LowType guidLow, ObjectGuid::LowType linkedGuidLow)
@@ -2019,7 +2019,7 @@ void ObjectMgr::LoadCreatures()
 
         if (std::abs(data.orientation) > 2 * float(M_PI))
         {
-            TC_LOG_ERROR("sql.sql", "Table `creature` has creature (GUID: %%u Entry: %u) with abs(`orientation`) > 2*PI (orientation is expressed in radians), normalized.", guid, data.id);
+            TC_LOG_ERROR("sql.sql", "Table `creature` has creature (GUID: %u Entry: %u) with abs(`orientation`) > 2*PI (orientation is expressed in radians), normalized.", guid, data.id);
             data.orientation = Position::NormalizeOrientation(data.orientation);
         }
 
@@ -2059,12 +2059,12 @@ void ObjectMgr::LoadCreatures()
             MapEntry const* terrainSwapEntry = sMapStore.LookupEntry(data.terrainSwapMap);
             if (!terrainSwapEntry)
             {
-                TC_LOG_ERROR("sql.sql", "Table `creature` have creature (GUID: % Entry: %u) with `terrainSwapMap` %u does not exist, set to -1", guid, data.id, data.terrainSwapMap);
+                TC_LOG_ERROR("sql.sql", "Table `creature` have creature (GUID: %u Entry: %u) with `terrainSwapMap` %u does not exist, set to -1", guid, data.id, data.terrainSwapMap);
                 data.terrainSwapMap = -1;
             }
             else if (terrainSwapEntry->rootPhaseMap != data.mapid)
             {
-                TC_LOG_ERROR("sql.sql", "Table `creature` have creature (GUID: % Entry: %u) with `terrainSwapMap` %u which cannot be used on spawn map, set to -1", guid, data.id, data.terrainSwapMap);
+                TC_LOG_ERROR("sql.sql", "Table `creature` have creature (GUID: %u Entry: %u) with `terrainSwapMap` %u which cannot be used on spawn map, set to -1", guid, data.id, data.terrainSwapMap);
                 data.terrainSwapMap = -1;
             }
         }
@@ -2338,13 +2338,13 @@ void ObjectMgr::LoadGameobjects()
 
         if (data.phaseUseFlags & ~PHASE_USE_FLAGS_ALL)
         {
-            TC_LOG_ERROR("sql.sql", "Table `gameobject` have gameobject (GUID: " UI64FMTD " Entry: %u) has unknown `phaseUseFlags` set, removed unknown value.", guid, data.id);
+            TC_LOG_ERROR("sql.sql", "Table `gameobject` have gameobject (GUID: %u Entry: %u) has unknown `phaseUseFlags` set, removed unknown value.", guid, data.id);
             data.phaseUseFlags &= PHASE_USE_FLAGS_ALL;
         }
 
         if (data.phaseUseFlags & PHASE_USE_FLAGS_ALWAYS_VISIBLE && data.phaseUseFlags & PHASE_USE_FLAGS_INVERSE)
         {
-            TC_LOG_ERROR("sql.sql", "Table `gameobject` have gameobject (GUID: " UI64FMTD " Entry: %u) has both `phaseUseFlags` PHASE_USE_FLAGS_ALWAYS_VISIBLE and PHASE_USE_FLAGS_INVERSE,"
+            TC_LOG_ERROR("sql.sql", "Table `gameobject` have gameobject (GUID: %u Entry: %u) has both `phaseUseFlags` PHASE_USE_FLAGS_ALWAYS_VISIBLE and PHASE_USE_FLAGS_INVERSE,"
                 " removing PHASE_USE_FLAGS_INVERSE.", guid, data.id);
             data.phaseUseFlags &= ~PHASE_USE_FLAGS_INVERSE;
         }
@@ -2367,12 +2367,12 @@ void ObjectMgr::LoadGameobjects()
             MapEntry const* terrainSwapEntry = sMapStore.LookupEntry(data.terrainSwapMap);
             if (!terrainSwapEntry)
             {
-                TC_LOG_ERROR("sql.sql", "Table `gameobject` have gameobject (GUID: " UI64FMTD " Entry: %u) with `terrainSwapMap` %u does not exist, set to -1", guid, data.id, data.terrainSwapMap);
+                TC_LOG_ERROR("sql.sql", "Table `gameobject` have gameobject (GUID: %u Entry: %u) with `terrainSwapMap` %u does not exist, set to -1", guid, data.id, data.terrainSwapMap);
                 data.terrainSwapMap = -1;
             }
             else if (terrainSwapEntry->rootPhaseMap != data.mapid)
             {
-                TC_LOG_ERROR("sql.sql", "Table `gameobject` have gameobject (GUID: " UI64FMTD " Entry: %u) with `terrainSwapMap` %u which cannot be used on spawn map, set to -1", guid, data.id, data.terrainSwapMap);
+                TC_LOG_ERROR("sql.sql", "Table `gameobject` have gameobject (GUID: %u Entry: %u) with `terrainSwapMap` %u which cannot be used on spawn map, set to -1", guid, data.id, data.terrainSwapMap);
                 data.terrainSwapMap = -1;
             }
         }
diff --git a/src/server/game/Maps/TransportMgr.cpp b/src/server/game/Maps/TransportMgr.cpp
index 2b096d9c5bd..7f260e42639 100644
--- a/src/server/game/Maps/TransportMgr.cpp
+++ b/src/server/game/Maps/TransportMgr.cpp
@@ -443,20 +443,20 @@ void TransportMgr::SpawnContinentTransports()
 
             if (phaseUseFlags & ~PHASE_USE_FLAGS_ALL)
             {
-                TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: " UI64FMTD " Entry: %u) with unknown `phaseUseFlags` set, removed unknown value.", guid, entry);
+                TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: %u Entry: %u) with unknown `phaseUseFlags` set, removed unknown value.", guid, entry);
                 phaseUseFlags &= PHASE_USE_FLAGS_ALL;
             }
 
             if (phaseUseFlags & PHASE_USE_FLAGS_ALWAYS_VISIBLE && phaseUseFlags & PHASE_USE_FLAGS_INVERSE)
             {
-                TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: " UI64FMTD " Entry: %u) has both `phaseUseFlags` PHASE_USE_FLAGS_ALWAYS_VISIBLE and PHASE_USE_FLAGS_INVERSE,"
+                TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: %u Entry: %u) has both `phaseUseFlags` PHASE_USE_FLAGS_ALWAYS_VISIBLE and PHASE_USE_FLAGS_INVERSE,"
                     " removing PHASE_USE_FLAGS_INVERSE.", guid, entry);
                 phaseUseFlags &= ~PHASE_USE_FLAGS_INVERSE;
             }
 
             if (phaseGroupId && phaseId)
             {
-                TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: " UI64FMTD " Entry: %u) with both `phaseid` and `phasegroup` set, `phasegroup` set to 0", guid, entry);
+                TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: %u Entry: %u) with both `phaseid` and `phasegroup` set, `phasegroup` set to 0", guid, entry);
                 phaseGroupId = 0;
             }
 
@@ -464,7 +464,7 @@ void TransportMgr::SpawnContinentTransports()
             {
                 if (!sPhaseStore.LookupEntry(phaseId))
                 {
-                    TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: " UI64FMTD " Entry: %u) with `phaseid` %u does not exist, set to 0", guid, entry, phaseId);
+                    TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: %u Entry: %u) with `phaseid` %u does not exist, set to 0", guid, entry, phaseId);
                     phaseId = 0;
                 }
             }
@@ -473,7 +473,7 @@ void TransportMgr::SpawnContinentTransports()
             {
                 if (!GetPhasesForGroup(phaseGroupId))
                 {
-                    TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: " UI64FMTD " Entry: %u) with `phaseGroup` %u does not exist, set to 0", guid, entry, phaseGroupId);
+                    TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: %u Entry: %u) with `phaseGroup` %u does not exist, set to 0", guid, entry, phaseGroupId);
                     phaseGroupId = 0;
                 }
             }
diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt
index 2709b43e22f..4bd2812f33a 100644
--- a/src/tools/mmaps_generator/CMakeLists.txt
+++ b/src/tools/mmaps_generator/CMakeLists.txt
@@ -28,6 +28,7 @@ set(mmap_gen_Includes
   ${CMAKE_SOURCE_DIR}/src/common/Collision/Management
   ${CMAKE_SOURCE_DIR}/src/common/Collision/Maps
   ${CMAKE_SOURCE_DIR}/src/common/Collision/Models
+  ${CMAKE_SOURCE_DIR}/src/common/DataStores
 )
 
 include_directories(${mmap_gen_Includes})