diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/DependencySetup.java b/common/src/main/java/com/seibel/lod/common/wrappers/DependencySetup.java
index 56a427749..ce2355fd3 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/DependencySetup.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/DependencySetup.java
@@ -65,6 +65,6 @@ public class DependencySetup {
         SingletonInjector.INSTANCE.bind(IMinecraftClientWrapper.class, MinecraftClientWrapper.INSTANCE);
         SingletonInjector.INSTANCE.bind(IMinecraftSharedWrapper.class, MinecraftClientWrapper.INSTANCE);
         SingletonInjector.INSTANCE.bind(IMinecraftRenderWrapper.class, MinecraftRenderWrapper.INSTANCE);
-        SingletonInjector.INSTANCE.bind(IReflectionHandler.class, ReflectionHandler.createSingleton());
+        SingletonInjector.INSTANCE.bind(IReflectionHandler.class, ReflectionHandler.INSTANCE);
     }
 }
diff --git a/coreSubProjects b/coreSubProjects
index 0f06fedb9..2b1837e81 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 0f06fedb951f98bf2a1278abf95088a5d94de93c
+Subproject commit 2b1837e812821e259f9cf461f48e51840f55bafe
diff --git a/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java b/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java
index 0fcd903f2..3d295e77d 100644
--- a/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java
+++ b/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java
@@ -22,9 +22,10 @@ package com.seibel.lod.wrappers.modAccessor;
 import java.util.HashSet;
 
 import com.seibel.lod.core.pos.DhChunkPos;
+import com.seibel.lod.core.wrapperInterfaces.modAccessor.AbstractOptifineAccessor;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 
-public class OptifineAccessor implements IOptifineAccessor
+public class OptifineAccessor extends AbstractOptifineAccessor
 {
 
 	@Override
diff --git a/forge/src/main/java/com/seibel/lod/ForgeMain.java b/forge/src/main/java/com/seibel/lod/ForgeMain.java
index 8fcf20000..983967405 100644
--- a/forge/src/main/java/com/seibel/lod/ForgeMain.java
+++ b/forge/src/main/java/com/seibel/lod/ForgeMain.java
@@ -121,7 +121,7 @@ public class ForgeMain implements LodForgeMethodCaller
 		ForgeDependencySetup.createInitialBindings();
 		LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
 
-		if (ReflectionHandler.instance.optifinePresent()) {
+		if (ReflectionHandler.INSTANCE.optifinePresent()) {
 			ModAccessorInjector.INSTANCE.bind(IOptifineAccessor.class, new OptifineAccessor());
 		}
 		#if PRE_MC_1_17_1
diff --git a/forge/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java b/forge/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java
index 5175f00f1..588d7aecd 100644
--- a/forge/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java
+++ b/forge/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java
@@ -22,9 +22,10 @@ package com.seibel.lod.wrappers.modAccessor;
 import java.util.HashSet;
 
 import com.seibel.lod.core.pos.DhChunkPos;
+import com.seibel.lod.core.wrapperInterfaces.modAccessor.AbstractOptifineAccessor;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 
-public class OptifineAccessor implements IOptifineAccessor
+public class OptifineAccessor extends AbstractOptifineAccessor
 {
 
 	@Override