diff --git a/system/core/Controller.php b/system/core/Controller.php
index aeccd60ee4c..233d4abec43 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -66,6 +66,84 @@ class CI_Controller {
 	 */
 	public $load;
 
+	/**
+	 * CI_Benchmark
+	 *
+	 * @var	CI_Benchmark
+	 */
+	public $benchmark;
+
+	/**
+	 * CI_Config
+	 *
+	 * @var	CI_Config
+	 */
+	public $config;
+
+	/**
+	 * CI_Log
+	 *
+	 * @var	CI_Log
+	 */
+	public $log;
+
+	/**
+	 * CI_Hooks
+	 *
+	 * @var	CI_Hooks
+	 */
+	public $hooks;
+
+	/**
+	 * CI_Lang
+	 *
+	 * @var	CI_Lang
+	 */
+	public $lang;
+
+	/**
+	 * CI_Utf8
+	 *
+	 * @var	CI_Utf8
+	 */
+	public $utf8;
+
+	/**
+	 * CI_Uri
+	 *
+	 * @var	CI_Uri
+	 */
+	public $uri;
+
+	/**
+	 * CI_Router
+	 *
+	 * @var	CI_Router
+	 */
+
+	public $router;
+
+	/**
+	 * CI_Output
+	 *
+	 * @var	CI_Output
+	 */
+	public $output;
+
+	/**
+	 * CI_Security
+	 *
+	 * @var	CI_Security
+	 */
+	public $security;
+
+	/**
+	 * CI_Input 
+	 *
+	 * @var	CI_Input
+	 */
+	public $input;
+
 	/**
 	 * Class constructor
 	 *
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 648b7cfc7c2..84f63335e8c 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -122,6 +122,80 @@ class CI_Loader {
 	 */
 	protected $_ci_helpers =	array();
 
+	/**
+	 * List of loaded libraries
+	 *
+	 * @var	array
+	 */
+	protected $load;
+
+	/**
+	 *
+	 * @var CI_Benchmark
+	 */
+	protected $benchmark;
+
+	/**
+	 *
+	 * @var CI_Config
+	 */
+	protected $config;
+
+	/**
+	 *
+	 * @var CI_Log
+	 */
+	protected $log;
+
+	/**
+	 *
+	 * @var CI_Hooks
+	 */
+	protected $hooks;
+
+	/**
+	 *
+	 * @var CI_Lang
+	 */
+	protected $lang;
+
+	/**
+	 *
+	 * @var CI_Utf8
+	 */
+	protected $utf8;
+
+	/**
+	 *
+	 * @var CI_Uri
+	 */
+	protected $uri;
+
+	/**
+	 *
+	 * @var CI_Router
+	 */
+	protected $router;
+
+	/**
+	 *
+	 * @var CI_output
+	 */
+	protected $output;
+
+	/**
+	 *
+	 * @var CI_security
+	 */
+	protected $security;
+
+	/**
+	 *
+	 * @var CI_Input
+	 */
+	protected $input;
+
+
 	/**
 	 * List of class name mappings
 	 *
diff --git a/system/core/Router.php b/system/core/Router.php
index e0fb922f1a6..ca78f9604c4 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -112,6 +112,14 @@ class CI_Router {
 	 */
 	public $enable_query_strings = FALSE;
 
+	/**
+	 * CI_URI class object
+	 *
+	 * @var	object
+	 */
+	public $uri;
+
+
 	// --------------------------------------------------------------------
 
 	/**
diff --git a/system/core/URI.php b/system/core/URI.php
index 1e948588354..579d7df7a59 100644
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -83,6 +83,13 @@ class CI_URI {
 	 */
 	public $rsegments = array();
 
+	/**
+	 * Associative array of URI config
+	 *
+	 * @var	array
+	 */
+	public $config;
+
 	/**
 	 * Permitted URI chars
 	 *