diff --git a/src/Action/Controller.php b/src/Action/Controller.php
index <HASH>..<HASH> 100644
--- a/src/Action/Controller.php
+++ b/src/Action/Controller.php
@@ -27,7 +27,7 @@ use Radium\Http\Router;
 use Radium\Http\Request;
 use Radium\Http\Response;
 use Radium\Language;
-use Radium\Database;
+use Radium\Database\ConnectionManager;
 use Radium\Templating\View;
 
 /**
@@ -63,7 +63,7 @@ class Controller
         $route = Router::currentRoute();
 
         // Set database connection
-        $this->db = Database::connection();
+        $this->db = ConnectionManager::connection();
     }
 
     /**
diff --git a/src/Application.php b/src/Application.php
index <HASH>..<HASH> 100644
--- a/src/Application.php
+++ b/src/Application.php
@@ -20,7 +20,7 @@ namespace Radium;
 
 use Exception;
 use ReflectionObject;
-use Radium\Database;
+use Radium\Database\ConnectionManager;
 use Radium\Templating\View;
 use Radium\Templating\Engines\PhpEngine;
 
@@ -118,7 +118,7 @@ class Application
             return null;
         }
 
-        $this->databaseConnection = Database::factory($this->databaseConfig);
+        $this->databaseConnection = ConnectionManager::create($this->databaseConfig);
     }
 
     /**
Update controller and application to use the `ConnectionManager`.