diff --git a/sys/common.php b/sys/common.php
index 5e6d9c3..eb1a514 100644
--- a/sys/common.php
+++ b/sys/common.php
@@ -310,9 +310,6 @@ function init()
 	// Load Database classes
 	require_once(MM_SYS_PATH . 'db/autoload.php');
 
-	// Load the page class
-	$GLOBALS['page'] = new \miniMVC\Page();
-
 	// Map to the appropriate module/controller/function
 	route();
 }
diff --git a/sys/core/Controller.php b/sys/core/Controller.php
index f9ca849..47746b3 100644
--- a/sys/core/Controller.php
+++ b/sys/core/Controller.php
@@ -37,8 +37,10 @@ class Controller {
 	 */
 	public function __construct()
 	{
-		// Create the page object
-		$this->page = $GLOBALS['page'];
+		if (is_null($this->page))
+		{
+			$this->page = new Page();
+		}
 	}
 
 	// --------------------------------------------------------------------------
diff --git a/sys/db b/sys/db
index 1e71b22..c963dc2 160000
--- a/sys/db
+++ b/sys/db
@@ -1 +1 @@
-Subproject commit 1e71b225c533bada107f439106c9216982b62daa
+Subproject commit c963dc29f252d2d237ceacf8300e6e3030abd584