diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandInfoCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandInfoCommand.java
deleted file mode 100644
index f23053a4a..000000000
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandInfoCommand.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package world.bentobox.bentobox.api.commands.island;
-
-public class IslandInfoCommand {
-}
diff --git a/src/main/java/world/bentobox/bentobox/api/configuration/BSBConfig.java b/src/main/java/world/bentobox/bentobox/api/configuration/BSBConfig.java
index 2c2ada88e..826f3a955 100644
--- a/src/main/java/world/bentobox/bentobox/api/configuration/BSBConfig.java
+++ b/src/main/java/world/bentobox/bentobox/api/configuration/BSBConfig.java
@@ -22,16 +22,14 @@ public class BSBConfig<T> {
     private AbstractDatabaseHandler<T> handler;
     private Logger logger;
 
-    @SuppressWarnings("unchecked")
     public BSBConfig(BentoBox plugin, Class<T> type)  {
         this.logger = plugin.getLogger();
-        handler = (AbstractDatabaseHandler<T>) new FlatFileDatabase().getHandler(type);
+        handler = new FlatFileDatabase().getHandler(type);
     }
 
-    @SuppressWarnings("unchecked")
     public BSBConfig(Addon addon, Class<T> type)  {
         this.logger = addon.getLogger();
-        handler = (AbstractDatabaseHandler<T>) new FlatFileDatabase().getHandler(type);
+        handler = new FlatFileDatabase().getHandler(type);
     }
 
     /**
diff --git a/src/main/java/world/bentobox/bentobox/database/BSBDatabase.java b/src/main/java/world/bentobox/bentobox/database/BSBDatabase.java
index 0363a38ef..149eee9ad 100644
--- a/src/main/java/world/bentobox/bentobox/database/BSBDatabase.java
+++ b/src/main/java/world/bentobox/bentobox/database/BSBDatabase.java
@@ -20,16 +20,14 @@ public class BSBDatabase<T> {
     private AbstractDatabaseHandler<T> handler;
     private Logger logger;
 
-    @SuppressWarnings("unchecked")
     public BSBDatabase(BentoBox plugin, Class<T> type)  {
         this.logger = plugin.getLogger();
-        handler = (AbstractDatabaseHandler<T>) BSBDbSetup.getDatabase().getHandler(type);
+        handler = BSBDbSetup.getDatabase().getHandler(type);
     }
 
-    @SuppressWarnings("unchecked")
     public BSBDatabase(Addon addon, Class<T> type)  {
         this.logger = addon.getLogger();
-        handler = (AbstractDatabaseHandler<T>) BSBDbSetup.getDatabase().getHandler(type);
+        handler = BSBDbSetup.getDatabase().getHandler(type);
 
     }
 
diff --git a/src/main/java/world/bentobox/bentobox/database/BSBDbSetup.java b/src/main/java/world/bentobox/bentobox/database/BSBDbSetup.java
index 6ea1e1009..a82ecde96 100644
--- a/src/main/java/world/bentobox/bentobox/database/BSBDbSetup.java
+++ b/src/main/java/world/bentobox/bentobox/database/BSBDbSetup.java
@@ -25,7 +25,7 @@ public abstract class BSBDbSetup {
         FLATFILE(new FlatFileDatabase()),
         MYSQL(new MySQLDatabase()),
         MONGO(new MongoDBDatabase());
-        
+
         BSBDbSetup database;
 
         DatabaseType(BSBDbSetup database){
@@ -35,9 +35,10 @@ public abstract class BSBDbSetup {
 
     /**
      * Gets a database handler that will store and retrieve classes of type dataObjectClass
+     * @param <T> - Class type
      * @param dataObjectClass - class of the object to be stored in the database
      * @return handler for this database object
      */
-    public abstract AbstractDatabaseHandler<?> getHandler(Class<?> dataObjectClass);
+    public abstract <T> AbstractDatabaseHandler<T> getHandler(Class<T> dataObjectClass);
 
 }
\ No newline at end of file
diff --git a/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabase.java b/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabase.java
index 00a7cbf4f..51fb45af5 100644
--- a/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabase.java
+++ b/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabase.java
@@ -6,18 +6,19 @@ import world.bentobox.bentobox.database.BSBDbSetup;
 
 public class FlatFileDatabase extends BSBDbSetup{
 
-    @Override
-    public AbstractDatabaseHandler<?> getHandler(Class<?> type) {
-        return new FlatFileDatabaseHandler<>(BentoBox.getInstance(), type, new FlatFileDatabaseConnecter(BentoBox.getInstance()));
-    }
-    
     /**
      * Get the config
+     * @param <T> - Class type
      * @param type - config object type
      * @return - the config handler
      */
-    public AbstractDatabaseHandler<?> getConfig(Class<?> type) {
+    public <T> AbstractDatabaseHandler<T> getConfig(Class<T> type) {
         return new ConfigHandler<>(BentoBox.getInstance(), type, new FlatFileDatabaseConnecter(BentoBox.getInstance()));
     }
 
+    @Override
+    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> type) {
+        return new FlatFileDatabaseHandler<>(BentoBox.getInstance(), type, new FlatFileDatabaseConnecter(BentoBox.getInstance()));
+    }
+
 }
diff --git a/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabase.java b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabase.java
index 97a302493..75ba6b658 100644
--- a/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabase.java
+++ b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabase.java
@@ -8,7 +8,7 @@ import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
 public class MongoDBDatabase extends BSBDbSetup{
 
     @Override
-    public AbstractDatabaseHandler<?> getHandler(Class<?> type) {
+    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> type) {
         BentoBox plugin = BentoBox.getInstance();
         // Check if the MongoDB plugin exists
         if (plugin.getServer().getPluginManager().getPlugin("BsbMongo") == null) {
diff --git a/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabase.java b/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabase.java
index 3134156eb..5fbe5e7c1 100644
--- a/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabase.java
+++ b/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabase.java
@@ -7,8 +7,12 @@ import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
 
 public class MySQLDatabase extends BSBDbSetup{
 
+
+    /* (non-Javadoc)
+     * @see world.bentobox.bentobox.database.BSBDbSetup#getHandler(java.lang.Class)
+     */
     @Override
-    public AbstractDatabaseHandler<?> getHandler(Class<?> type) {
+    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> type) {
         BentoBox plugin = BentoBox.getInstance();
         return new MySQLDatabaseHandler<>(plugin, type, new MySQLDatabaseConnecter(new DatabaseConnectionSettingsImpl(
                 plugin.getSettings().getDbHost(),