diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/script/UnsignCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/script/UnsignCommand.java
index 7140c428..5c4ebb6d 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/script/UnsignCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/script/UnsignCommand.java
@@ -19,15 +19,14 @@
 
 package de.steamwar.bausystem.features.script;
 
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class UnsignCommand extends SWCommand {
 
     public UnsignCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Call.java b/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Call.java
index e5f255b4..9a1f65d8 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Call.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Call.java
@@ -3,11 +3,10 @@ package de.steamwar.bausystem.features.script.command;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Call implements SpecialCommand {
 
     @Override
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Exit.java b/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Exit.java
index 461dd8e2..925d900b 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Exit.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Exit.java
@@ -2,11 +2,10 @@ package de.steamwar.bausystem.features.script.command;
 
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Exit implements SpecialCommand {
 
     @Override
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/If.java b/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/If.java
index 48f6d04c..b61189fe 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/If.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/If.java
@@ -4,11 +4,10 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
 import de.steamwar.bausystem.features.script.variables.Value;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class If implements SpecialCommand {
 
     @Override
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Jump.java b/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Jump.java
index b8f7bc10..bab023e4 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Jump.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Jump.java
@@ -3,11 +3,10 @@ package de.steamwar.bausystem.features.script.command;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Jump implements SpecialCommand {
 
     @Override
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Return.java b/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Return.java
index 031d729f..742c58dc 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Return.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Return.java
@@ -3,11 +3,10 @@ package de.steamwar.bausystem.features.script.command;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Return implements SpecialCommand {
 
     @Override
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Sleep.java b/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Sleep.java
index 171e857d..94dd38e6 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Sleep.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/script/command/Sleep.java
@@ -3,12 +3,11 @@ package de.steamwar.bausystem.features.script.command;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.ScriptExecutor;
 import de.steamwar.bausystem.features.script.SpecialCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 
-@Linked(LinkageType.SCRIPT_COMMAND)
+@Linked
 public class Sleep implements SpecialCommand {
 
     @Override
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java
index 851632b6..40b28177 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java
@@ -30,8 +30,6 @@ import de.steamwar.bausystem.features.tracer.show.mode.BlockShowMode;
 import de.steamwar.bausystem.features.tracer.show.mode.ParticleShowMode;
 import de.steamwar.bausystem.features.tracer.show.mode.RawEntityShowMode;
 import de.steamwar.bausystem.features.tracer.show.mode.TraceEntityShowMode;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.shared.ShowMode;
 import de.steamwar.bausystem.utils.ListChatView;
 import de.steamwar.command.SWCommand;
@@ -51,7 +49,7 @@ import java.util.function.BiFunction;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class TraceCommand extends SWCommand {
 
     public TraceCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceTNTClickListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceTNTClickListener.java
index d6f1c472..9aecedae 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceTNTClickListener.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceTNTClickListener.java
@@ -23,9 +23,8 @@ import com.comphenix.tinyprotocol.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.tracer.show.TraceShowManager;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.utils.RayTraceUtils;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.util.RayTraceResult;
@@ -33,7 +32,7 @@ import org.bukkit.util.RayTraceResult;
 import java.util.HashSet;
 import java.util.Set;
 
-@Linked(LinkageType.PLAIN)
+@Linked
 public class TraceTNTClickListener {
 
     private static final Class<?> useEntity = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInUseEntity");
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TracerBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TracerBauGuiItem.java
index 4a20b460..d051afd0 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TracerBauGuiItem.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TracerBauGuiItem.java
@@ -24,8 +24,6 @@ import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.tracer.record.RecordStateMachine;
 import de.steamwar.bausystem.features.tracer.record.RecordStatus;
 import de.steamwar.bausystem.features.tracer.show.TraceShowManager;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
@@ -37,7 +35,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Arrays;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class TracerBauGuiItem extends BauGuiItem {
 
     public TracerBauGuiItem() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/BookReplaceCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/BookReplaceCommand.java
index 34a06d2a..290223a2 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/BookReplaceCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/BookReplaceCommand.java
@@ -1,8 +1,7 @@
 package de.steamwar.bausystem.features.util;
 
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.BookMeta;
@@ -10,7 +9,7 @@ import org.bukkit.inventory.meta.ItemMeta;
 
 import java.util.List;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class BookReplaceCommand extends SWCommand {
 
     public BookReplaceCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/ClearCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/ClearCommand.java
index 8da2f7bb..3e8899d6 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/ClearCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/ClearCommand.java
@@ -21,15 +21,14 @@ package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class ClearCommand extends SWCommand {
 
     public ClearCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/DebugStickCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/DebugStickCommand.java
index d7f7ab4e..e2de740f 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/DebugStickCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/DebugStickCommand.java
@@ -20,14 +20,13 @@
 package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class DebugStickCommand extends SWCommand {
 
     public DebugStickCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/DeclutterCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/DeclutterCommand.java
index a684bab9..7d3f5938 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/DeclutterCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/DeclutterCommand.java
@@ -20,9 +20,8 @@
 package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
@@ -30,7 +29,7 @@ import org.bukkit.inventory.ItemStack;
 import java.util.HashSet;
 import java.util.Set;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class DeclutterCommand extends SWCommand {
 
     public DeclutterCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/GamemodeCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/GamemodeCommand.java
index 2682d5f9..876586a2 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/GamemodeCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/GamemodeCommand.java
@@ -19,13 +19,12 @@
 package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class GamemodeCommand extends SWCommand {
 
 	public GamemodeCommand()  {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
index 8d8f13ba..49654a05 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
@@ -21,8 +21,6 @@ package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
@@ -37,7 +35,7 @@ import org.bukkit.entity.Player;
 
 import java.util.concurrent.atomic.AtomicLong;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class KillAllCommand extends SWCommand {
 
     private static final World WORLD = Bukkit.getWorlds().get(0);
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialCommand.java
index 8d5f82d1..3fe740fe 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialCommand.java
@@ -20,8 +20,6 @@
 package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.shared.EnumDisplay;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
@@ -29,6 +27,7 @@ import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
+import de.steamwar.linkage.Linked;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -44,8 +43,7 @@ import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.Predicate;
 
-@Linked(LinkageType.COMMAND)
-@Linked(LinkageType.LISTENER)
+@Linked
 public class MaterialCommand extends SWCommand implements Listener {
 
     public MaterialCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/NightVisionCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/NightVisionCommand.java
index 1b28d0fd..0308846d 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/NightVisionCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/NightVisionCommand.java
@@ -21,9 +21,8 @@ package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.configplayer.Config;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -33,8 +32,7 @@ import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import yapion.hierarchy.types.YAPIONObject;
 
-@Linked(LinkageType.COMMAND)
-@Linked(LinkageType.LISTENER)
+@Linked
 public class NightVisionCommand extends SWCommand implements Listener {
 
     public NightVisionCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/NoClipCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/NoClipCommand.java
index 9b1589d9..46fdf535 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/NoClipCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/NoClipCommand.java
@@ -24,12 +24,11 @@ import com.comphenix.tinyprotocol.TinyProtocol;
 import com.mojang.authlib.GameProfile;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.utils.NMSWrapper;
 import de.steamwar.bausystem.utils.ProtocolWrapper;
 import de.steamwar.command.SWCommand;
 import de.steamwar.core.Core;
+import de.steamwar.linkage.Linked;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -44,8 +43,7 @@ import org.bukkit.event.player.PlayerToggleFlightEvent;
 import java.util.*;
 import java.util.function.BiFunction;
 
-@Linked(LinkageType.COMMAND)
-@Linked(LinkageType.LISTENER)
+@Linked
 public class NoClipCommand extends SWCommand implements Listener {
 
     public static final Class<?> playerInfoPacket = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutPlayerInfo");
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
index 41a7050d..281b159f 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
@@ -20,8 +20,7 @@
 package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.ToString;
@@ -44,7 +43,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class PistonCalculator implements Listener {
 
     @EventHandler
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculatorCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculatorCommand.java
index 1ededcee..8aef617f 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculatorCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculatorCommand.java
@@ -20,12 +20,11 @@
 package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class PistonCalculatorCommand extends SWCommand {
 
     public PistonCalculatorCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java
index 5987968e..ce859ec6 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java
@@ -2,8 +2,6 @@ package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
@@ -11,9 +9,10 @@ import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class SelectCommand extends SWCommand {
 
     public SelectCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/SkullCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/SkullCommand.java
index c24c54b5..8ff194a0 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/SkullCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/SkullCommand.java
@@ -21,11 +21,10 @@ package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -35,7 +34,7 @@ import org.bukkit.inventory.meta.SkullMeta;
 import java.util.List;
 import java.util.stream.Collectors;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class SkullCommand extends SWCommand {
 
     public SkullCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/SlotCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/SlotCommand.java
index c0dafe18..4ea5d62b 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/SlotCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/SlotCommand.java
@@ -21,11 +21,10 @@ package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.command.TypeMapper;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
@@ -33,7 +32,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Arrays;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class SlotCommand extends SWCommand {
 
     public SlotCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/SpeedCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/SpeedCommand.java
index a2eef6df..31308830 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/SpeedCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/SpeedCommand.java
@@ -20,12 +20,11 @@
 package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class SpeedCommand extends SWCommand {
 
     public SpeedCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/StructureVoidCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/StructureVoidCommand.java
index 4146329c..277eb59a 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/StructureVoidCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/StructureVoidCommand.java
@@ -20,14 +20,13 @@
 package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class StructureVoidCommand extends SWCommand {
 
     public StructureVoidCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/TNTClickListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/TNTClickListener.java
index 7a2f0a67..9bb8368f 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/TNTClickListener.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/TNTClickListener.java
@@ -20,8 +20,7 @@
 package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.TNTPrimed;
@@ -30,7 +29,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.inventory.EquipmentSlot;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class TNTClickListener implements Listener {
 
     @EventHandler
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/TeleportCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/TeleportCommand.java
index 047a94e2..9294eb20 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/TeleportCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/TeleportCommand.java
@@ -20,15 +20,14 @@
 package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent;
 
 import java.util.Random;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class TeleportCommand extends SWCommand {
 
     private static final Random RAND = new Random();
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/TimeCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/TimeCommand.java
index 82eee50c..15f48590 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/TimeCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/TimeCommand.java
@@ -21,16 +21,15 @@ package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.*;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import java.util.Arrays;
 import java.util.List;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class TimeCommand extends SWCommand {
 
     private static final List<String> tabCompletions = Arrays.asList("0", "6000", "12000", "18000");
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/TpsCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/TpsCommand.java
index 877c0da1..302dd7e9 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/TpsCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/TpsCommand.java
@@ -21,13 +21,12 @@ package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.tpslimit.TPSWarpUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
 import de.steamwar.core.TPSWatcher;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class TpsCommand extends SWCommand {
 
     public TpsCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/ClearBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/ClearBauGuiItem.java
index ec39cb33..607b7398 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/ClearBauGuiItem.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/ClearBauGuiItem.java
@@ -21,16 +21,15 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class ClearBauGuiItem extends BauGuiItem {
 
     public ClearBauGuiItem() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DebugstickBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DebugstickBauGuiItem.java
index d16a6577..725d75b1 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DebugstickBauGuiItem.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DebugstickBauGuiItem.java
@@ -22,15 +22,14 @@ package de.steamwar.bausystem.features.util.items;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class DebugstickBauGuiItem extends BauGuiItem {
 
     public DebugstickBauGuiItem() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DeclutterBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DeclutterBauGuiItem.java
index 9ed5a67f..55bd6a02 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DeclutterBauGuiItem.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DeclutterBauGuiItem.java
@@ -22,17 +22,16 @@ package de.steamwar.bausystem.features.util.items;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.util.DeclutterCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.bausystem.linkage.LinkedInstance;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class DeclutterBauGuiItem extends BauGuiItem {
 
     @LinkedInstance
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/GamemodeBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/GamemodeBauGuiItem.java
index fb8bf022..42900af8 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/GamemodeBauGuiItem.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/GamemodeBauGuiItem.java
@@ -21,10 +21,9 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -33,7 +32,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Arrays;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class GamemodeBauGuiItem extends BauGuiItem {
 
     public GamemodeBauGuiItem() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NavWandBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NavWandBauGuiItem.java
index e35da4b8..30ac88a2 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NavWandBauGuiItem.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NavWandBauGuiItem.java
@@ -21,10 +21,9 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -32,7 +31,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Arrays;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class NavWandBauGuiItem extends BauGuiItem {
 
     public NavWandBauGuiItem() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java
index 70c652ca..76fb5354 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java
@@ -21,10 +21,9 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -33,7 +32,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.potion.PotionEffectType;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class NightVisionBauGuiItem extends BauGuiItem {
 
     public NightVisionBauGuiItem() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SelectBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SelectBauGuiItem.java
index 4cc20aef..2e90be13 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SelectBauGuiItem.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SelectBauGuiItem.java
@@ -21,13 +21,12 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.bukkit.Material;
@@ -40,7 +39,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class SelectBauGuiItem extends BauGuiItem {
 
     private static final Map<Player, LastSelect> LAST_SELECT_MAP = new HashMap<>();
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SkullBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SkullBauGuiItem.java
index ed74b2dd..f9ec57c8 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SkullBauGuiItem.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SkullBauGuiItem.java
@@ -21,17 +21,16 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class SkullBauGuiItem extends BauGuiItem {
 
     public SkullBauGuiItem() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SpeedBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SpeedBauGuiItem.java
index 33fdd3ee..d24eedf6 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SpeedBauGuiItem.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SpeedBauGuiItem.java
@@ -21,11 +21,10 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -33,7 +32,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Arrays;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class SpeedBauGuiItem extends BauGuiItem {
 
     public SpeedBauGuiItem() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/TeleportBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/TeleportBauGuiItem.java
index a190b0d6..4569ae47 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/TeleportBauGuiItem.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/TeleportBauGuiItem.java
@@ -21,11 +21,10 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -34,7 +33,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.UUID;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class TeleportBauGuiItem extends BauGuiItem {
 
     public TeleportBauGuiItem() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/WorldEditBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/WorldEditBauGuiItem.java
index 2da651fb..ddfa66d7 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/WorldEditBauGuiItem.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/WorldEditBauGuiItem.java
@@ -21,10 +21,9 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -32,7 +31,7 @@ import org.bukkit.inventory.ItemStack;
 
 import java.util.Arrays;
 
-@Linked(LinkageType.BAU_GUI_ITEM)
+@Linked
 public class WorldEditBauGuiItem extends BauGuiItem {
 
     public WorldEditBauGuiItem() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpCommand.java
index c2ae7528..23f64b97 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpCommand.java
@@ -23,11 +23,11 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.linkage.Disable;
 import de.steamwar.bausystem.linkage.Enable;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.utils.ListChatView;
 import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.command.*;
+import de.steamwar.linkage.LinkageType;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
@@ -38,9 +38,7 @@ import yapion.hierarchy.types.YAPIONObject;
 
 import java.util.ArrayList;
 
-@Linked(LinkageType.COMMAND)
-@Linked(LinkageType.DISABLE_LINK)
-@Linked(LinkageType.ENABLE_LINK)
+@Linked
 public class WarpCommand extends SWCommand implements Disable, Enable {
 
     private static final String[] FORBIDDEN_NAMES = new String[]{
@@ -129,7 +127,7 @@ public class WarpCommand extends SWCommand implements Disable, Enable {
         };
     }
 
-    @Linked(LinkageType.COMMAND)
+    @Linked
     public static class WarpsLink extends SWCommand {
 
         public WarpsLink() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java
index 406b8c5e..33f437c4 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java
@@ -19,10 +19,9 @@
 
 package de.steamwar.bausystem.features.warp;
 
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.NMSWrapper;
+import de.steamwar.linkage.Linked;
 import org.bukkit.*;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -36,7 +35,7 @@ import org.bukkit.util.Vector;
 import java.util.*;
 import java.util.function.Consumer;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class WarpListener implements Listener {
 
     private Map<Player, List<AbstractWarpEntity>> warpsShown = new HashMap<>();
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/AFKStopperListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/AFKStopperListener.java
index de20516f..426d26bc 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/world/AFKStopperListener.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/AFKStopperListener.java
@@ -20,15 +20,14 @@
 package de.steamwar.bausystem.features.world;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class AFKStopperListener implements Listener {
 
     private int minutesAfk = 0;
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/AutoShutdownListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/AutoShutdownListener.java
index edba5698..54a8bd82 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/world/AutoShutdownListener.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/AutoShutdownListener.java
@@ -21,8 +21,7 @@ package de.steamwar.bausystem.features.world;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.tpslimit.TPSLimitUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import de.steamwar.scoreboard.SWScoreboard;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -34,7 +33,7 @@ import org.bukkit.scheduler.BukkitTask;
 
 import java.util.logging.Level;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class AutoShutdownListener implements Listener {
 
     private BukkitTask autoShutdown;
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java
index eb3144d2..c3950cab 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java
@@ -7,12 +7,11 @@ import de.steamwar.bausystem.features.tpslimit.TPSLimitUtils;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.features.tpslimit.TPSWarpUtils;
 import de.steamwar.bausystem.features.tracer.record.RecordStateMachine;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.core.TPSWatcher;
+import de.steamwar.linkage.Linked;
 import de.steamwar.scoreboard.SWScoreboard;
 import de.steamwar.scoreboard.ScoreboardCallback;
 import org.bukkit.entity.Player;
@@ -26,7 +25,7 @@ import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class BauScoreboard implements Listener {
 
     @EventHandler
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/ClipboardListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/ClipboardListener.java
index 3082b29e..c0e908c6 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/world/ClipboardListener.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/ClipboardListener.java
@@ -19,8 +19,7 @@
 
 package de.steamwar.bausystem.features.world;
 
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.event.EventHandler;
@@ -28,7 +27,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class ClipboardListener implements Listener {
 
     private static final String CLIPBOARD_SCHEMNAME = "//copy";
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/InventoryListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/InventoryListener.java
index 42f25029..6970eed7 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/world/InventoryListener.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/InventoryListener.java
@@ -19,9 +19,8 @@
 
 package de.steamwar.bausystem.features.world;
 
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.utils.NMSWrapper;
+import de.steamwar.linkage.Linked;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
@@ -33,7 +32,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class InventoryListener implements Listener {
 
     @EventHandler
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/ItemFrameListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/ItemFrameListener.java
index 3858b4cf..9a294708 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/world/ItemFrameListener.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/ItemFrameListener.java
@@ -20,8 +20,7 @@
 package de.steamwar.bausystem.features.world;
 
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.ItemFrame;
 import org.bukkit.entity.Player;
@@ -30,7 +29,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.inventory.ItemStack;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class ItemFrameListener implements Listener {
 
     @EventHandler
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/KickallCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/KickallCommand.java
index ad5407dc..ee9ace1b 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/world/KickallCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/KickallCommand.java
@@ -20,15 +20,14 @@
 package de.steamwar.bausystem.features.world;
 
 import de.steamwar.bausystem.config.BauServer;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.bausystem.linkage.LinkedInstance;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class KickallCommand extends SWCommand {
 
     @LinkedInstance
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/NoCreativeKnockback.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/NoCreativeKnockback.java
index 08d1d51b..19417ec2 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/world/NoCreativeKnockback.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/NoCreativeKnockback.java
@@ -21,12 +21,11 @@ package de.steamwar.bausystem.features.world;
 
 import com.comphenix.tinyprotocol.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.utils.NMSWrapper;
+import de.steamwar.linkage.Linked;
 import org.bukkit.GameMode;
 
-@Linked(LinkageType.PLAIN)
+@Linked
 public class NoCreativeKnockback {
 
     public NoCreativeKnockback() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/ReducedDebugInfo.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/ReducedDebugInfo.java
index fb1f8499..c1dd3db0 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/world/ReducedDebugInfo.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/ReducedDebugInfo.java
@@ -20,12 +20,11 @@
 package de.steamwar.bausystem.features.world;
 
 import de.steamwar.bausystem.linkage.Enable;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.GameRule;
 
-@Linked(LinkageType.ENABLE_LINK)
+@Linked
 public class ReducedDebugInfo implements Enable {
 
     @Override
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/RestartCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/RestartCommand.java
index 20aec025..cf868a9d 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/world/RestartCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/RestartCommand.java
@@ -19,11 +19,10 @@
 
 package de.steamwar.bausystem.features.world;
 
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class RestartCommand extends SWCommand {
 
     public RestartCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignEdit.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignEdit.java
index cb4cd3b8..2f8e154e 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignEdit.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignEdit.java
@@ -22,8 +22,7 @@ package de.steamwar.bausystem.features.world;
 import com.comphenix.tinyprotocol.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -35,7 +34,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class SignEdit implements Listener {
 
     private static final Class<?> blockPosition = Reflection.getClass("{nms.core}.BlockPosition");
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignListener.java
index 36058c83..40ad9a66 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignListener.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignListener.java
@@ -19,14 +19,13 @@
 
 package de.steamwar.bausystem.features.world;
 
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.linkage.Linked;
 import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.SignChangeEvent;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class SignListener implements Listener {
 
     @EventHandler
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/StopCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/StopCommand.java
index 6629e505..f03b0f73 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/world/StopCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/StopCommand.java
@@ -22,16 +22,15 @@ package de.steamwar.bausystem.features.world;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class StopCommand extends SWCommand {
 
     public StopCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditListener.java
index 2509c16c..f6f25f33 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditListener.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditListener.java
@@ -21,9 +21,8 @@ package de.steamwar.bausystem.features.world;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -32,7 +31,7 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import java.util.HashSet;
 import java.util.Set;
 
-@Linked(LinkageType.LISTENER)
+@Linked
 public class WorldEditListener implements Listener {
 
     @EventHandler
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java
index 4f829158..48ceff8a 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java
@@ -27,13 +27,12 @@ import com.sk89q.worldedit.util.formatting.text.Component;
 import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 import de.steamwar.bausystem.features.world.WorldEditListener;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
 import de.steamwar.bausystem.region.Color;
 import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
+import de.steamwar.linkage.Linked;
 import lombok.SneakyThrows;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -43,7 +42,7 @@ import org.bukkit.entity.Player;
 import java.util.*;
 import java.util.stream.Collectors;
 
-@Linked(LinkageType.COMMAND)
+@Linked
 public class ColorReplaceCommand extends SWCommand {
 
     public ColorReplaceCommand() {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/TypeReplaceCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/TypeReplaceCommand.java
index 0940516d..a81cdf96 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/TypeReplaceCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/TypeReplaceCommand.java
@@ -27,13 +27,12 @@ import com.sk89q.worldedit.util.formatting.text.Component;
 import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 import de.steamwar.bausystem.features.world.WorldEditListener;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.bausystem.linkage.MinVersion;
 import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import org.bukkit.Material;
@@ -52,7 +51,7 @@ import java.util.stream.Collectors;
 
 import static org.bukkit.Material.*;
 
-@Linked(value = LinkageType.COMMAND)
+@Linked
 @MinVersion(18)
 public class TypeReplaceCommand extends SWCommand {
 
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
index 1011bb13..22c19b67 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
@@ -23,13 +23,12 @@ import com.comphenix.tinyprotocol.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.techhider.TechHiderCommand;
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.bausystem.linkage.LinkedInstance;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.PlayerMovementWrapper;
 import de.steamwar.command.SWCommand;
 import de.steamwar.core.CraftbukkitWrapper;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.techhider.TechHider;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
@@ -47,8 +46,7 @@ import java.io.File;
 import java.util.*;
 import java.util.function.BiFunction;
 
-@Linked(LinkageType.COMMAND)
-@Linked(LinkageType.LISTENER)
+@Linked
 public class XrayCommand extends SWCommand implements Listener {
 
     public XrayCommand() {