diff --git a/composer.json b/composer.json
index 54becd0f6..0276e03de 100644
--- a/composer.json
+++ b/composer.json
@@ -38,6 +38,7 @@
       "pocketmine/nbt": "dev-master",
       "pocketmine/math": "dev-master",
       "pocketmine/snooze": "^0.1.0",
+      "pocketmine/classloader": "dev-master",
       "daverandom/callback-validator": "dev-master",
       "adhocore/json-comment": "^0.0.7",
       "particle/validator": "^2.3"
@@ -80,6 +81,10 @@
       {
          "type": "vcs",
          "url": "https://github.com/pmmp/Log"
+      },
+      {
+         "type": "vcs",
+         "url": "https://github.com/pmmp/ClassLoader"
       }
    ]
 }
diff --git a/composer.lock b/composer.lock
index 5fc7a12f3..f2fb5efac 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0837e139f1183b1aee7c4294fe63a179",
+    "content-hash": "730b9ef97624239c1bd013478b5f64e8",
     "packages": [
         {
             "name": "adhocore/json-comment",
@@ -327,6 +327,41 @@
             },
             "time": "2019-10-21T14:41:23+00:00"
         },
+        {
+            "name": "pocketmine/classloader",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/ClassLoader.git",
+                "reference": "e7d1e7701374760752a23c093ba925f3a518d88d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/ClassLoader/zipball/e7d1e7701374760752a23c093ba925f3a518d88d",
+                "reference": "e7d1e7701374760752a23c093ba925f3a518d88d",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pthreads": "~3.2.0",
+                "ext-reflection": "*",
+                "php": ">=7.2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "./"
+                ]
+            },
+            "license": [
+                "LGPL-3.0"
+            ],
+            "description": "Ad-hoc autoloading components used by PocketMine-MP",
+            "support": {
+                "source": "https://github.com/pmmp/ClassLoader/tree/master",
+                "issues": "https://github.com/pmmp/ClassLoader/issues"
+            },
+            "time": "2019-10-28T12:24:55+00:00"
+        },
         {
             "name": "pocketmine/log",
             "version": "dev-master",
@@ -519,12 +554,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/SPL.git",
-                "reference": "e2f72340aefa1a5802a7096a720d3ecede9f8f4a"
+                "reference": "4a94ec60efd514ef98e84a064fe1a4b8ee73bbad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/SPL/zipball/e2f72340aefa1a5802a7096a720d3ecede9f8f4a",
-                "reference": "e2f72340aefa1a5802a7096a720d3ecede9f8f4a",
+                "url": "https://api.github.com/repos/pmmp/SPL/zipball/4a94ec60efd514ef98e84a064fe1a4b8ee73bbad",
+                "reference": "4a94ec60efd514ef98e84a064fe1a4b8ee73bbad",
                 "shasum": ""
             },
             "type": "library",
@@ -541,7 +576,7 @@
                 "source": "https://github.com/pmmp/SPL/tree/master",
                 "issues": "https://github.com/pmmp/SPL/issues"
             },
-            "time": "2019-10-24T18:37:23+00:00"
+            "time": "2019-10-28T12:26:23+00:00"
         }
     ],
     "packages-dev": [],
@@ -554,6 +589,7 @@
         "pocketmine/log": 20,
         "pocketmine/nbt": 20,
         "pocketmine/math": 20,
+        "pocketmine/classloader": 20,
         "daverandom/callback-validator": 20
     },
     "prefer-stable": false,