diff --git a/classes/Database/Query/Builder/Join.php b/classes/Database/Query/Builder/Join.php
new file mode 100644
index 0000000..0ce41c7
--- /dev/null
+++ b/classes/Database/Query/Builder/Join.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') OR die('No direct script access.');
+
+class Database_Query_Builder_Join extends lnAuth_Database_Query_Builder_Join {}
diff --git a/classes/Minion/Task.php b/classes/Minion/Task.php
new file mode 100644
index 0000000..43c584d
--- /dev/null
+++ b/classes/Minion/Task.php
@@ -0,0 +1,4 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+abstract class Minion_Task extends lnAuth_Minion_Task {}
+?>
diff --git a/classes/Request.php b/classes/Request.php
new file mode 100644
index 0000000..137775e
--- /dev/null
+++ b/classes/Request.php
@@ -0,0 +1,4 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class Request extends lnAuth_Request {}
+?>
diff --git a/classes/lnAuth/Database/Query/Builder/Join.php b/classes/lnAuth/Database/Query/Builder/Join.php
new file mode 100644
index 0000000..527d7c7
--- /dev/null
+++ b/classes/lnAuth/Database/Query/Builder/Join.php
@@ -0,0 +1,20 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class extends Kohana's [Database_Query_Builder_Join] to ensure that we have a site_id in join statements
+ *
+ * @package    lnAuth
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2009-2013 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+
+abstract class lnAuth_Database_Query_Builder_Join extends Kohana_Database_Query_Builder_Join {
+	public function compile($db = NULL) {
+		$this->_on[] = array($this->_table.'.site_id','=',Site::id());
+
+		return parent::compile($db);
+	}
+}
+?>
diff --git a/classes/lnAuth/Minion/Task.php b/classes/lnAuth/Minion/Task.php
new file mode 100644
index 0000000..4d6ac84
--- /dev/null
+++ b/classes/lnAuth/Minion/Task.php
@@ -0,0 +1,25 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class overrides Kohana's Minion CLI Module
+ *
+ * @package    lnAuth
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2009-2013 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+abstract class lnAuth_Minion_Task extends Kohana_Minion_Task {
+	protected $_sysoptions = array(
+		'site'=>NULL,
+	);
+
+	/**
+	 * Override our __construct so that we can specify options in each class file
+	 */
+	protected function __construct() {
+		// Populate $_accepted_options based on keys from $_options
+		$this->_accepted_options = array_keys(Arr::merge($this->_sysoptions,$this->_options));
+	}
+}
+?>
diff --git a/classes/lnAuth/Model/Module/Method.php b/classes/lnAuth/Model/Module/Method.php
index d50e161..a382c81 100644
--- a/classes/lnAuth/Model/Module/Method.php
+++ b/classes/lnAuth/Model/Module/Method.php
@@ -58,27 +58,6 @@ abstract class lnAuth_Model_Module_Method extends ORM {
 		return $this->menu_display ? $this->menu_display : sprintf('%s: %s',$this->module->name,$this->name);
 	}
 
-	/**
-	 * Get our Module_Method object for this request
-	 */
-	public function request_mmo(Request $ro) {
-		list($c,$x) = substr_count($ro->controller(),'_') ? explode('_',$ro->controller(),2) : array($ro->controller(),'');
-
-		$mo = ORM::factory('Module',array('name'=>$c));
-
-		if ($mo->loaded() AND $mo->active) {
-			$method = strtolower($ro->directory() ? sprintf('%s:%s',$ro->directory() ? $ro->directory().($x ? '_'.$x : '') : $ro->action(),$ro->action()) : $ro->action());
-
-			// Get the method number
-			$mmo = $mo->module_method
-				->where('name','=',$method)
-				->find();
-
-			if ($mmo->loaded())
-				return $mmo;
-		}
-	}
-
 	public function status($status=NULL) {
 		if ($status)
 			$this->status = $status;
diff --git a/classes/lnAuth/Request.php b/classes/lnAuth/Request.php
new file mode 100644
index 0000000..ec92bd0
--- /dev/null
+++ b/classes/lnAuth/Request.php
@@ -0,0 +1,44 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * Request. Uses the [Route] class to determine what
+ * [Controller] to send the request to.
+ *
+ * @package    lnAuth
+ * @category   Modifications
+ * @author     Deon George
+ * @copyright  (c) 2009-2013 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+abstract class lnAuth_Request extends lnApp_Request {
+	/**
+	 * Get our Module_Method object for this request
+	 */
+	public function mmo() {
+		static $result = FALSE;
+
+		if (is_null($result) OR $result)
+			return $result;
+
+		$result = NULL;
+
+		list($c,$x) = substr_count($this->_controller,'_') ? explode('_',$this->_controller,2) : array($this->_controller,'');
+
+		$mo = ORM::factory('Module',array('name'=>$c));
+
+		if ($mo->loaded() AND $mo->active) {
+			$method = strtolower($this->_directory ? sprintf('%s:%s',$this->_directory.($x ? '_'.$x : ''),$this->_action) : $this->_action);
+
+			// Get the method number
+			$mmo = $mo->module_method
+				->where('name','=',$method)
+				->find();
+
+			if ($mmo->loaded())
+				$result = $mmo;
+		}
+
+		return $result;
+	}
+}
+?>