diff --git a/src/main/java/minevalley/core/api/users/OnlineUser.java b/src/main/java/minevalley/core/api/users/OnlineUser.java
index f852f4b0..02a0e86d 100644
--- a/src/main/java/minevalley/core/api/users/OnlineUser.java
+++ b/src/main/java/minevalley/core/api/users/OnlineUser.java
@@ -9,6 +9,7 @@
 import minevalley.core.api.users.enums.Fraction;
 import minevalley.core.api.users.enums.McVersion;
 import minevalley.core.api.users.enums.TabListView;
+import minevalley.core.api.users.enums.TeamRank;
 import minevalley.core.api.users.exceptions.UserNotPermittedException;
 import minevalley.core.api.utils.ChatHandler;
 import minevalley.core.api.utils.ClickableMessage;
@@ -179,25 +180,33 @@ default void closeInventory() {
      */
     void leaveFractionService() throws IllegalStateException;
 
-    // TeamRank
+    /**
+     * Gets if the player has any type of team-rank.
+     *
+     * @return true, if the user is part of the server-team (and in team-service)
+     */
+    @Contract(pure = true)
+    boolean isTeamler();
+
+    /**
+     * Gets whether the user has any of the listed team-ranks.
+     *
+     * @param ranks list of team-ranks to be checked for
+     * @return true, if the user has one of the ranks
+     */
+    @Contract(pure = true)
+    boolean hasTeamRank(@Nonnull TeamRank... ranks);
 
     /**
      * Gets the team-member object of this user.
      *
      * @return team-member object
      * @throws UserNotPermittedException if the user is no team-member
+     * @see #isTeamler()
      */
     @Nonnull
     TeamMember team() throws UserNotPermittedException;
 
-    /**
-     * Gets if the player has any type of team-rank.
-     *
-     * @return true, if the user is part of the server-team (and in team-service)
-     */
-    @Contract(pure = true)
-    boolean isTeamler();
-
     /**
      * Lets the user enter the team-service. If the user isn't teamler, nothing happens.
      */
diff --git a/src/main/java/minevalley/core/api/users/TeamMember.java b/src/main/java/minevalley/core/api/users/TeamMember.java
index da109d79..c9ee50bc 100644
--- a/src/main/java/minevalley/core/api/users/TeamMember.java
+++ b/src/main/java/minevalley/core/api/users/TeamMember.java
@@ -47,15 +47,6 @@ public interface TeamMember extends OnlineUser {
     @Contract(pure = true)
     boolean isDisplayedAsTeamler();
 
-    /**
-     * Gets whether the user has any of the listed team-ranks.
-     *
-     * @param ranks list of team-ranks to be checked for
-     * @return true, if the user has one of the ranks
-     */
-    @Contract(pure = true)
-    boolean hasTeamRank(@Nonnull TeamRank... ranks);
-
     /**
      * Gets whether the user is allowed to use a general-key
      *