diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java
index fd1d06e82..19d8c2515 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java
@@ -1,9 +1,7 @@
 package world.bentobox.bentobox.api.commands.island.team;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
@@ -16,17 +14,13 @@ import world.bentobox.bentobox.api.events.team.TeamEvent;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.panels.reader.PanelTemplateRecord.TemplateItem;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.Database;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.TeamInvite;
 import world.bentobox.bentobox.managers.RanksManager;
 
 public class IslandTeamCommand extends CompositeCommand {
 
-    /**
-     * Invited list. Key is the invited party, value is the invite.
-     * @since 1.8.0
-     */
-    private final Map<UUID, Invite> inviteMap;
-
     private IslandTeamKickCommand kickCommand;
 
     private IslandTeamLeaveCommand leaveCommand;
@@ -51,9 +45,11 @@ public class IslandTeamCommand extends CompositeCommand {
 
     private IslandTeamTrustCommand trustCommand;
 
+    private final Database<TeamInvite> handler;
+
     public IslandTeamCommand(CompositeCommand parent) {
         super(parent, "team");
-        inviteMap = new HashMap<>();
+        handler = new Database<>(parent.getAddon(), TeamInvite.class);
     }
 
     @Override
@@ -139,8 +135,8 @@ public class IslandTeamCommand extends CompositeCommand {
      * @param invitee - uuid of invitee
      * @since 1.8.0
      */
-    public void addInvite(Invite.Type type, @NonNull UUID inviter, @NonNull UUID invitee, @NonNull Island island) {
-        inviteMap.put(invitee, new Invite(type, inviter, invitee, island));
+    public void addInvite(TeamInvite.Type type, @NonNull UUID inviter, @NonNull UUID invitee, @NonNull Island island) {
+        handler.saveObjectAsync(new TeamInvite(type, inviter, invitee, island));
     }
 
     /**
@@ -150,7 +146,7 @@ public class IslandTeamCommand extends CompositeCommand {
      * @since 1.8.0
      */
     public boolean isInvited(@NonNull UUID invitee) {
-        return inviteMap.containsKey(invitee);
+        return handler.objectExists(invitee.toString());
     }
 
     /**
@@ -161,7 +157,7 @@ public class IslandTeamCommand extends CompositeCommand {
      */
     @Nullable
     public UUID getInviter(UUID invitee) {
-        return isInvited(invitee) ? inviteMap.get(invitee).getInviter() : null;
+        return isInvited(invitee) ? handler.loadObject(invitee.toString()).getInviter() : null;
     }
 
     /**
@@ -171,8 +167,8 @@ public class IslandTeamCommand extends CompositeCommand {
      * @since 1.8.0
      */
     @Nullable
-    public Invite getInvite(UUID invitee) {
-        return inviteMap.get(invitee);
+    public TeamInvite getInvite(UUID invitee) {
+        return handler.loadObject(invitee.toString());
     }
 
     /**
@@ -181,7 +177,7 @@ public class IslandTeamCommand extends CompositeCommand {
      * @since 1.8.0
      */
     public void removeInvite(@NonNull UUID invitee) {
-        inviteMap.remove(invitee);
+        handler.deleteID(invitee.toString());
     }
 
     /**
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java
index 246c38b21..45b84f904 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java
@@ -8,10 +8,10 @@ import java.util.UUID;
 import org.eclipse.jdt.annotation.Nullable;
 
 import world.bentobox.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bentobox.api.commands.island.team.Invite.Type;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.TeamInvite.Type;
 import world.bentobox.bentobox.managers.RanksManager;
 import world.bentobox.bentobox.util.Util;
 
@@ -99,7 +99,7 @@ public class IslandTeamCoopCommand extends CompositeCommand {
                 // Put the invited player (key) onto the list with inviter (value)
                 // If someone else has invited a player, then this invite will overwrite the
                 // previous invite!
-                itc.addInvite(Invite.Type.COOP, user.getUniqueId(), target.getUniqueId(), island);
+                itc.addInvite(Type.COOP, user.getUniqueId(), target.getUniqueId(), island);
                 user.sendMessage("commands.island.team.invite.invitation-sent", TextVariables.NAME, target.getName());
                 // Send message to online player
                 target.sendMessage("commands.island.team.coop.name-has-invited-you", TextVariables.NAME,
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamGUI.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamGUI.java
index 598e940a9..602fa2881 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamGUI.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamGUI.java
@@ -22,7 +22,6 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 
 import world.bentobox.bentobox.BentoBox;
-import world.bentobox.bentobox.api.commands.island.team.Invite.Type;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.panels.Panel;
 import world.bentobox.bentobox.api.panels.PanelItem;
@@ -34,6 +33,8 @@ import world.bentobox.bentobox.api.panels.reader.ItemTemplateRecord.ActionRecord
 import world.bentobox.bentobox.api.panels.reader.PanelTemplateRecord.TemplateItem;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.TeamInvite;
+import world.bentobox.bentobox.database.objects.TeamInvite.Type;
 import world.bentobox.bentobox.managers.RanksManager;
 import world.bentobox.bentobox.util.Util;
 
@@ -208,7 +209,7 @@ public class IslandTeamGUI {
     private PanelItem createInvitedButton(ItemTemplateRecord template, TemplatedPanel.ItemSlot slot) {
         PanelItemBuilder builder = new PanelItemBuilder();
         if (parent.isInvited(user.getUniqueId()) && user.hasPermission(parent.getAcceptCommand().getPermission())) {
-            Invite invite = parent.getInvite(user.getUniqueId());
+            TeamInvite invite = parent.getInvite(user.getUniqueId());
             if (invite == null) {
                 return this.getBlankBorder();
             }
@@ -224,7 +225,8 @@ public class IslandTeamGUI {
         return builder.build();
     }
 
-    private void createInviteClickHandler(PanelItemBuilder builder, Invite invite, @NonNull List<ActionRecords> list) {
+    private void createInviteClickHandler(PanelItemBuilder builder, TeamInvite invite,
+            @NonNull List<ActionRecords> list) {
         Type type = invite.getType();
         builder.clickHandler((panel, user, clickType, clickSlot) -> {
             if (list.stream().noneMatch(ar -> clickType.equals(ar.clickType()))) {
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java
index 88c91c162..25cceac63 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java
@@ -5,13 +5,14 @@ import java.util.UUID;
 
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.ConfirmableCommand;
-import world.bentobox.bentobox.api.commands.island.team.Invite.Type;
 import world.bentobox.bentobox.api.events.IslandBaseEvent;
 import world.bentobox.bentobox.api.events.island.IslandEvent;
 import world.bentobox.bentobox.api.events.team.TeamEvent;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.TeamInvite;
+import world.bentobox.bentobox.database.objects.TeamInvite.Type;
 import world.bentobox.bentobox.managers.RanksManager;
 import world.bentobox.bentobox.util.Util;
 
@@ -49,7 +50,7 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand {
             user.sendMessage(INVALID_INVITE);
             return false;
         }
-        Invite invite = itc.getInvite(playerUUID);
+        TeamInvite invite = itc.getInvite(playerUUID);
         if (invite.getType().equals(Type.TEAM)) {
             // Check rank to of inviter
             Island island = getIslands().getIsland(getWorld(), prospectiveOwnerUUID);
@@ -78,7 +79,7 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand {
     @Override
     public boolean execute(User user, String label, List<String> args) {
         // Get the invite
-        Invite invite = itc.getInvite(user.getUniqueId());
+        TeamInvite invite = itc.getInvite(user.getUniqueId());
         switch (invite.getType()) {
         case COOP -> askConfirmation(user, () -> acceptCoopInvite(user, invite));
         case TRUST -> askConfirmation(user, () -> acceptTrustInvite(user, invite));
@@ -94,7 +95,7 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand {
         return true;
     }
 
-    void acceptTrustInvite(User user, Invite invite) {
+    void acceptTrustInvite(User user, TeamInvite invite) {
         // Remove the invite
         itc.removeInvite(user.getUniqueId());
         User inviter = User.getInstance(invite.getInviter());
@@ -120,7 +121,7 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand {
         }
     }
 
-    void acceptCoopInvite(User user, Invite invite) {
+    void acceptCoopInvite(User user, TeamInvite invite) {
         // Remove the invite
         itc.removeInvite(user.getUniqueId());
         User inviter = User.getInstance(invite.getInviter());
@@ -146,7 +147,7 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand {
         }
     }
 
-    void acceptTeamInvite(User user, Invite invite) {
+    void acceptTeamInvite(User user, TeamInvite invite) {
         // Remove the invite
         itc.removeInvite(user.getUniqueId());
         // Get the player's island - may be null if the player has no island
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java
index 77a37dd30..82d2bf4dd 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java
@@ -10,13 +10,13 @@ import java.util.UUID;
 import org.eclipse.jdt.annotation.Nullable;
 
 import world.bentobox.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bentobox.api.commands.island.team.Invite.Type;
 import world.bentobox.bentobox.api.events.IslandBaseEvent;
 import world.bentobox.bentobox.api.events.team.TeamEvent;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.panels.reader.PanelTemplateRecord.TemplateItem;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.TeamInvite.Type;
 import world.bentobox.bentobox.managers.IslandsManager;
 import world.bentobox.bentobox.managers.PlayersManager;
 import world.bentobox.bentobox.managers.RanksManager;
@@ -166,7 +166,7 @@ public class IslandTeamInviteCommand extends CompositeCommand {
         }
         // Put the invited player (key) onto the list with inviter (value)
         // If someone else has invited a player, then this invite will overwrite the previous invite!
-        itc.addInvite(Invite.Type.TEAM, user.getUniqueId(), invitedPlayer.getUniqueId(), island);
+        itc.addInvite(Type.TEAM, user.getUniqueId(), invitedPlayer.getUniqueId(), island);
         user.sendMessage("commands.island.team.invite.invitation-sent", TextVariables.NAME, invitedPlayer.getName(), TextVariables.DISPLAY_NAME, invitedPlayer.getDisplayName());
         // Send message to online player
         invitedPlayer.sendMessage("commands.island.team.invite.name-has-invited-you", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName());
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java
index 8d57871df..38c0349f7 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java
@@ -8,10 +8,10 @@ import java.util.UUID;
 import org.eclipse.jdt.annotation.Nullable;
 
 import world.bentobox.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bentobox.api.commands.island.team.Invite.Type;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.TeamInvite.Type;
 import world.bentobox.bentobox.managers.RanksManager;
 import world.bentobox.bentobox.util.Util;
 
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/Invite.java b/src/main/java/world/bentobox/bentobox/database/objects/TeamInvite.java
similarity index 56%
rename from src/main/java/world/bentobox/bentobox/api/commands/island/team/Invite.java
rename to src/main/java/world/bentobox/bentobox/database/objects/TeamInvite.java
index c6328d066..72d5b960a 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/Invite.java
+++ b/src/main/java/world/bentobox/bentobox/database/objects/TeamInvite.java
@@ -1,17 +1,16 @@
-package world.bentobox.bentobox.api.commands.island.team;
+package world.bentobox.bentobox.database.objects;
 
 import java.util.Objects;
 import java.util.UUID;
 
-import world.bentobox.bentobox.database.objects.Island;
+import com.google.gson.annotations.Expose;
 
 /**
- * Represents an invite
- * @author tastybento
- * @since 1.8.0
+ * Data object for team invites
  */
-public class Invite {
-
+@Table(name = "TeamInvites")
+public class TeamInvite implements DataObject {
+    
     /**
      * Type of invitation
      *
@@ -22,24 +21,40 @@ public class Invite {
         TRUST
     }
 
-    private final Type type;
-    private final UUID inviter;
-    private final UUID invitee;
-    private final Island island;
-
+    @Expose
+    private Type type;
+    @Expose
+    private UUID inviter;
+    @Expose
+    private Island island;
+    
+    @Expose
+    private String uniqueId;
+    
     /**
      * @param type - invitation type, e.g., coop, team, trust
      * @param inviter - UUID of inviter
      * @param invitee - UUID of invitee
      * @param island - the island this invite is for
      */
-    public Invite(Type type, UUID inviter, UUID invitee, Island island) {
+    public TeamInvite(Type type, UUID inviter, UUID invitee, Island island) {
         this.type = type;
+        this.uniqueId = invitee.toString();
         this.inviter = inviter;
-        this.invitee = invitee;
         this.island = island;
     }
 
+    @Override
+    public String getUniqueId() {
+        // Inviter
+        return this.uniqueId;
+    }
+
+    @Override
+    public void setUniqueId(String uniqueId) {
+        this.uniqueId = uniqueId;
+    }
+
     /**
      * @return the type
      */
@@ -47,6 +62,13 @@ public class Invite {
         return type;
     }
 
+    /**
+     * @return the invitee
+     */
+    public UUID getInvitee() {
+        return UUID.fromString(uniqueId);
+    }
+
     /**
      * @return the inviter
      */
@@ -54,13 +76,6 @@ public class Invite {
         return inviter;
     }
 
-    /**
-     * @return the invitee
-     */
-    public UUID getInvitee() {
-        return invitee;
-    }
-
     /**
      * @return the island
      */
@@ -73,7 +88,7 @@ public class Invite {
      */
     @Override
     public int hashCode() {
-        return Objects.hash(invitee, inviter, type);
+        return Objects.hash(inviter, uniqueId, type);
     }
 
     /* (non-Javadoc)
@@ -87,9 +102,10 @@ public class Invite {
         if (obj == null) {
             return false;
         }
-        if (!(obj instanceof Invite other)) {
+        if (!(obj instanceof TeamInvite other)) {
             return false;
         }
-        return Objects.equals(invitee, other.invitee) && Objects.equals(inviter, other.inviter) && type == other.type;
+        return Objects.equals(inviter, other.inviter) && Objects.equals(uniqueId, other.getUniqueId())
+                && type == other.type;
     }
 }
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommandTest.java
index b0f360d80..09d21b8ac 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommandTest.java
@@ -30,9 +30,10 @@ import com.google.common.collect.ImmutableSet;
 
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bentobox.api.commands.island.team.Invite.Type;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.TeamInvite;
+import world.bentobox.bentobox.database.objects.TeamInvite.Type;
 import world.bentobox.bentobox.managers.CommandsManager;
 import world.bentobox.bentobox.managers.IslandWorldManager;
 import world.bentobox.bentobox.managers.IslandsManager;
@@ -174,7 +175,7 @@ public class IslandTeamCommandTest extends RanksManagerBeforeClassTest {
      */
     @Test
     public void testAddInvite() {
-        tc.addInvite(Invite.Type.TEAM, uuid, invitee, island);
+        tc.addInvite(Type.TEAM, uuid, invitee, island);
         assertTrue(tc.isInvited(invitee));
     }
 
@@ -193,7 +194,7 @@ public class IslandTeamCommandTest extends RanksManagerBeforeClassTest {
      */
     @Test
     public void testGetInviter() {
-        tc.addInvite(Invite.Type.TEAM, uuid, invitee, island);
+        tc.addInvite(Type.TEAM, uuid, invitee, island);
         assertEquals(uuid, tc.getInviter(invitee));
     }
 
@@ -213,9 +214,9 @@ public class IslandTeamCommandTest extends RanksManagerBeforeClassTest {
     @Test
     public void testGetInvite() {
         assertNull(tc.getInvite(invitee));
-        tc.addInvite(Invite.Type.TEAM, uuid, invitee, island);
+        tc.addInvite(Type.TEAM, uuid, invitee, island);
         @Nullable
-        Invite invite = tc.getInvite(invitee);
+        TeamInvite invite = tc.getInvite(invitee);
         assertEquals(invitee, invite.getInvitee());
         assertEquals(Type.TEAM, invite.getType());
         assertEquals(uuid, invite.getInviter());
@@ -228,7 +229,7 @@ public class IslandTeamCommandTest extends RanksManagerBeforeClassTest {
     @Test
     public void testRemoveInvite() {
         assertNull(tc.getInvite(invitee));
-        tc.addInvite(Invite.Type.TEAM, uuid, invitee, island);
+        tc.addInvite(Type.TEAM, uuid, invitee, island);
         tc.removeInvite(invitee);
         assertNull(tc.getInvite(invitee));
     }
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommandTest.java
index ca056a9ac..a10376f10 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommandTest.java
@@ -32,12 +32,13 @@ import org.powermock.reflect.Whitebox;
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.Settings;
 import world.bentobox.bentobox.TestWorldSettings;
-import world.bentobox.bentobox.api.commands.island.team.Invite.Type;
 import world.bentobox.bentobox.api.events.IslandBaseEvent;
 import world.bentobox.bentobox.api.events.team.TeamEvent;
 import world.bentobox.bentobox.api.events.team.TeamEvent.TeamEventBuilder;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.TeamInvite;
+import world.bentobox.bentobox.database.objects.TeamInvite.Type;
 import world.bentobox.bentobox.managers.CommandsManager;
 import world.bentobox.bentobox.managers.IslandWorldManager;
 import world.bentobox.bentobox.managers.IslandsManager;
@@ -72,7 +73,7 @@ public class IslandTeamInviteAcceptCommandTest {
     @Mock
     private PluginManager pim;
     @Mock
-    private Invite invite;
+    private TeamInvite invite;
 
     /**
      */
@@ -148,7 +149,7 @@ public class IslandTeamInviteAcceptCommandTest {
         when(plugin.getIWM()).thenReturn(iwm);
 
         // Invite
-        when(invite.getType()).thenReturn(Invite.Type.TEAM);
+        when(invite.getType()).thenReturn(Type.TEAM);
 
         // Team invite accept command
         c = new IslandTeamInviteAcceptCommand(itc);
@@ -281,7 +282,7 @@ public class IslandTeamInviteAcceptCommandTest {
         when(itc.isInvited(any())).thenReturn(true);
         when(itc.getInviter(any())).thenReturn(notUUID);
         when(itc.getInvite(any())).thenReturn(invite);
-        when(invite.getType()).thenReturn(Invite.Type.COOP);
+        when(invite.getType()).thenReturn(Type.COOP);
         when(im.inTeam(any(), any())).thenReturn(false);
         assertTrue(c.canExecute(user, "accept", Collections.emptyList()));
         verify(user, never()).sendMessage("commands.island.team.invite.errors.you-already-are-in-team");
@@ -332,7 +333,7 @@ public class IslandTeamInviteAcceptCommandTest {
     @Test
     public void testExecuteUserStringListOfStringCoop() {
         // Coop
-        when(invite.getType()).thenReturn(Invite.Type.COOP);
+        when(invite.getType()).thenReturn(Type.COOP);
         assertTrue(c.execute(user, "accept", Collections.emptyList()));
         verify(user).sendMessage("commands.confirmation.confirm", "[seconds]", "0");
     }
@@ -343,7 +344,7 @@ public class IslandTeamInviteAcceptCommandTest {
     @Test
     public void testExecuteUserStringListOfStringTrust() {
         // Trust
-        when(invite.getType()).thenReturn(Invite.Type.TRUST);
+        when(invite.getType()).thenReturn(Type.TRUST);
         assertTrue(c.execute(user, "accept", Collections.emptyList()));
         verify(user).sendMessage("commands.confirmation.confirm", "[seconds]", "0");
     }
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommandTest.java
index 3a50c1445..cf8c263b6 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommandTest.java
@@ -40,12 +40,13 @@ import com.google.common.collect.ImmutableSet;
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.Settings;
 import world.bentobox.bentobox.TestWorldSettings;
-import world.bentobox.bentobox.api.commands.island.team.Invite.Type;
 import world.bentobox.bentobox.api.configuration.WorldSettings;
 import world.bentobox.bentobox.api.events.IslandBaseEvent;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.TeamInvite;
+import world.bentobox.bentobox.database.objects.TeamInvite.Type;
 import world.bentobox.bentobox.managers.CommandsManager;
 import world.bentobox.bentobox.managers.IslandWorldManager;
 import world.bentobox.bentobox.managers.IslandsManager;
@@ -319,7 +320,7 @@ public class IslandTeamInviteCommandTest extends RanksManagerBeforeClassTest {
         assertTrue(itl.execute(user, itl.getLabel(), List.of("target")));
         verify(pim).callEvent(any(IslandBaseEvent.class));
         verify(user, never()).sendMessage(eq("commands.island.team.invite.removing-invite"));
-        verify(ic).addInvite(Invite.Type.TEAM, uuid, notUUID, island);
+        verify(ic).addInvite(Type.TEAM, uuid, notUUID, island);
         verify(user).sendMessage("commands.island.team.invite.invitation-sent", TextVariables.NAME, "target", TextVariables.DISPLAY_NAME, "&Ctarget");
         verify(target).sendMessage("commands.island.team.invite.name-has-invited-you", TextVariables.NAME, "tastybento", TextVariables.DISPLAY_NAME, "&Ctastbento");
         verify(target).sendMessage("commands.island.team.invite.to-accept-or-reject", TextVariables.LABEL, "island");
@@ -338,7 +339,7 @@ public class IslandTeamInviteCommandTest extends RanksManagerBeforeClassTest {
         assertTrue(itl.execute(user, itl.getLabel(), List.of("target")));
         verify(pim).callEvent(any(IslandBaseEvent.class));
         verify(user, never()).sendMessage("commands.island.team.invite.removing-invite");
-        verify(ic).addInvite(Invite.Type.TEAM, uuid, notUUID, island);
+        verify(ic).addInvite(Type.TEAM, uuid, notUUID, island);
         verify(user).sendMessage("commands.island.team.invite.invitation-sent", TextVariables.NAME, "target",
                 TextVariables.DISPLAY_NAME, "&Ctarget");
         verify(target).sendMessage("commands.island.team.invite.name-has-invited-you", TextVariables.NAME, "tastybento",
@@ -359,7 +360,7 @@ public class IslandTeamInviteCommandTest extends RanksManagerBeforeClassTest {
         when(ic.isInvited(notUUID)).thenReturn(true);
         // Set up invite
         when(ic.getInviter(notUUID)).thenReturn(uuid);
-        Invite invite = mock(Invite.class);
+        TeamInvite invite = mock(TeamInvite.class);
         when(invite.getType()).thenReturn(Type.TEAM);
         when(ic.getInvite(notUUID)).thenReturn(invite);
         assertTrue(itl.execute(user, itl.getLabel(), List.of("target")));