diff --git a/build.gradle b/build.gradle
index d27415bb..287422e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,7 +43,7 @@ tasks.register("printVersion") {
 
 subprojects {
     group 'com.github.shynixn.mccoroutine'
-    version '2.17.0'
+    version '2.18.0'
 
     sourceCompatibility = 1.8
 
diff --git a/docs/wiki/docs/installation.md b/docs/wiki/docs/installation.md
index 465a789a..593f3ffd 100644
--- a/docs/wiki/docs/installation.md
+++ b/docs/wiki/docs/installation.md
@@ -8,8 +8,8 @@ In order to use the MCCoroutine Kotlin API, you need to include the following li
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.17.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.17.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.18.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.18.0")
     }
     ```
 
@@ -17,8 +17,8 @@ In order to use the MCCoroutine Kotlin API, you need to include the following li
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-api:2.17.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-core:2.17.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-api:2.18.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-core:2.18.0")
     }
     ```
 
@@ -26,8 +26,8 @@ In order to use the MCCoroutine Kotlin API, you need to include the following li
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.17.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.17.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.18.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.18.0")
     }
     ```
 
@@ -35,8 +35,8 @@ In order to use the MCCoroutine Kotlin API, you need to include the following li
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.17.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.17.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.18.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.18.0")
     }
     ```
 
@@ -44,8 +44,8 @@ In order to use the MCCoroutine Kotlin API, you need to include the following li
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-api:2.17.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-core:2.17.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-api:2.18.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-core:2.18.0")
     }
     ```
 
@@ -53,8 +53,8 @@ In order to use the MCCoroutine Kotlin API, you need to include the following li
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-api:2.17.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-core:2.17.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-api:2.18.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-core:2.18.0")
     }
     ```
 
@@ -62,8 +62,8 @@ In order to use the MCCoroutine Kotlin API, you need to include the following li
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-api:2.17.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-core:2.17.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-api:2.18.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-core:2.18.0")
     }
     ```
 
@@ -87,8 +87,8 @@ dependencies {
     **plugin.yml**
     ```yaml
     libraries:
-      - com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.17.0
-      - com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.17.0
+      - com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.18.0
+      - com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.18.0
     ```
 
 === "Folia"
@@ -96,8 +96,8 @@ dependencies {
     **plugin.yml**
     ```yaml
     libraries:
