diff --git a/src/StorageDrivers/DatabaseStorageDriver.php b/src/StorageDrivers/DatabaseStorageDriver.php
index ac7ce04d..03c4aea3 100644
--- a/src/StorageDrivers/DatabaseStorageDriver.php
+++ b/src/StorageDrivers/DatabaseStorageDriver.php
@@ -2,7 +2,7 @@
 
 namespace Stancl\Tenancy\StorageDrivers;
 
-use Stancl\Tenancy\Interfaces\TenantModel;
+use Stancl\Tenancy\Tenant;
 use Stancl\Tenancy\Interfaces\StorageDriver;
 
 class DatabaseStorageDriver implements StorageDriver
@@ -50,9 +50,13 @@ class DatabaseStorageDriver implements StorageDriver
 
     public function getAllTenants(array $uuids = []): array
     {
-        return Tenant::all()->map(function ($model) {
-            return $model->toArray();
-        })->toArray();
+        if ($uuids) {
+            $tenants = Tenant::find($uuids);
+        } else {
+            $tenants = Tenant::all();
+        }
+        
+        return $tenants->toArray();
     }
 
     public function get(string $uuid, string $key)
diff --git a/src/Tenant.php b/src/Tenant.php
index 71f47590..d8f06dfc 100644
--- a/src/Tenant.php
+++ b/src/Tenant.php
@@ -20,12 +20,12 @@ class Tenant extends Model
 
     public function dataColumn()
     {
-        return config('tenancy.db_storage.data_column');
+        return config('tenancy.db_storage.data_column', 'data');
     }
 
     public function customColumns()
     {
-        return config('tenancy.db_storage.custom_columns');
+        return config('tenancy.db_storage.custom_columns', []);
     }
 
     public function getFromData(string $key)
diff --git a/src/assets/migrations/2019_08_08_000000_create_tenants_table.php b/src/assets/migrations/2019_08_08_000000_create_tenants_table.php
index eafc175a..3563a8d7 100644
--- a/src/assets/migrations/2019_08_08_000000_create_tenants_table.php
+++ b/src/assets/migrations/2019_08_08_000000_create_tenants_table.php
@@ -16,7 +16,7 @@ class CreateTenantsTable extends Migration
         Schema::create('tenants', function (Blueprint $table) {
             $table->string('uuid', 36)->primary();
             $table->string('domain', 255)->index();
-            $table->string('data', 1024)->default('{}');
+            $table->json('data')->default('{}');
         });
     }