diff --git a/api/src/main/java/net/md_5/bungee/api/Server.java b/api/src/main/java/net/md_5/bungee/api/Server.java
index 83f2fee2..12476d0d 100644
--- a/api/src/main/java/net/md_5/bungee/api/Server.java
+++ b/api/src/main/java/net/md_5/bungee/api/Server.java
@@ -24,9 +24,7 @@ public abstract class Server implements Connection
     /**
      * Asynchronously gets the current player count on this server.
      *
-     * TODO: Return all info available via the standard query protocol
-     *
      * @param callback the callback to call when the count has been retrieved.
      */
-    public abstract void getPlayerCount(Callback<Integer> callback);
+    public abstract void getPlayerCount(Callback<ServerPing> callback);
 }
diff --git a/api/src/main/java/net/md_5/bungee/api/ServerPing.java b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
new file mode 100644
index 00000000..a12498a1
--- /dev/null
+++ b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
@@ -0,0 +1,18 @@
+package net.md_5.bungee.api;
+
+import lombok.Data;
+
+/**
+ * Represents the standard list data returned by opening a server in the
+ * Minecraft client server list, or hitting it with a packet 0xFE.
+ */
+@Data
+public class ServerPing
+{
+
+    private final byte protocolVersion;
+    private final String gameVersion;
+    private final String motd;
+    private final String currentPlayers;
+    private final String maxPlayers;
+}