diff --git a/sql/characters_inventory.sql b/sql/characters_inventory.sql
index dee4a284..30cc31b2 100644
--- a/sql/characters_inventory.sql
+++ b/sql/characters_inventory.sql
@@ -1,54 +1,21 @@
--- MySQL dump 10.13  Distrib 5.7.10, for Win64 (x86_64)
---
--- Host: localhost    Database: ffxiv_database
--- ------------------------------------------------------
--- Server version	5.7.10-log
+/*
+MySQL Data Transfer
+Source Host: localhost
+Source Database: ffxiv_server
+Target Host: localhost
+Target Database: ffxiv_server
+Date: 9/9/2017 2:31:15 PM
+*/
 
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `characters_inventory`
---
-
-DROP TABLE IF EXISTS `characters_inventory`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `characters_inventory` (
-  `id` int(10) unsigned zerofill NOT NULL AUTO_INCREMENT,
-  `characterId` int(10) unsigned NOT NULL,
-  `slot` int(10) unsigned NOT NULL,
-  `inventoryType` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `serverItemId` int(10) unsigned NOT NULL,
-  `quantity` int(10) unsigned NOT NULL DEFAULT '1',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `characters_inventory`
---
-
-LOCK TABLES `characters_inventory` WRITE;
-/*!40000 ALTER TABLE `characters_inventory` DISABLE KEYS */;
-/*!40000 ALTER TABLE `characters_inventory` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2016-06-07 22:54:46
+SET FOREIGN_KEY_CHECKS=0;
+-- ----------------------------
+-- Table structure for characters_inventory
+-- ----------------------------
+CREATE TABLE `characters_inventory` (
+  `id` int(10) unsigned zerofill NOT NULL AUTO_INCREMENT,
+  `characterId` int(10) unsigned NOT NULL,
+  `inventoryType` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `serverItemId` int(10) unsigned NOT NULL,
+  `quantity` int(10) unsigned NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`,`characterId`)
+) ENGINE=InnoDB AUTO_INCREMENT=325 DEFAULT CHARSET=utf8;
diff --git a/sql/characters_retainers.sql b/sql/characters_retainers.sql
index 4e4e4ed3..5ee070dc 100644
--- a/sql/characters_retainers.sql
+++ b/sql/characters_retainers.sql
@@ -4,7 +4,7 @@ Source Host: localhost
 Source Database: ffxiv_server
 Target Host: localhost
 Target Database: ffxiv_server
-Date: 4/15/2017 4:38:42 PM
+Date: 9/9/2017 2:30:57 PM
 */
 
 SET FOREIGN_KEY_CHECKS=0;
@@ -14,9 +14,6 @@ SET FOREIGN_KEY_CHECKS=0;
 CREATE TABLE `characters_retainers` (
   `characterId` int(10) unsigned NOT NULL,
   `retainerId` int(10) unsigned NOT NULL,
+  `doRename` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`characterId`,`retainerId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
--- ----------------------------
--- Records 
--- ----------------------------
diff --git a/sql/server_items.sql b/sql/server_items.sql
index 141b653b..a0cf8694 100644
--- a/sql/server_items.sql
+++ b/sql/server_items.sql
@@ -1,59 +1,27 @@
--- MySQL dump 10.13  Distrib 5.7.10, for Win64 (x86_64)
---
--- Host: localhost    Database: ffxiv_database
--- ------------------------------------------------------
--- Server version	5.7.10-log
+/*
+MySQL Data Transfer
+Source Host: localhost
+Source Database: ffxiv_server
+Target Host: localhost
+Target Database: ffxiv_server
+Date: 9/9/2017 2:31:34 PM
+*/
 
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `server_items`
---
-
-DROP TABLE IF EXISTS `server_items`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `server_items` (
-  `id` int(10) unsigned zerofill NOT NULL AUTO_INCREMENT,
-  `itemId` int(10) unsigned NOT NULL,
-  `quality` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `itemType` tinyint(6) unsigned NOT NULL DEFAULT '0',
-  `durability` int(11) NOT NULL DEFAULT '0',
-  `spiritbind` smallint(5) unsigned DEFAULT '0',
-  `materia1` tinyint(3) unsigned DEFAULT '0',
-  `materia2` tinyint(3) unsigned DEFAULT '0',
-  `materia3` tinyint(3) unsigned DEFAULT '0',
-  `materia4` tinyint(3) unsigned DEFAULT '0',
-  `materia5` tinyint(3) unsigned DEFAULT '0',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `server_items`
---
-
-LOCK TABLES `server_items` WRITE;
-/*!40000 ALTER TABLE `server_items` DISABLE KEYS */;
-/*!40000 ALTER TABLE `server_items` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2016-06-07 22:54:54
+SET FOREIGN_KEY_CHECKS=0;
+-- ----------------------------
+-- Table structure for server_items
+-- ----------------------------
+CREATE TABLE `server_items` (
+  `id` int(10) unsigned zerofill NOT NULL AUTO_INCREMENT,
+  `itemId` int(10) unsigned NOT NULL,
+  `quality` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `itemType` tinyint(6) unsigned NOT NULL DEFAULT '0',
+  `durability` int(11) NOT NULL DEFAULT '0',
+  `spiritbind` smallint(5) unsigned DEFAULT '0',
+  `materia1` tinyint(3) unsigned DEFAULT '0',
+  `materia2` tinyint(3) unsigned DEFAULT '0',
+  `materia3` tinyint(3) unsigned DEFAULT '0',
+  `materia4` tinyint(3) unsigned DEFAULT '0',
+  `materia5` tinyint(3) unsigned DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1435 DEFAULT CHARSET=utf8;
diff --git a/sql/server_retainers.sql b/sql/server_retainers.sql
index 13f05f35..aff8f7e8 100644
--- a/sql/server_retainers.sql
+++ b/sql/server_retainers.sql
@@ -4,7 +4,7 @@ Source Host: localhost
 Source Database: ffxiv_server
 Target Host: localhost
 Target Database: ffxiv_server
-Date: 4/15/2017 4:38:21 PM
+Date: 9/9/2017 2:30:21 PM
 */
 
 SET FOREIGN_KEY_CHECKS=0;
@@ -14,14 +14,10 @@ SET FOREIGN_KEY_CHECKS=0;
 CREATE TABLE `server_retainers` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(255) NOT NULL,
-  `classActorId` int(10) unsigned NOT NULL,
+  `actorClassId` int(10) unsigned NOT NULL,
   `cdIDOffset` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `placeName` smallint(5) unsigned NOT NULL,
   `conditions` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- ----------------------------
--- Records 
--- ----------------------------
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;