diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php
index 439794cb6..4fc5345d0 100644
--- a/src/pocketmine/PocketMine.php
+++ b/src/pocketmine/PocketMine.php
@@ -104,7 +104,6 @@ namespace pocketmine {
 	}
 
 	if(!class_exists("ClassLoader", false)){
-		require_once(\pocketmine\PATH . "src/spl/ThreadedFactory.php");
 		require_once(\pocketmine\PATH . "src/spl/ClassLoader.php");
 		require_once(\pocketmine\PATH . "src/spl/BaseClassLoader.php");
 		require_once(\pocketmine\PATH . "src/pocketmine/CompatibleClassLoader.php");
diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php
index 40f4b7405..ca6a5f8c2 100644
--- a/src/pocketmine/Server.php
+++ b/src/pocketmine/Server.php
@@ -1400,7 +1400,7 @@ class Server{
 	 */
 	public function __construct(\ClassLoader $autoloader, \ThreadedLogger $logger, $filePath, $dataPath, $pluginPath){
 		self::$instance = $this;
-		self::$sleeper = \ThreadedFactory::create();
+		self::$sleeper = new \Threaded;
 		$this->autoloader = $autoloader;
 		$this->logger = $logger;
 
diff --git a/src/pocketmine/ThreadManager.php b/src/pocketmine/ThreadManager.php
index 27851a098..b79a78c7d 100644
--- a/src/pocketmine/ThreadManager.php
+++ b/src/pocketmine/ThreadManager.php
@@ -42,7 +42,7 @@ class ThreadManager extends \Volatile{
 	 */
 	public function add($thread){
 		if($thread instanceof Thread or $thread instanceof Worker){
-			$this->{spl_object_hash($thread)} = $thread;
+			$this->{$thread->getThreadId()} = $thread;
 		}
 	}
 
@@ -51,7 +51,7 @@ class ThreadManager extends \Volatile{
 	 */
 	public function remove($thread){
 		if($thread instanceof Thread or $thread instanceof Worker){
-			unset($this->{spl_object_hash($thread)});
+			unset($this->{$thread->getThreadId()});
 		}
 	}
 
diff --git a/src/pocketmine/command/CommandReader.php b/src/pocketmine/command/CommandReader.php
index c44b89c73..f02583a42 100644
--- a/src/pocketmine/command/CommandReader.php
+++ b/src/pocketmine/command/CommandReader.php
@@ -30,7 +30,7 @@ class CommandReader extends Thread{
 	private $shutdown = false;
 
 	public function __construct(){
-		$this->buffer = \ThreadedFactory::create();
+		$this->buffer = new \Threaded;
 		$this->start();
 	}
 
diff --git a/src/pocketmine/utils/MainLogger.php b/src/pocketmine/utils/MainLogger.php
index f40349544..65f02874e 100644
--- a/src/pocketmine/utils/MainLogger.php
+++ b/src/pocketmine/utils/MainLogger.php
@@ -48,7 +48,7 @@ class MainLogger extends \AttachableThreadedLogger{
 		touch($logFile);
 		$this->logFile = $logFile;
 		$this->logDebug = (bool) $logDebug;
-		$this->logStream = \ThreadedFactory::create();
+		$this->logStream = new \Threaded;
 		$this->start();
 	}
 
diff --git a/src/raklib b/src/raklib
index 08f0a0c1c..f6f207b9e 160000
--- a/src/raklib
+++ b/src/raklib
@@ -1 +1 @@
-Subproject commit 08f0a0c1c49c8c00c6dd569c6c1d9768a699ea9a
+Subproject commit f6f207b9e47dc6fdb23b9e39dfcbabb545be9cd0
diff --git a/src/spl b/src/spl
index 612661afd..82034afea 160000
--- a/src/spl
+++ b/src/spl
@@ -1 +1 @@
-Subproject commit 612661afd49420743baec096b129f0c0f9df4023
+Subproject commit 82034afea351b0dbf8b1f9ad41cde9b9de3e1da6