diff --git a/assets/config.php b/assets/config.php
index 79dec526..ce1727db 100644
--- a/assets/config.php
+++ b/assets/config.php
@@ -57,6 +57,5 @@ return [
     ],
     'queue_database_creation' => false,
     'queue_database_deletion' => false,
-    'database_name_key' => null,
     'unique_id_generator' => 'Stancl\Tenancy\UUIDGenerator',
 ];
diff --git a/src/Commands/Migrate.php b/src/Commands/Migrate.php
index 30290335..cb98d7e2 100644
--- a/src/Commands/Migrate.php
+++ b/src/Commands/Migrate.php
@@ -54,7 +54,7 @@ class Migrate extends MigrateCommand
 
             // See Illuminate\Database\Migrations\DatabaseMigrationRepository::getConnection.
             // Database connections are cached by Illuminate\Database\ConnectionResolver.
-            $connectionName = "tenant{$tenant['uuid']}";
+            $connectionName = "tenant{$tenant['uuid']}"; // todo use Illuminate DatabaseManager reconnect()?
             $this->input->setOption('database', $connectionName);
             $this->database->connectToTenant($tenant, $connectionName);
 
diff --git a/src/DatabaseManagerv2.php b/src/DatabaseManagerv2.php
new file mode 100644
index 00000000..1301c8f5
--- /dev/null
+++ b/src/DatabaseManagerv2.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Stancl\Tenancy;
+
+use Illuminate\Database\DatabaseManager as BaseDatabaseManager;
+
+class DatabaseManagerv2
+{
+    /** @var BaseDatabaseManager */
+    protected $database;
+
+    public function __construct(BaseDatabaseManager $database)
+    {
+        $this->database = $database;
+    }
+
+    public function connect(Tenant $tenant)
+    {
+        $connection = $tenant->getConnectionName(); // todo
+
+        $this->createTenantConnection($tenant->getDatabaseName(), $connection);
+        $this->switchConnection($connection);
+    }
+
+    public function reconnect()
+    {
+        $this->switchConnection($this->originalDefaultConnection);
+    }
+
+    public function createTenantConnection(string $databaseName, string $connectionName = null)
+    {
+        $connectionName = $connectionName ?: $this->defaultTenantConnectionName;
+
+        // Create the database connection.
+        $based_on = config('tenancy.database.based_on') ?: config('database.default');
+        config()->set([
+            "database.connections.$connectionName" => config('database.connections.' . $based_on),
+        ]);
+
+        // Change DB name
+        $databaseName = $this->getDriver($connectionName) === 'sqlite' ? database_path($databaseName) : $databaseName;
+        config()->set(["database.connections.$connectionName.database" => $databaseName]);
+    }
+
+    public function switchConnection($connection)
+    {
+        $this->database->purge();
+        $this->database->reconnect($connection);
+        $this->database->setDefaultConnection($connection);
+    }
+}
\ No newline at end of file
diff --git a/src/Interfaces/StorageDriver.php b/src/Interfaces/StorageDriver.php
deleted file mode 100644
index 22fae59b..00000000
--- a/src/Interfaces/StorageDriver.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Stancl\Tenancy\Interfaces;
-
-interface StorageDriver
-{
-    public function identifyTenant(string $domain): array;
-
-    /** @return array[] */
-    public function getAllTenants(array $uuids = []): array;
-
-    public function getTenantById(string $uuid, array $fields = []): array;
-
-    public function getTenantIdByDomain(string $domain): ?string;
-
-    public function createTenant(string $domain, string $uuid): array;
-
-    public function deleteTenant(string $uuid): bool;
-
-    public function get(string $uuid, string $key);
-
-    public function getMany(string $uuid, array $keys): array;
-
-    public function put(string $uuid, string $key, $value);
-
-    public function putMany(string $uuid, array $values): array;
-}
diff --git a/src/Interfaces/TenantDatabaseManager.php b/src/Interfaces/TenantDatabaseManager.php
deleted file mode 100644
index c44d78bf..00000000
--- a/src/Interfaces/TenantDatabaseManager.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Stancl\Tenancy\Interfaces;
-
-interface TenantDatabaseManager
-{
-    /**
-     * Create a database.
-     *
-     * @param  string $name Name of the database.
-     * @return bool
-     */
-    public function createDatabase(string $name): bool;
-
-    /**
-     * Delete a database.
-     *
-     * @param  string $name Name of the database.
-     * @return bool
-     */
-    public function deleteDatabase(string $name): bool;
-}
diff --git a/src/Interfaces/UniqueIdentifierGenerator.php b/src/Interfaces/UniqueIdentifierGenerator.php
deleted file mode 100644
index 5033f6d5..00000000
--- a/src/Interfaces/UniqueIdentifierGenerator.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Stancl\Tenancy\Interfaces;
-
-interface UniqueIdentifierGenerator
-{
-    /**
-     * Generate a unique identifier.
-     *
-     * @param string $domain
-     * @param array $data
-     * @return string
-     */
-    public static function handle(string $domain, array $data = []): string;
-}
diff --git a/src/Tenant.php b/src/Tenant.php
index 4f0275f9..8c72f6ef 100644
--- a/src/Tenant.php
+++ b/src/Tenant.php
@@ -4,14 +4,16 @@ declare(strict_types=1);
 
 namespace Stancl\Tenancy;
 
