diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake
index 1a614510400..d1db25941f6 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.29_2018_04_15.sql"
+ #define _FULL_DATABASE             "TDB_full_world_434.30_2018_05_15.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 5c14a5b6acc..44ccf4e29af 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -2009,7 +2009,8 @@ INSERT INTO `updates` VALUES
 ('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),
 ('2018_03_28_00_auth.sql','45A7C896BDF00B1C319C9F889893D3B95E45EF0A','ARCHIVED','2018-03-28 01:40:04',0),
-('2018_04_15_00_auth.sql','2293BAA1DA754CFD780838FE99EDB98FD7C041E0','ARCHIVED','2018-04-15 01:40:04',0);
+('2018_04_15_00_auth.sql','2293BAA1DA754CFD780838FE99EDB98FD7C041E0','ARCHIVED','2018-04-15 01:40:04',0),
+('2018_05_15_00_auth.sql','9076B44013D5BE1E92A06BDE7CE4F9B6663272CC','ARCHIVED','2018-05-15 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 22c1766a9b4..48f8d4b3bb0 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2955,7 +2955,8 @@ INSERT INTO `updates` VALUES
 ('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),
 ('2018_03_25_00_characters.sql','4FE3C6866A6DCD4926D451F6009464D290C2EF1F','ARCHIVED','2018-03-25 00:00:00',0),
-('2018_04_15_00_characters.sql','F7058DE71A2BD3B31088AE586ACB3ECB2EB5A268','ARCHIVED','2018-04-15 00:00:00',0);
+('2018_04_15_00_characters.sql','F7058DE71A2BD3B31088AE586ACB3ECB2EB5A268','ARCHIVED','2018-04-15 00:00:00',0),
+('2018_05_15_00_characters.sql','1FC906E4C7E86DCA67243F0768A94825A2C9E323','ARCHIVED','2018-05-15 00:00:00',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/updates/auth/4.3.4/2018_04_15_00_auth.sql b/sql/old/4.3.4/auth/29_2018_05_15/2018_04_15_00_auth.sql
similarity index 100%
rename from sql/updates/auth/4.3.4/2018_04_15_00_auth.sql
rename to sql/old/4.3.4/auth/29_2018_05_15/2018_04_15_00_auth.sql
diff --git a/sql/updates/characters/4.3.4/2018_04_15_00_characters.sql b/sql/old/4.3.4/characters/29_2018_05_15/2018_04_15_00_characters.sql
similarity index 100%
rename from sql/updates/characters/4.3.4/2018_04_15_00_characters.sql
rename to sql/old/4.3.4/characters/29_2018_05_15/2018_04_15_00_characters.sql
diff --git a/sql/updates/world/4.3.4/2018_04_15_00_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_15_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_15_00_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_15_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_15_01_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_15_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_15_01_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_15_01_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_15_02_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_15_02_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_15_02_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_15_02_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_15_03_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_15_03_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_15_03_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_15_03_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_15_04_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_15_04_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_15_04_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_15_04_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_16_00_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_16_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_16_00_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_16_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_16_01_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_16_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_16_01_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_16_01_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_17_00_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_17_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_17_00_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_17_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_17_01_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_17_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_17_01_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_17_01_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_17_02_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_17_02_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_17_02_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_17_02_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_17_03_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_17_03_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_17_03_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_17_03_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_18_00_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_18_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_18_00_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_18_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_21_00_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_21_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_21_00_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_21_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_21_01_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_21_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_21_01_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_21_01_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_21_02_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_21_02_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_21_02_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_21_02_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_21_03_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_21_03_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_21_03_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_21_03_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_23_00_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_23_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_23_00_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_23_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_25_00_world_from_335_was_2018_04_17_00_world_335.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_25_00_world_from_335_was_2018_04_17_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_25_00_world_from_335_was_2018_04_17_00_world_335.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_25_00_world_from_335_was_2018_04_17_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_04_25_01_world_from_335_was_2018_04_17_01_world_335.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_25_01_world_from_335_was_2018_04_17_01_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_25_01_world_from_335_was_2018_04_17_01_world_335.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_25_01_world_from_335_was_2018_04_17_01_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_04_25_02_world_from_335_was_2018_04_17_02_world_335.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_25_02_world_from_335_was_2018_04_17_02_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_25_02_world_from_335_was_2018_04_17_02_world_335.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_25_02_world_from_335_was_2018_04_17_02_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_04_25_03_world_from_335_was_2018_04_17_03_world_335.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_25_03_world_from_335_was_2018_04_17_03_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_25_03_world_from_335_was_2018_04_17_03_world_335.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_25_03_world_from_335_was_2018_04_17_03_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_04_25_04_world_from_335_was_2018_04_22_00_world_335.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_25_04_world_from_335_was_2018_04_22_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_25_04_world_from_335_was_2018_04_22_00_world_335.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_25_04_world_from_335_was_2018_04_22_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_04_25_05_world_from_335_was_2018_04_24_00_world_335.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_25_05_world_from_335_was_2018_04_24_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_25_05_world_from_335_was_2018_04_24_00_world_335.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_25_05_world_from_335_was_2018_04_24_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_04_26_00_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_26_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_26_00_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_26_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_04_29_00_world_from_335_was_2018_04_26_00_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_04_29_00_world_from_335_was_2018_04_26_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_04_29_00_world_from_335_was_2018_04_26_00_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_04_29_00_world_from_335_was_2018_04_26_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_05_03_00_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_05_03_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_03_00_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_05_03_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_05_12_00_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_05_12_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_12_00_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_05_12_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_05_12_01_world_from_335_was_2018_05_08_00_world_335.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_05_12_01_world_from_335_was_2018_05_08_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_12_01_world_from_335_was_2018_05_08_00_world_335.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_05_12_01_world_from_335_was_2018_05_08_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_12_02_world_from_335_was_2018_05_08_01_world_335.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_05_12_02_world_from_335_was_2018_05_08_01_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_12_02_world_from_335_was_2018_05_08_01_world_335.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_05_12_02_world_from_335_was_2018_05_08_01_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_12_03_world_from_335_was_2018_05_08_02_world_335.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_05_12_03_world_from_335_was_2018_05_08_02_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_12_03_world_from_335_was_2018_05_08_02_world_335.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_05_12_03_world_from_335_was_2018_05_08_02_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_12_04_world_from_335_was_2018_05_08_03_world_335.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_05_12_04_world_from_335_was_2018_05_08_03_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_12_04_world_from_335_was_2018_05_08_03_world_335.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_05_12_04_world_from_335_was_2018_05_08_03_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_12_05_world_from_335_was_2018_05_08_04_world_335.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_05_12_05_world_from_335_was_2018_05_08_04_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_12_05_world_from_335_was_2018_05_08_04_world_335.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_05_12_05_world_from_335_was_2018_05_08_04_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_12_06_world_from_335_was_2018_05_08_05_world_335.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_05_12_06_world_from_335_was_2018_05_08_05_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_12_06_world_from_335_was_2018_05_08_05_world_335.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_05_12_06_world_from_335_was_2018_05_08_05_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_12_07_world_from_335_was_2018_05_08_06_world_335.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_05_12_07_world_from_335_was_2018_05_08_06_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_12_07_world_from_335_was_2018_05_08_06_world_335.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_05_12_07_world_from_335_was_2018_05_08_06_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_12_08_world_from_335_was_2018_05_08_07_world_335.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_05_12_08_world_from_335_was_2018_05_08_07_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_12_08_world_from_335_was_2018_05_08_07_world_335.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_05_12_08_world_from_335_was_2018_05_08_07_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_12_09_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_05_12_09_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_12_09_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_05_12_09_world.sql
diff --git a/sql/updates/world/4.3.4/2018_05_12_10_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_05_12_10_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_12_10_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_05_12_10_world.sql
diff --git a/sql/updates/world/4.3.4/2018_05_12_11_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_05_12_11_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_12_11_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_05_12_11_world.sql
diff --git a/sql/updates/world/4.3.4/2018_05_13_00_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_05_13_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_13_00_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_05_13_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_05_13_01_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_05_13_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_13_01_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_05_13_01_world.sql
diff --git a/sql/updates/world/4.3.4/2018_05_14_00_world_from_335_was_2018_05_13_00_world_335.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_05_14_00_world_from_335_was_2018_05_13_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_14_00_world_from_335_was_2018_05_13_00_world_335.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_05_14_00_world_from_335_was_2018_05_13_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_14_01_world_from_335_was_2018_05_14_00_world.sql b/sql/old/4.3.4/world/29_2018_05_15/2018_05_14_01_world_from_335_was_2018_05_14_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_14_01_world_from_335_was_2018_05_14_00_world.sql
rename to sql/old/4.3.4/world/29_2018_05_15/2018_05_14_01_world_from_335_was_2018_05_14_00_world.sql
diff --git a/sql/updates/auth/2018_05_15_00_auth.sql b/sql/updates/auth/2018_05_15_00_auth.sql
new file mode 100644
index 00000000000..2f1965a664a
--- /dev/null
+++ b/sql/updates/auth/2018_05_15_00_auth.sql
@@ -0,0 +1,2 @@
+-- TDB 4.3.4-30 auth database
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/characters/2018_05_15_00_characters.sql b/sql/updates/characters/2018_05_15_00_characters.sql
new file mode 100644
index 00000000000..f6c105d043c
--- /dev/null
+++ b/sql/updates/characters/2018_05_15_00_characters.sql
@@ -0,0 +1,2 @@
+-- TDB 4.3.4-30 characters database
+UPDATE `updates` SET `state`='ARCHIVED';