diff --git a/system/input.php b/system/input.php
index dee58d52..f5d59a05 100644
--- a/system/input.php
+++ b/system/input.php
@@ -34,7 +34,7 @@ class Input {
 			static::hydrate();
 		}
 
-		return (array_key_exists($key, static::$input)) ? static::$input[$key] : $default;
+		return Arr::get(static::$input, $key, $default);
 	}
 
 	/**
@@ -62,7 +62,7 @@ class Input {
 			throw new \Exception("Sessions must be enabled to retrieve old input data.");
 		}
 
-		return (array_key_exists($key, $old = Session::get('laravel_old_input', array()))) ? $old[$key] : $default;
+		return Arr::get(Session::get('laravel_old_input', array()), $key, $default);
 	}
 
 	/**
@@ -81,7 +81,7 @@ class Input {
 			return (isset($_FILES[$file][$key])) ? $_FILES[$file][$key] : $default;
 		}
 
-		return (array_key_exists($key, $_FILES)) ? $_FILES[$key] : $default;
+		return Arr::get($_FILES, $key, $default);
 	}
 
 	/**
diff --git a/system/router.php b/system/router.php
index 2f51f775..1a898bfd 100644
--- a/system/router.php
+++ b/system/router.php
@@ -20,7 +20,7 @@ class Router {
 	{
 		if (is_null(static::$routes))
 		{
-			static::$routes = (is_dir(APP_PATH.'routes')) ? static::load($uri) : require APP_PATH.'routes'.EXT;
+			static::$routes = static::load($uri);
 		}
 
 		// Put the request method and URI in route form. Routes begin with the request method and a forward slash.
@@ -58,6 +58,11 @@ class Router {
 	 */
 	public static function load($uri)
 	{
+		if ( ! is_dir(APP_PATH.'routes'))
+		{
+			return require APP_PATH.'routes'.EXT;
+		}
+
 		if ( ! file_exists(APP_PATH.'routes/home'.EXT))
 		{
 			throw new \Exception("A [home] route file is required when using a route directory.");					
@@ -89,7 +94,7 @@ class Router {
 	 * @param  string  $route
 	 * @return array
 	 */
-	private static function parameters($uri, $route)
+	public static function parameters($uri, $route)
 	{
 		return array_values(array_intersect_key(explode('/', $uri), preg_grep('/\(.+\)/', explode('/', $route))));	
 	}	
diff --git a/system/session.php b/system/session.php
index 43931358..644345d6 100644
--- a/system/session.php
+++ b/system/session.php
@@ -7,14 +7,14 @@ class Session {
 	 *
 	 * @var Session\Driver
 	 */
-	private static $driver;
+	public static $driver;
 
 	/**
 	 * The session.
 	 *
 	 * @var array
 	 */
-	private static $session = array();
+	public static $session = array();
 
 	/**
 	 * Get the session driver.