+use ArrayAccess;
+
 // todo laravel events instead of custom events?
 
 /**
- * @final Class is subject to breaking changes in minor and patch versions.
+ * @internal Class is subject to breaking changes in minor and patch versions.
  */
-final class Tenant // todo implement an interface to allow for current tenant dependency injection
+class Tenant implements ArrayAccess
 {
-    // todo specify id in data
+    use Traits\HasArrayAccess;
 
     /**
      * Tenant data.
@@ -77,17 +79,24 @@ final class Tenant // todo implement an interface to allow for current tenant de
         return $this;
     }
 
-    public function save()
+    public function save(): self
     {
         if ($this->persisted) {
             $this->manager->addTenant($this);
         } else {
             $this->manager->updateTenant($this);
         }
+
+        return $this;
+    }
+
+    public function getDatabaseName()
+    {
+        return $this['_tenancy_database'] ?? $this->app['config']['tenancy.database.prefix'] . $this->uuid . $this->app['config']['tenancy.database.suffix'];
     }
 
     public function __get($name)
     {
-        return $this->data[$name];
+        return $this->data[$name] ?? null;
     }
 }
\ No newline at end of file
diff --git a/src/TenantManagerv2.php b/src/TenantManagerv2.php
index 92a9faab..2a4160c0 100644
--- a/src/TenantManagerv2.php
+++ b/src/TenantManagerv2.php
@@ -4,8 +4,32 @@ declare(strict_types=1);
 
 namespace Stancl\Tenancy;
 
-final class TenantManager
+use Illuminate\Foundation\Application;
+
+/**
+ * @internal Class is subject to breaking changes in minor and patch versions.
+ */
+class TenantManagerv2
 {
+    /**
+     * The current tenant.
+     *
+     * @var Tenant
+     */
+    public $tenant;
+
+    /** @var Application */
+    private $app;
+
+    /** @var Contracts\StorageDriver */
+    private $storage;
+
+    public function __construct(Application $app, Contracts\StorageDriver $storage)
+    {
+        $this->app = $app;
+        $this->storage = $storage;
+    }
+
     public function addTenant(Tenant $tenant): self
     {
         $this->storage->addTenant($tenant);
@@ -19,4 +43,38 @@ final class TenantManager
 
         return $this;
     }
+
+    public function initializeTenancy(Tenant $tenant): self
+    {
+        $this->bootstrapTenancy($tenant);
+        $this->setTenant($tenant);
+        
+        return $this;
+    }
+
+    public function bootstrapTenancy(Tenant $tenant): self
+    {
+        foreach($this->tenancyBootstrappers() as $bootstrapper) {
+            $bootstrapper::start($tenant);
+        }
+
+        return $this;
+    }
+
+    public function setTenant(Tenant $tenant): self
+    {
+        $this->app->instance(Tenant::class, $tenant);
+
+        return $this;
+    }
+
+    /**
+     * Return a list of TenancyBoostrappers.
+     *
+     * @return Contracts\TenancyBootstrapper[]
+     */
+    public function tenancyBootstrappers(): array
+    {
+        return config('tenancy.bootstrappers');
+    }
 }
\ No newline at end of file