diff --git a/core/Config.php b/core/Config.php
index e1db5f441..6bc413be3 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -118,7 +118,7 @@ class Config {
 	 * @return Config
 	 */
 	static public function inst() {
-		if (!self::$instance) self::$instance = singleton('Config');
+		if (!self::$instance) self::$instance = new Config();
 		return self::$instance;
 	}
 
diff --git a/core/Core.php b/core/Core.php
index 1359ffffd..a1fcfe949 100644
--- a/core/Core.php
+++ b/core/Core.php
@@ -367,7 +367,7 @@ function singleton($className) {
 	if(!is_string($className)) user_error("singleton() passed bad class_name: " . var_export($className,true), E_USER_ERROR);
 	if(!isset($_SINGLETONS[$className])) {
 		if(!class_exists($className)) user_error("Bad class to singleton() - $className", E_USER_ERROR);
-		$_SINGLETONS[$className] = Object::strong_create($className,null, true);
+		$_SINGLETONS[$className] = Injector::inst()->get($className);
 		if(!$_SINGLETONS[$className]) user_error("singleton() Unknown class '$className'", E_USER_ERROR);
 	}
 	return $_SINGLETONS[$className];
diff --git a/core/Object.php b/core/Object.php
index 1fb1c60a2..3d710a456 100755
--- a/core/Object.php
+++ b/core/Object.php
@@ -235,8 +235,7 @@ abstract class Object {
 			$class = self::$strong_classes[$class];
 		}
 		
-		$reflector = new ReflectionClass($class);
-		return $reflector->newInstanceArgs($args);
+		return Injector::inst()->createWithArgs($class, $args);
 	}
 	
 	/**
diff --git a/model/Versioned.php b/model/Versioned.php
index c2f5837b1..3ab719171 100644
--- a/model/Versioned.php
+++ b/model/Versioned.php
@@ -92,7 +92,7 @@ class Versioned extends DataExtension {
 	 * The first stage is consiedered the 'default' stage, the last stage is
 	 * considered the 'live' stage.
 	 */
-	function __construct($stages) {
+	function __construct($stages=array('Stage','Live')) {
 		parent::__construct();
 
 		if(!is_array($stages)) {