diff --git a/fabric/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/fabric/CCACompat.java b/fabric/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/fabric/CCACompat.java
new file mode 100644
index 0000000..56c9c65
--- /dev/null
+++ b/fabric/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/fabric/CCACompat.java
@@ -0,0 +1,29 @@
+/*
+ * Numismatics
+ * Copyright (c) 2024 The Railways Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package dev.ithundxr.createnumismatics.content.salepoint.states.fabric;
+
+import dev.ithundxr.createnumismatics.content.salepoint.containers.InvalidatableWrappingEnergyBuffer;
+import dev.ithundxr.createnumismatics.content.salepoint.containers.fabric.InvalidatableWrappingEnergyBufferStorage;
+import dev.ithundxr.createnumismatics.content.salepoint.types.EnergyBuffer;
+
+public class CCACompat {
+    public static InvalidatableWrappingEnergyBuffer createBufferWrapper(EnergyBuffer buffer) {
+        return new InvalidatableWrappingEnergyBufferStorage(buffer);
+    }
+}
diff --git a/fabric/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/fabric/EnergySalepointStateImpl.java b/fabric/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/fabric/EnergySalepointStateImpl.java
index f726467..9488584 100644
--- a/fabric/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/fabric/EnergySalepointStateImpl.java
+++ b/fabric/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/fabric/EnergySalepointStateImpl.java
@@ -1,11 +1,13 @@
 package dev.ithundxr.createnumismatics.content.salepoint.states.fabric;
 
+import dev.ithundxr.createnumismatics.compat.Mods;
 import dev.ithundxr.createnumismatics.content.salepoint.containers.InvalidatableWrappingEnergyBuffer;
-import dev.ithundxr.createnumismatics.content.salepoint.containers.fabric.InvalidatableWrappingEnergyBufferStorage;
 import dev.ithundxr.createnumismatics.content.salepoint.types.EnergyBuffer;
 
 public class EnergySalepointStateImpl {
     public static InvalidatableWrappingEnergyBuffer createBufferWrapper(EnergyBuffer buffer) {
-        return new InvalidatableWrappingEnergyBufferStorage(buffer);
+        return Mods.CREATEADDITION.runIfInstalled(
+            () -> () -> CCACompat.createBufferWrapper(buffer)
+        ).orElseGet(() -> new InvalidatableWrappingEnergyBuffer(buffer));
     }
 }
diff --git a/forge/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/forge/CCACompat.java b/forge/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/forge/CCACompat.java
new file mode 100644
index 0000000..a7be06d
--- /dev/null
+++ b/forge/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/forge/CCACompat.java
@@ -0,0 +1,29 @@
+/*
+ * Numismatics
+ * Copyright (c) 2024 The Railways Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package dev.ithundxr.createnumismatics.content.salepoint.states.forge;
+
+import dev.ithundxr.createnumismatics.content.salepoint.containers.InvalidatableWrappingEnergyBuffer;
+import dev.ithundxr.createnumismatics.content.salepoint.containers.forge.InvalidatableWrappingEnergyBufferStorage;
+import dev.ithundxr.createnumismatics.content.salepoint.types.EnergyBuffer;
+
+public class CCACompat {
+    public static InvalidatableWrappingEnergyBuffer createBufferWrapper(EnergyBuffer buffer) {
+        return new InvalidatableWrappingEnergyBufferStorage(buffer);
+    }
+}
diff --git a/forge/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/forge/EnergySalepointStateImpl.java b/forge/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/forge/EnergySalepointStateImpl.java
index 9c194ff..bcbad76 100644
--- a/forge/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/forge/EnergySalepointStateImpl.java
+++ b/forge/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/forge/EnergySalepointStateImpl.java
@@ -18,12 +18,14 @@
 
 package dev.ithundxr.createnumismatics.content.salepoint.states.forge;
 
+import dev.ithundxr.createnumismatics.compat.Mods;
 import dev.ithundxr.createnumismatics.content.salepoint.containers.InvalidatableWrappingEnergyBuffer;
-import dev.ithundxr.createnumismatics.content.salepoint.containers.forge.InvalidatableWrappingEnergyBufferStorage;
 import dev.ithundxr.createnumismatics.content.salepoint.types.EnergyBuffer;
 
 public class EnergySalepointStateImpl {
     public static InvalidatableWrappingEnergyBuffer createBufferWrapper(EnergyBuffer buffer) {
-        return new InvalidatableWrappingEnergyBufferStorage(buffer);
+        return Mods.CREATEADDITION.runIfInstalled(
+            () -> () -> CCACompat.createBufferWrapper(buffer)
+        ).orElseGet(() -> new InvalidatableWrappingEnergyBuffer(buffer));
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 86644d1..b94ec73 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -65,7 +65,7 @@ enable_cc = true
 createaddition_fabric_version = vV4bZmhm
 # forge-1.20.1-1.2.4d
 createaddition_forge_version = eh2ccol5
-enable_createaddition = true
+enable_createaddition = false
 
 # Publishing
 # Modrinth