diff --git a/src/API/ServerAPI.php b/src/API/ServerAPI.php
index 809d7952c..577550d44 100644
--- a/src/API/ServerAPI.php
+++ b/src/API/ServerAPI.php
@@ -29,7 +29,11 @@ class ServerAPI{
 	private $asyncCnt = 0;
 	private $rcon;
 	private $query;
-	
+
+
+	/**
+	 * @return PocketMinecraftServer
+	 */
 	public static function request(){
 		return self::$serverRequest;
 	}
diff --git a/src/PocketMinecraftServer.php b/src/PocketMinecraftServer.php
index 1492381f9..c16e43874 100644
--- a/src/PocketMinecraftServer.php
+++ b/src/PocketMinecraftServer.php
@@ -21,8 +21,13 @@
 
 class PocketMinecraftServer{
 	public $tCnt;
-	public $serverID, $interface, $database, $version, $invisible, $api, $tickMeasure, $preparedSQL, $seed, $gamemode, $name, $maxClients, $clients, $eidCnt, $custom, $description, $motd, $port, $saveEnabled;
+	public $serverID, $interface, $database, $version, $invisible, $tickMeasure, $preparedSQL, $seed, $gamemode, $name, $maxClients, $clients, $eidCnt, $custom, $description, $motd, $port, $saveEnabled;
 	private $serverip, $evCnt, $handCnt, $events, $eventsID, $handlers, $serverType, $lastTick, $ticks, $memoryStats, $async = array(), $asyncID = 0;
+
+	/**
+	 * @var ServerAPI
+	 */
+	public $api;
 	
 	private function load(){
 		$this->version = new VersionString();