diff --git a/.idea/php.xml b/.idea/php.xml
index 479ccac..8188805 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -6,11 +6,13 @@
       <path value="//wsl$/Ubuntu-20.04/usr/share/php" />
       <path value="//wsl$/Ubuntu-20.04/etc/ppm/includes" />
       <path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.tdlib==1.0.1.3" />
-      <path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.telegram_client_manager==2.0.0.6" />
       <path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.background_worker==1.0.2.6" />
       <path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.msqg==1.0.0.2" />
       <path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.verbose_adventure==1.0.0.4" />
       <path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.acm2==1.0.0.2" />
+      <path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.pop==1.0.0.2" />
+      <path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.synical==1.0.0.0" />
+      <path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.telegram_client_manager==2.0.1.0" />
     </include_path>
   </component>
   <component name="PhpInterpreters">
@@ -88,7 +90,7 @@
       </interpreter>
     </phpInfoCache>
   </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="7.1">
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.0">
     <option name="suggestChangeDefaultLanguageLevel" value="false" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 4fcc687..92a00ba 100644
--- a/Makefile
+++ b/Makefile
@@ -13,12 +13,12 @@ build:
 
 install:
 	# Installs the compiled package to the system
-	ppm --fix-conflict --no-prompt --install="build/net.intellivoid.synical_bot.ppm" --branch="production"
+	ppm --fix-conflict --no-prompt --install="build/net.intellivoid.synical_bot.ppm" --branch="master"
 
 install_fast:
 	# Installs the compiled package to the system
-	ppm --fix-conflict --no-prompt --skip-dependencies --install="build/net.intellivoid.synical_bot.ppm" --branch="production"
+	ppm --fix-conflict --no-prompt --skip-dependencies --install="build/net.intellivoid.synical_bot.ppm" --branch="master"
 
 run:
 	# Runs the bot
-	ppm --main="net.intellivoid.synical_bot" --version="latest"
\ No newline at end of file
+	ppm --main="net.intellivoid.synical_bot" --version="latest"
diff --git a/botsrc/AdminCommands/BanCommand.php b/botsrc/AdminCommands/BanCommand.php
index 56a93d0..dcde296 100644
--- a/botsrc/AdminCommands/BanCommand.php
+++ b/botsrc/AdminCommands/BanCommand.php
@@ -82,7 +82,7 @@
                 return Request::emptyResponse();
             }
 
-            $CallerPermissions = $ChatMemberCache->getAdministratorUser($this->getMessage()->getFrom()->getId());
+            $CallerPermissions = $ChatMemberCache->getAdministratorUser($this->getMessage()->getFrom());
             if($CallerPermissions == null || $CallerPermissions->CanRestrictMembers == false)
             {
                 return Request::sendMessage([
diff --git a/botsrc/AdminCommands/KickCommand.php b/botsrc/AdminCommands/KickCommand.php
index 7624332..6a592fd 100644
--- a/botsrc/AdminCommands/KickCommand.php
+++ b/botsrc/AdminCommands/KickCommand.php
@@ -82,7 +82,7 @@
                 return Request::emptyResponse();
             }
 
-            $CallerPermissions = $ChatMemberCache->getAdministratorUser($this->getMessage()->getFrom()->getId());
+            $CallerPermissions = $ChatMemberCache->getAdministratorUser($this->getMessage()->getFrom());
             if($CallerPermissions == null || $CallerPermissions->CanRestrictMembers == false)
             {
                 return Request::sendMessage([
@@ -117,7 +117,7 @@
                 ]);
             }
 
-            $TargetPermissions = $ChatMemberCache->getAdministratorUser($TargetUser->User->ID);
+            $TargetPermissions = $ChatMemberCache->getAdministratorUser($TargetUser->User);
             if($TargetPermissions !== null)
             {
                 if($TargetPermissions->IsOwner)
diff --git a/botsrc/AdminCommands/UnbanCommand.php b/botsrc/AdminCommands/UnbanCommand.php
index dc83995..d834c13 100644
--- a/botsrc/AdminCommands/UnbanCommand.php
+++ b/botsrc/AdminCommands/UnbanCommand.php
@@ -82,7 +82,7 @@
                 return Request::emptyResponse();
             }
 
-            $CallerPermissions = $ChatMemberCache->getAdministratorUser($this->getMessage()->getFrom()->getId());
+            $CallerPermissions = $ChatMemberCache->getAdministratorUser($this->getMessage()->getFrom());
             if($CallerPermissions == null || $CallerPermissions->CanRestrictMembers == false)
             {
                 return Request::sendMessage([
diff --git a/botsrc/package.json b/botsrc/package.json
index 7f3b4ae..0ce5ffd 100644
--- a/botsrc/package.json
+++ b/botsrc/package.json
@@ -89,7 +89,11 @@
     "components": [
         {
             "required": true,
-            "file": "SynicalBot.php"
+            "file": "AdminCommands/AdminCacheCommand.php"
+        },
+        {
+            "required": true,
+            "file": "AdminCommands/BanCommand.php"
         },
         {
             "required": true,
@@ -101,15 +105,11 @@
         },
         {
             "required": true,
-            "file": "AdminCommands/BanCommand.php"
+            "file": "commands/InfoCommand.php"
         },
         {
             "required": true,
-            "file": "AdminCommands/AdminCacheCommand.php"
-        },
-        {
-            "required": true,
-            "file": "SynicalBot/Utilities.php"
+            "file": "commands/StartCommand.php"
         },
         {
             "required": true,
@@ -117,17 +117,17 @@
         },
         {
             "required": true,
-            "file": "commands/InfoCommand.php"
+            "file": "SynicalBot/Utilities.php"
         },
         {
             "required": true,
-            "file": "commands/StartCommand.php"
+            "file": "SynicalBot.php"
         }
     ],
     "files": [
-        "package.json",
-        "worker",
         ".htaccess",
-        "main"
+        "main",
+        "package.json",
+        "worker"
     ]
 }
\ No newline at end of file