-      - com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.17.0
-      - com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.17.0
+      - com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.18.0
+      - com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.18.0
     ```
 
 
diff --git a/docs/wiki/docs/unittests.md b/docs/wiki/docs/unittests.md
index 0a74e18e..c63e7faa 100644
--- a/docs/wiki/docs/unittests.md
+++ b/docs/wiki/docs/unittests.md
@@ -18,7 +18,7 @@ feedback to the real environment.
 
 ```kotlin
 dependencies {
-    testImplementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-test:2.17.0")
+    testImplementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-test:2.18.0")
 }
 ```
 
diff --git a/mccoroutine-bukkit-sample/src/main/resources/plugin.yml b/mccoroutine-bukkit-sample/src/main/resources/plugin.yml
index 3fba58a4..7d933430 100644
--- a/mccoroutine-bukkit-sample/src/main/resources/plugin.yml
+++ b/mccoroutine-bukkit-sample/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: MCCoroutine-Sample
-version: 2.17.0
+version: 2.18.0
 author: Shynixn
 main: com.github.shynixn.mccoroutine.bukkit.sample.MCCoroutineSamplePlugin
 commands:
diff --git a/mccoroutine-bungeecord-sample/src/main/resources/plugin.yml b/mccoroutine-bungeecord-sample/src/main/resources/plugin.yml
index fc83f099..d03e4a27 100644
--- a/mccoroutine-bungeecord-sample/src/main/resources/plugin.yml
+++ b/mccoroutine-bungeecord-sample/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: MCCoroutine-Sample
-version: 2.17.0
+version: 2.18.0
 author: Shynixn
 main: com.github.shynixn.mccoroutine.bungeecord.sample.MCCoroutineSamplePlugin
 commands:
diff --git a/mccoroutine-fabric-api/src/main/java/com/github/shynixn/mccoroutine/fabric/MCCoroutineExceptionEvent.kt b/mccoroutine-fabric-api/src/main/java/com/github/shynixn/mccoroutine/fabric/MCCoroutineExceptionEvent.kt
index 804aea02..e4bf133a 100644
--- a/mccoroutine-fabric-api/src/main/java/com/github/shynixn/mccoroutine/fabric/MCCoroutineExceptionEvent.kt
+++ b/mccoroutine-fabric-api/src/main/java/com/github/shynixn/mccoroutine/fabric/MCCoroutineExceptionEvent.kt
@@ -7,6 +7,7 @@ import net.fabricmc.fabric.api.event.EventFactory
  * A Fabric event which is called when an exception is raised in one of the coroutines managed by MCCoroutine.
  * Cancelling this exception causes the error to not get logged and offers to possibility for custom logging.
  */
+@FunctionalInterface
 interface MCCoroutineExceptionEvent {
     companion object {
         val EVENT: Event<MCCoroutineExceptionEvent> =
diff --git a/mccoroutine-fabric-sample/build.gradle.kts b/mccoroutine-fabric-sample/build.gradle.kts
index c127f4f1..7b6a5e70 100644
--- a/mccoroutine-fabric-sample/build.gradle.kts
+++ b/mccoroutine-fabric-sample/build.gradle.kts
@@ -9,8 +9,8 @@ repositories {
     mavenLocal()
 }
 dependencies {
-    implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.17.0")
-    implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.17.0")
+    implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.18.0")
+    implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.18.0")
 
     minecraft("com.mojang", "minecraft", project.extra["minecraft_version"] as String)
     mappings("net.fabricmc", "yarn", project.extra["yarn_mappings"] as String, null, "v2")
diff --git a/mccoroutine-folia-sample/src/main/resources/plugin.yml b/mccoroutine-folia-sample/src/main/resources/plugin.yml
index bdf2f752..a6a1cb6b 100644
--- a/mccoroutine-folia-sample/src/main/resources/plugin.yml
+++ b/mccoroutine-folia-sample/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: MCCoroutine-Sample
-version: 2.17.0
+version: 2.18.0
 author: Shynixn
 main: com.github.shynixn.mccoroutine.folia.sample.MCCoroutineSamplePlugin
 folia-supported: true
diff --git a/mccoroutine-minestom-sample/src/main/resources/extension.json b/mccoroutine-minestom-sample/src/main/resources/extension.json
index 61566007..d124643d 100644
--- a/mccoroutine-minestom-sample/src/main/resources/extension.json
+++ b/mccoroutine-minestom-sample/src/main/resources/extension.json
@@ -1,5 +1,5 @@
 {
   "entrypoint": "com.github.shynixn.mccoroutine.minestom.sample.extension.MCCoroutineSampleExtension",
   "name": "MCCoroutineSampleExtension",
-  "version": "2.17.0"
+  "version": "2.18.0"
 }
diff --git a/mccoroutine-sponge-sample/src/main/resources/mcmod.info b/mccoroutine-sponge-sample/src/main/resources/mcmod.info
index f597b906..7447ff8a 100644
--- a/mccoroutine-sponge-sample/src/main/resources/mcmod.info
+++ b/mccoroutine-sponge-sample/src/main/resources/mcmod.info
@@ -1,7 +1,7 @@
 [{
     "modid": "mccoroutinesample",
     "name": "MCCoroutineSample",
-    "version": "2.17.0",
+    "version": "2.18.0",
     "description": "MCCoroutineSample is sample plugin to use MCCoroutine in Sponge.",
     "authorList": [
         "Shynixn"