diff --git a/src/main/java/com/flemmli97/flan/claim/Claim.java b/src/main/java/com/flemmli97/flan/claim/Claim.java
index 2299093..345010f 100644
--- a/src/main/java/com/flemmli97/flan/claim/Claim.java
+++ b/src/main/java/com/flemmli97/flan/claim/Claim.java
@@ -6,6 +6,7 @@ import com.flemmli97.flan.api.PermissionRegistry;
 import com.flemmli97.flan.config.ConfigHandler;
 import com.flemmli97.flan.player.PlayerClaimData;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -578,7 +579,7 @@ public class Claim implements IPermissionContainer {
             for (Map.Entry<UUID, String> e : this.playersGroups.entrySet()) {
                 GameProfile pgroup = player.getServer().getUserCache().getByUuid(e.getKey());
                 if (prof != null) {
-                    nameToGroup.merge(e.getValue(), new ArrayList<>(pgroup.getName()), (old, val) -> {
+                    nameToGroup.merge(e.getValue(), Lists.newArrayList(pgroup.getName()), (old, val) -> {
                         old.add(pgroup.getName());
                         return old;
                     });
diff --git a/src/main/java/com/flemmli97/flan/claim/ClaimStorage.java b/src/main/java/com/flemmli97/flan/claim/ClaimStorage.java
index 60cb685..524797a 100644
--- a/src/main/java/com/flemmli97/flan/claim/ClaimStorage.java
+++ b/src/main/java/com/flemmli97/flan/claim/ClaimStorage.java
@@ -9,6 +9,8 @@ import com.flemmli97.flan.player.EnumDisplayType;
 import com.flemmli97.flan.player.EnumEditMode;
 import com.flemmli97.flan.player.PlayerClaimData;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import it.unimi.dsi.fastutil.longs.Long2ObjectArrayMap;
@@ -199,13 +201,13 @@ public class ClaimStorage {
         int[] pos = getChunkPos(claim);
         for (int x = pos[0]; x <= pos[1]; x++)
             for (int z = pos[2]; z <= pos[3]; z++) {
-                this.claims.merge(ChunkPos.toLong(x, z), new ArrayList<>(claim), (old, val) -> {
+                this.claims.merge(ChunkPos.toLong(x, z), Lists.newArrayList(claim), (old, val) -> {
                     old.add(claim);
                     return old;
                 });
             }
         this.claimUUIDMap.put(claim.getClaimID(), claim);
-        this.playerClaimMap.merge(claim.getOwner(), new HashSet<>((claim), (old, val) -> {
+        this.playerClaimMap.merge(claim.getOwner(), Sets.newHashSet(claim), (old, val) -> {
             old.add(claim);
             return old;
         });
@@ -220,7 +222,7 @@ public class ClaimStorage {
         });
         this.dirty.add(claim.getOwner());
         claim.transferOwner(newOwner);
-        this.playerClaimMap.merge(claim.getOwner(), new HashSet<>((claim), (old, val) -> {
+        this.playerClaimMap.merge(claim.getOwner(), Sets.newHashSet(claim), (old, val) -> {
             old.add(claim);
             return old;
         });
@@ -363,7 +365,7 @@ public class ClaimStorage {
                     Map<String, Object> values = yml.load(reader);
                     if (!values.get("Parent Claim ID").equals(-1)) {
                         subClaimMap.merge(intFileMap.get(Integer.valueOf(values.get("Parent Claim ID").toString()))
-                                , new ArrayList<>(f), (key, val) -> {
+                                , Lists.newArrayList(f), (key, val) -> {
                                     key.add(f);
                                     return key;
                                 });
@@ -403,7 +405,7 @@ public class ClaimStorage {
     }
 
     private static Set<ClaimPermission> complementOf(ClaimPermission... perms) {
-        Set<ClaimPermission> set = new HashSet<>((PermissionRegistry.getPerms());
+        Set<ClaimPermission> set = Sets.newHashSet(PermissionRegistry.getPerms());
         for (ClaimPermission perm : perms)
             set.remove(perm);
         return set;
diff --git a/src/main/java/com/flemmli97/flan/event/ItemInteractEvents.java b/src/main/java/com/flemmli97/flan/event/ItemInteractEvents.java
index c5d6d97..a17d59d 100644
--- a/src/main/java/com/flemmli97/flan/event/ItemInteractEvents.java
+++ b/src/main/java/com/flemmli97/flan/event/ItemInteractEvents.java
@@ -12,6 +12,7 @@ import com.flemmli97.flan.config.ConfigHandler;
 import com.flemmli97.flan.player.EnumDisplayType;
 import com.flemmli97.flan.player.EnumEditMode;
 import com.flemmli97.flan.player.PlayerClaimData;
+import com.google.common.collect.Sets;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.player.PlayerEntity;
@@ -35,7 +36,6 @@ import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import java.util.HashSet;
 import java.util.Set;
 
 public class ItemInteractEvents {
@@ -73,7 +73,7 @@ public class ItemInteractEvents {
         return TypedActionResult.pass(stack);
     }
 
-    private static final Set<Item> blackListedItems = new HashSet<>((Items.COMPASS, Items.FILLED_MAP, Items.FIREWORK_ROCKET);
+    private static final Set<Item> blackListedItems = Sets.newHashSet(Items.COMPASS, Items.FILLED_MAP, Items.FIREWORK_ROCKET);
 
     public static ActionResult onItemUseBlock(ItemUsageContext context) {
         //Check for Fakeplayer. Since there is no api for that directly check the class