diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
index e849dacfc..dcf48a119 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
@@ -26,6 +26,7 @@
 package com.plotsquared.bukkit;
 
 import com.google.inject.Guice;
+import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Stage;
@@ -176,16 +177,16 @@ import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
 
     @Getter private Injector injector;
 
-    private PlotAreaManager plotAreaManager;
-    private EventDispatcher eventDispatcher;
-    private PlotListener plotListener;
-    @WorldConfig private YamlConfiguration worldConfiguration;
-    @WorldFile private File worldfile;
-    private BukkitPlayerManager playerManager;
-    private BackupManager backupManager;
-    @ImpromptuPipeline private UUIDPipeline impromptuPipeline;
-    @BackgroundPipeline private UUIDPipeline backgroundPipeline;
-    private PlatformWorldManager<World> worldManager;
+    @Inject private PlotAreaManager plotAreaManager;
+    @Inject private EventDispatcher eventDispatcher;
+    @Inject private PlotListener plotListener;
+    @Inject @WorldConfig private YamlConfiguration worldConfiguration;
+    @Inject @WorldFile private File worldfile;
+    @Inject private BukkitPlayerManager playerManager;
+    @Inject private BackupManager backupManager;
+    @Inject @ImpromptuPipeline private UUIDPipeline impromptuPipeline;
+    @Inject @BackgroundPipeline private UUIDPipeline backgroundPipeline;
+    @Inject private PlatformWorldManager<World> worldManager;
 
     @Override public int[] getServerVersion() {
         if (this.version == null) {
@@ -308,7 +309,7 @@ import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
 
         if (Settings.Enabled_Components.COMPONENT_PRESETS) {
             try {
-                new ComponentPresetManager();
+                getInjector().getInstance(ComponentPresetManager.class);
             } catch (final Exception e) {
                 PlotSquared.log(Captions.PREFIX + "Failed to initialize the preset system");
                 e.printStackTrace();
diff --git a/Core/src/main/java/com/plotsquared/core/plot/Plot.java b/Core/src/main/java/com/plotsquared/core/plot/Plot.java
index 6a7006dd5..2f5048964 100644
--- a/Core/src/main/java/com/plotsquared/core/plot/Plot.java
+++ b/Core/src/main/java/com/plotsquared/core/plot/Plot.java
@@ -27,6 +27,7 @@ package com.plotsquared.core.plot;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+import com.google.inject.Inject;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Captions;
 import com.plotsquared.core.configuration.ConfigurationUtil;
@@ -128,13 +129,13 @@ public class Plot {
     @NotNull private final PlotId id;
 
     // These will be injected
-    private EventDispatcher eventDispatcher;
-    private PlotListener plotListener;
-    private RegionManager regionManager;
-    private GlobalBlockQueue blockQueue;
-    private WorldUtil worldUtil;
-    private SchematicHandler schematicHandler;
-    @ImpromptuPipeline private UUIDPipeline impromptuPipeline;
+    @Inject private EventDispatcher eventDispatcher;
+    @Inject private PlotListener plotListener;
+    @Inject private RegionManager regionManager;
+    @Inject private GlobalBlockQueue blockQueue;
+    @Inject private WorldUtil worldUtil;
+    @Inject private SchematicHandler schematicHandler;
+    @Inject @ImpromptuPipeline private UUIDPipeline impromptuPipeline;
 
     /**
      * Plot flag container
diff --git a/Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java b/Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java
index 83a4bcd7a..dbfc7452a 100644
--- a/Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java
+++ b/Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java
@@ -25,6 +25,7 @@
  */
 package com.plotsquared.core.queue;
 
+import com.google.inject.Inject;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.location.Location;
 import com.plotsquared.core.player.PlotPlayer;
@@ -48,9 +49,9 @@ public abstract class LocalBlockQueue {
     @Getter @Setter private boolean forceSync = false;
     @Getter @Setter @Nullable private Object chunkObject;
 
-    private SchematicHandler schematicHandler;
-    private WorldUtil worldUtil;
-    private GlobalBlockQueue blockQueue;
+    @Inject private SchematicHandler schematicHandler;
+    @Inject private WorldUtil worldUtil;
+    @Inject private GlobalBlockQueue blockQueue;
 
     /**
      * Needed for compatibility with FAWE.