diff --git a/bukkit/loader/src/main/resources/resources/default/configuration/blocks.yml b/bukkit/loader/src/main/resources/resources/default/configuration/blocks.yml
index 4baf0dd0b..b979b00a7 100644
--- a/bukkit/loader/src/main/resources/resources/default/configuration/blocks.yml
+++ b/bukkit/loader/src/main/resources/resources/default/configuration/blocks.yml
@@ -64,14 +64,12 @@ items#misc:
         events:
           - on: right_click
             functions:
-              - type: run
-                functions:
-                  - type: open_window
-                    gui-type: anvil
-                  - type: cancel_event
-                conditions:
-                  - type: expression
-                    expression: "!<arg:player.is_sneaking>"
+              - type: open_window
+                gui-type: anvil
+              - type: cancel_event
+            conditions:
+              - type: expression
+                expression: "!<arg:player.is_sneaking>"
         settings:
           template:
             - default:pickaxe_power/level_4
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BlockEventListener.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BlockEventListener.java
index 31b16f093..bc80b371d 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BlockEventListener.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BlockEventListener.java
@@ -18,7 +18,7 @@ import net.momirealms.craftengine.core.plugin.config.Config;
 import net.momirealms.craftengine.core.plugin.context.ContextHolder;
 import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
 import net.momirealms.craftengine.core.plugin.context.parameter.DirectContextParameters;
-import net.momirealms.craftengine.core.plugin.event.EventTrigger;
+import net.momirealms.craftengine.core.plugin.context.event.EventTrigger;
 import net.momirealms.craftengine.core.util.Cancellable;
 import net.momirealms.craftengine.core.util.VersionHelper;
 import net.momirealms.craftengine.core.world.BlockPos;
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitBlockManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitBlockManager.java
index 5308d06ee..542b9b38e 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitBlockManager.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitBlockManager.java
@@ -26,7 +26,7 @@ import net.momirealms.craftengine.core.pack.model.generation.ModelGeneration;
 import net.momirealms.craftengine.core.plugin.CraftEngine;
 import net.momirealms.craftengine.core.plugin.config.Config;
 import net.momirealms.craftengine.core.plugin.config.ConfigParser;
-import net.momirealms.craftengine.core.plugin.event.EventFunctions;
+import net.momirealms.craftengine.core.plugin.context.event.EventFunctions;
 import net.momirealms.craftengine.core.plugin.locale.LocalizedResourceConfigException;
 import net.momirealms.craftengine.core.registry.BuiltInRegistries;
 import net.momirealms.craftengine.core.registry.Holder;
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitCustomBlock.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitCustomBlock.java
index c9897a727..b6d0d7441 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitCustomBlock.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitCustomBlock.java
@@ -11,7 +11,7 @@ import net.momirealms.craftengine.core.loot.LootTable;
 import net.momirealms.craftengine.core.plugin.CraftEngine;
 import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
 import net.momirealms.craftengine.core.plugin.context.function.Function;
-import net.momirealms.craftengine.core.plugin.event.EventTrigger;
+import net.momirealms.craftengine.core.plugin.context.event.EventTrigger;
 import net.momirealms.craftengine.core.registry.BuiltInRegistries;
 import net.momirealms.craftengine.core.registry.Holder;
 import net.momirealms.craftengine.core.registry.WritableRegistry;
@@ -31,13 +31,13 @@ import java.util.*;
 public class BukkitCustomBlock extends AbstractCustomBlock {
 
     protected BukkitCustomBlock(
-            Key id,
-            Holder.Reference<CustomBlock> holder,
-            Map<String, Property<?>> properties,
-            Map<String, Integer> appearances,
-            Map<String, VariantState> variantMapper,
-            BlockSettings settings,
-            @NotNull EnumMap<EventTrigger, List<Function<PlayerOptionalContext>>> events,
+            @NotNull Key id,
+            @NotNull Holder.Reference<CustomBlock> holder,
+            @NotNull Map<String, Property<?>> properties,
+            @NotNull Map<String, Integer> appearances,
+            @NotNull Map<String, VariantState> variantMapper,
+            @NotNull BlockSettings settings,
+            @NotNull Map<EventTrigger, List<Function<PlayerOptionalContext>>> events,
             @Nullable Map<String, Object> behavior,
             @Nullable LootTable<?> lootTable
     ) {
@@ -158,14 +158,14 @@ public class BukkitCustomBlock extends AbstractCustomBlock {
         protected BlockSettings settings;
         protected Map<String, Object> behavior;
         protected LootTable<?> lootTable;
-        protected EnumMap<EventTrigger, List<Function<PlayerOptionalContext>>> events;
+        protected Map<EventTrigger, List<Function<PlayerOptionalContext>>> events;
 
         public BuilderImpl(Key id) {
             this.id = id;
         }
 
         @Override
-        public Builder events(EnumMap<EventTrigger, List<Function<PlayerOptionalContext>>> events) {
+        public Builder events(Map<EventTrigger, List<Function<PlayerOptionalContext>>> events) {
             this.events = events;
             return this;
         }
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurnitureManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurnitureManager.java
index 5d35be647..621a03733 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurnitureManager.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurnitureManager.java
@@ -18,8 +18,8 @@ import net.momirealms.craftengine.core.plugin.config.Config;
 import net.momirealms.craftengine.core.plugin.config.ConfigParser;
 import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
 import net.momirealms.craftengine.core.plugin.context.function.Function;
-import net.momirealms.craftengine.core.plugin.event.EventFunctions;
-import net.momirealms.craftengine.core.plugin.event.EventTrigger;
+import net.momirealms.craftengine.core.plugin.context.event.EventFunctions;
+import net.momirealms.craftengine.core.plugin.context.event.EventTrigger;
 import net.momirealms.craftengine.core.plugin.locale.LocalizedResourceConfigException;
 import net.momirealms.craftengine.core.sound.SoundData;
 import net.momirealms.craftengine.core.util.Key;
@@ -217,7 +217,7 @@ public class BukkitFurnitureManager extends AbstractFurnitureManager {
 
             // get loot table
             LootTable<ItemStack> lootTable = lootMap == null ? null : LootTable.fromMap(lootMap);
-            EnumMap<EventTrigger, List<Function<PlayerOptionalContext>>> events = EventFunctions.parseEvents(ResourceConfigUtils.get(section, "events", "event"));
+            Map<EventTrigger, List<Function<PlayerOptionalContext>>> events = EventFunctions.parseEvents(ResourceConfigUtils.get(section, "events", "event"));
             CustomFurniture furniture = new CustomFurniture(id, settings, placements, events, lootTable);
             byId.put(id, furniture);
         }
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitCustomItem.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitCustomItem.java
index fd7c32143..f117a6990 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitCustomItem.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitCustomItem.java
@@ -7,7 +7,7 @@ import net.momirealms.craftengine.core.item.behavior.ItemBehavior;
 import net.momirealms.craftengine.core.item.modifier.ItemDataModifier;
 import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
 import net.momirealms.craftengine.core.plugin.context.function.Function;
-import net.momirealms.craftengine.core.plugin.event.EventTrigger;
+import net.momirealms.craftengine.core.plugin.context.event.EventTrigger;
 import net.momirealms.craftengine.core.registry.Holder;
 import net.momirealms.craftengine.core.util.Key;
 import org.bukkit.Material;
@@ -16,6 +16,7 @@ import org.bukkit.inventory.ItemStack;
 import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.List;
+import java.util.Map;
 
 public class BukkitCustomItem extends AbstractCustomItem<ItemStack> {
     private final Material material;
@@ -24,7 +25,7 @@ public class BukkitCustomItem extends AbstractCustomItem<ItemStack> {
                             List<ItemBehavior> behaviors,
                             List<ItemDataModifier<ItemStack>> modifiers, List<ItemDataModifier<ItemStack>> clientBoundModifiers,
                             ItemSettings settings,
-                            EnumMap<EventTrigger, List<Function<PlayerOptionalContext>>> events) {
+                            Map<EventTrigger, List<Function<PlayerOptionalContext>>> events) {
         super(id, materialKey, behaviors, modifiers, clientBoundModifiers, settings, events);
         this.material = material;
     }
@@ -58,7 +59,7 @@ public class BukkitCustomItem extends AbstractCustomItem<ItemStack> {
         private Holder<Key> id;
         private Key materialKey;
         private final Material material;
-        private final EnumMap<EventTrigger, List<Function<PlayerOptionalContext>>> events = new EnumMap<>(EventTrigger.class);
+        private final Map<EventTrigger, List<Function<PlayerOptionalContext>>> events = new EnumMap<>(EventTrigger.class);
         private final List<ItemBehavior> behaviors = new ArrayList<>(4);
         private final List<ItemDataModifier<ItemStack>> modifiers = new ArrayList<>(4);
         private final List<ItemDataModifier<ItemStack>> clientBoundModifiers = new ArrayList<>(4);
@@ -124,7 +125,7 @@ public class BukkitCustomItem extends AbstractCustomItem<ItemStack> {
         }
 
         @Override
-        public Builder<ItemStack> events(EnumMap<EventTrigger, List<Function<PlayerOptionalContext>>> events) {
+        public Builder<ItemStack> events(Map<EventTrigger, List<Function<PlayerOptionalContext>>> events) {
             this.events.putAll(events);
             return this;
         }
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/BlockItemBehavior.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/BlockItemBehavior.java
index 00fbf33cc..05edf3460 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/BlockItemBehavior.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/BlockItemBehavior.java
@@ -26,7 +26,7 @@ import net.momirealms.craftengine.core.plugin.config.Config;
 import net.momirealms.craftengine.core.plugin.context.ContextHolder;
 import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
 import net.momirealms.craftengine.core.plugin.context.parameter.DirectContextParameters;
-import net.momirealms.craftengine.core.plugin.event.EventTrigger;
+import net.momirealms.craftengine.core.plugin.context.event.EventTrigger;
 import net.momirealms.craftengine.core.plugin.locale.LocalizedResourceConfigException;
 import net.momirealms.craftengine.core.util.Cancellable;
 import net.momirealms.craftengine.core.util.Direction;
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/FurnitureItemBehavior.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/FurnitureItemBehavior.java
index 20773f4f1..4e8238e2d 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/FurnitureItemBehavior.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/FurnitureItemBehavior.java
@@ -24,7 +24,7 @@ import net.momirealms.craftengine.core.plugin.CraftEngine;
 import net.momirealms.craftengine.core.plugin.context.ContextHolder;
 import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
 import net.momirealms.craftengine.core.plugin.context.parameter.DirectContextParameters;
-import net.momirealms.craftengine.core.plugin.event.EventTrigger;
+import net.momirealms.craftengine.core.plugin.context.event.EventTrigger;
 import net.momirealms.craftengine.core.plugin.locale.LocalizedResourceConfigException;
 import net.momirealms.craftengine.core.util.*;
 import net.momirealms.craftengine.core.world.Vec3d;
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/listener/ItemEventListener.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/listener/ItemEventListener.java
index 183db3a06..f602e34e1 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/listener/ItemEventListener.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/listener/ItemEventListener.java
@@ -17,7 +17,7 @@ import net.momirealms.craftengine.core.item.context.UseOnContext;
 import net.momirealms.craftengine.core.plugin.context.ContextHolder;
 import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
 import net.momirealms.craftengine.core.plugin.context.parameter.DirectContextParameters;
-import net.momirealms.craftengine.core.plugin.event.EventTrigger;
+import net.momirealms.craftengine.core.plugin.context.event.EventTrigger;
 import net.momirealms.craftengine.core.util.Cancellable;
 import net.momirealms.craftengine.core.util.Direction;
 import net.momirealms.craftengine.core.world.BlockHitResult;
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
index abd76f731..cb633c860 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
@@ -36,7 +36,7 @@ import net.momirealms.craftengine.core.plugin.config.Config;
 import net.momirealms.craftengine.core.plugin.context.ContextHolder;
 import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
 import net.momirealms.craftengine.core.plugin.context.parameter.DirectContextParameters;
-import net.momirealms.craftengine.core.plugin.event.EventTrigger;
+import net.momirealms.craftengine.core.plugin.context.event.EventTrigger;
 import net.momirealms.craftengine.core.plugin.network.*;
 import net.momirealms.craftengine.core.util.*;
 import net.momirealms.craftengine.core.world.*;
diff --git a/core/src/main/java/net/momirealms/craftengine/core/block/AbstractCustomBlock.java b/core/src/main/java/net/momirealms/craftengine/core/block/AbstractCustomBlock.java
index cb3efd929..6c74b4ee9 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/block/AbstractCustomBlock.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/block/AbstractCustomBlock.java
@@ -9,7 +9,7 @@ import net.momirealms.craftengine.core.loot.LootTable;
 import net.momirealms.craftengine.core.plugin.CraftEngine;
 import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
 import net.momirealms.craftengine.core.plugin.context.function.Function;
-import net.momirealms.craftengine.core.plugin.event.EventTrigger;
+import net.momirealms.craftengine.core.plugin.context.event.EventTrigger;
 import net.momirealms.craftengine.core.plugin.locale.LocalizedResourceConfigException;
 import net.momirealms.craftengine.core.registry.Holder;
 import net.momirealms.craftengine.core.util.Key;
diff --git a/core/src/main/java/net/momirealms/craftengine/core/block/CustomBlock.java b/core/src/main/java/net/momirealms/craftengine/core/block/CustomBlock.java
index 2e3fb29a7..bbe3d21e7 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/block/CustomBlock.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/block/CustomBlock.java
@@ -5,7 +5,7 @@ import net.momirealms.craftengine.core.item.context.BlockPlaceContext;
 import net.momirealms.craftengine.core.loot.LootTable;
 import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
 import net.momirealms.craftengine.core.plugin.context.function.Function;
-import net.momirealms.craftengine.core.plugin.event.EventTrigger;
+import net.momirealms.craftengine.core.plugin.context.event.EventTrigger;
 import net.momirealms.craftengine.core.util.Key;
 import net.momirealms.sparrow.nbt.CompoundTag;
 import org.jetbrains.annotations.NotNull;
@@ -40,7 +40,7 @@ public interface CustomBlock {
 
     interface Builder {
 
-        Builder events(EnumMap<EventTrigger, List<Function<PlayerOptionalContext>>> events);
+        Builder events(Map<EventTrigger, List<Function<PlayerOptionalContext>>> events);
 
         Builder appearances(Map<String, Integer> appearances);
 
diff --git a/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/CustomFurniture.java b/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/CustomFurniture.java
index 8d2d93885..e1602fd58 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/CustomFurniture.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/CustomFurniture.java
@@ -3,30 +3,27 @@ package net.momirealms.craftengine.core.entity.furniture;
 import net.momirealms.craftengine.core.loot.LootTable;
 import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
 import net.momirealms.craftengine.core.plugin.context.function.Function;
-import net.momirealms.craftengine.core.plugin.event.EventTrigger;
+import net.momirealms.craftengine.core.plugin.context.event.EventTrigger;
 import net.momirealms.craftengine.core.util.Key;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Vector3f;
 
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 public class CustomFurniture {
     private final Key id;
     private final FurnitureSettings settings;
     private final EnumMap<AnchorType, Placement> placements;
     private final AnchorType anyType;
-    private final EnumMap<EventTrigger, List<Function<PlayerOptionalContext>>> events;
+    private final Map<EventTrigger, List<Function<PlayerOptionalContext>>> events;
     @Nullable
     private final LootTable<?> lootTable;
 
     public CustomFurniture(@NotNull Key id,
                            @NotNull FurnitureSettings settings,
                            @NotNull EnumMap<AnchorType, Placement> placements,
-                           @NotNull EnumMap<EventTrigger, List<Function<PlayerOptionalContext>>> events,
+                           @NotNull Map<EventTrigger, List<Function<PlayerOptionalContext>>> events,
                            @Nullable LootTable<?> lootTable) {
         this.id = id;
         this.settings = settings;
diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/AbstractCustomItem.java b/core/src/main/java/net/momirealms/craftengine/core/item/AbstractCustomItem.java
index 7d88df3ad..76e5c0d31 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/item/AbstractCustomItem.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/item/AbstractCustomItem.java
@@ -6,7 +6,7 @@ import net.momirealms.craftengine.core.item.modifier.ItemDataModifier;
 import net.momirealms.craftengine.core.plugin.CraftEngine;
 import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
 import net.momirealms.craftengine.core.plugin.context.function.Function;
-import net.momirealms.craftengine.core.plugin.event.EventTrigger;
+import net.momirealms.craftengine.core.plugin.context.event.EventTrigger;
 import net.momirealms.craftengine.core.registry.Holder;
 import net.momirealms.craftengine.core.util.Key;
 import org.jetbrains.annotations.NotNull;
@@ -23,7 +23,7 @@ public abstract class AbstractCustomItem<I> implements CustomItem<I> {
     protected final NetworkItemDataProcessor<I>[] networkItemDataProcessors;
     protected final List<ItemBehavior> behaviors;
     protected final ItemSettings settings;
-    protected final EnumMap<EventTrigger, List<Function<PlayerOptionalContext>>> events;
+    protected final Map<EventTrigger, List<Function<PlayerOptionalContext>>> events;
     protected final Item<I> base;
 
     @SuppressWarnings("unchecked")
@@ -32,7 +32,7 @@ public abstract class AbstractCustomItem<I> implements CustomItem<I> {
                               List<ItemDataModifier<I>> modifiers,
                               List<ItemDataModifier<I>> clientBoundModifiers,
                               ItemSettings settings,
-                              EnumMap<EventTrigger, List<Function<PlayerOptionalContext>>> events) {
+                              Map<EventTrigger, List<Function<PlayerOptionalContext>>> events) {
         this.id = id;
         this.material = material;
         this.events = events;
diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/AbstractItemManager.java b/core/src/main/java/net/momirealms/craftengine/core/item/AbstractItemManager.java
index 2d746bd2b..9b0b5be71 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/item/AbstractItemManager.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/item/AbstractItemManager.java
@@ -15,7 +15,7 @@ import net.momirealms.craftengine.core.pack.model.select.TrimMaterialSelectPrope
 import net.momirealms.craftengine.core.plugin.CraftEngine;
 import net.momirealms.craftengine.core.plugin.config.Config;
 import net.momirealms.craftengine.core.plugin.config.ConfigParser;
-import net.momirealms.craftengine.core.plugin.event.EventFunctions;
+import net.momirealms.craftengine.core.plugin.context.event.EventFunctions;
 import net.momirealms.craftengine.core.plugin.locale.LocalizedResourceConfigException;
 import net.momirealms.craftengine.core.plugin.locale.TranslationManager;
 import net.momirealms.craftengine.core.registry.BuiltInRegistries;
diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/CustomItem.java b/core/src/main/java/net/momirealms/craftengine/core/item/CustomItem.java
index 783506671..d21ff5693 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/item/CustomItem.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/item/CustomItem.java
@@ -5,7 +5,7 @@ import net.momirealms.craftengine.core.item.behavior.ItemBehavior;
 import net.momirealms.craftengine.core.item.modifier.ItemDataModifier;
 import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
 import net.momirealms.craftengine.core.plugin.context.function.Function;
-import net.momirealms.craftengine.core.plugin.event.EventTrigger;
+import net.momirealms.craftengine.core.plugin.context.event.EventTrigger;
 import net.momirealms.craftengine.core.registry.Holder;
 import net.momirealms.craftengine.core.util.Key;
 import org.jetbrains.annotations.NotNull;
@@ -70,7 +70,7 @@ public interface CustomItem<I> extends BuildableItem<I> {
 
         Builder<I> settings(ItemSettings settings);
 
-        Builder<I> events(EnumMap<EventTrigger, List<Function<PlayerOptionalContext>>> events);
+        Builder<I> events(Map<EventTrigger, List<Function<PlayerOptionalContext>>> events);
 
         CustomItem<I> build();
     }
diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/event/EventConditions.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/event/EventConditions.java
similarity index 98%
rename from core/src/main/java/net/momirealms/craftengine/core/plugin/event/EventConditions.java
rename to core/src/main/java/net/momirealms/craftengine/core/plugin/context/event/EventConditions.java
index b1c578046..5b6adc177 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/plugin/event/EventConditions.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/event/EventConditions.java
@@ -1,4 +1,4 @@
-package net.momirealms.craftengine.core.plugin.event;
+package net.momirealms.craftengine.core.plugin.context.event;
 
 import net.momirealms.craftengine.core.plugin.context.Condition;
 import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/event/EventFunctions.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/event/EventFunctions.java
similarity index 64%
rename from core/src/main/java/net/momirealms/craftengine/core/plugin/event/EventFunctions.java
rename to core/src/main/java/net/momirealms/craftengine/core/plugin/context/event/EventFunctions.java
index 001d58f81..169593072 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/plugin/event/EventFunctions.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/event/EventFunctions.java
@@ -1,4 +1,4 @@
-package net.momirealms.craftengine.core.plugin.event;
+package net.momirealms.craftengine.core.plugin.context.event;
 
 import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
 import net.momirealms.craftengine.core.plugin.context.function.*;
@@ -12,10 +12,7 @@ import net.momirealms.craftengine.core.util.MiscUtils;
 import net.momirealms.craftengine.core.util.ResourceConfigUtils;
 import net.momirealms.craftengine.core.util.ResourceKey;
 
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class EventFunctions {
 
@@ -45,31 +42,15 @@ public class EventFunctions {
         return factory.create(map);
     }
 
-    public static EnumMap<EventTrigger, List<Function<PlayerOptionalContext>>> parseEvents(Object eventsObj) {
+    public static Map<EventTrigger, List<Function<PlayerOptionalContext>>> parseEvents(Object eventsObj) {
+        if (eventsObj == null) return Map.of();
         EnumMap<EventTrigger, List<Function<PlayerOptionalContext>>> events = new EnumMap<>(EventTrigger.class);
         if (eventsObj instanceof Map<?, ?> eventsSection) {
             Map<String, Object> eventsSectionMap = MiscUtils.castToMap(eventsSection, false);
             for (Map.Entry<String, Object> eventEntry : eventsSectionMap.entrySet()) {
                 try {
                     EventTrigger eventTrigger = EventTrigger.byName(eventEntry.getKey());
-                    if (eventEntry.getValue() instanceof List<?> list) {
-                        if (list.size() == 1) {
-                            events.put(eventTrigger, List.of(EventFunctions.fromMap(MiscUtils.castToMap(list.get(0), false))));
-                        } else if (list.size() == 2) {
-                            events.put(eventTrigger, List.of(
-                                    EventFunctions.fromMap(MiscUtils.castToMap(list.get(0), false)),
-                                    EventFunctions.fromMap(MiscUtils.castToMap(list.get(1), false))
-                            ));
-                        } else {
-                            List<Function<PlayerOptionalContext>> eventsList = new ArrayList<>();
-                            for (Object event : list) {
-                                eventsList.add(EventFunctions.fromMap(MiscUtils.castToMap(event, false)));
-                            }
-                            events.put(eventTrigger, eventsList);
-                        }
-                    } else if (eventEntry.getValue() instanceof Map<?, ?> eventSection) {
-                        events.put(eventTrigger, List.of(EventFunctions.fromMap(MiscUtils.castToMap(eventSection, false))));
-                    }
+                    events.put(eventTrigger, ResourceConfigUtils.parseConfigAsList(eventEntry.getValue(), EventFunctions::fromMap));
                 } catch (IllegalArgumentException e) {
                     throw new LocalizedResourceConfigException("warning.config.event.invalid_trigger", eventEntry.getKey());
                 }
@@ -78,24 +59,17 @@ public class EventFunctions {
             @SuppressWarnings("unchecked")
             List<Map<String, Object>> eventsList = (List<Map<String, Object>>) list;
             for (Map<String, Object> eventSection : eventsList) {
-                Object onObj = eventSection.get("on");
-                if (onObj == null) {
-                    throw new LocalizedResourceConfigException("warning.config.event.missing_trigger");
-                }
+                String on = ResourceConfigUtils.requireNonEmptyStringOrThrow(eventSection.get("on"), "warning.config.event.missing_trigger");
                 try {
-                    EventTrigger eventTrigger = EventTrigger.byName(onObj.toString());
+                    EventTrigger eventTrigger = EventTrigger.byName(on);
                     if (eventSection.containsKey("type")) {
                         Function<PlayerOptionalContext> function = EventFunctions.fromMap(eventSection);
                         events.computeIfAbsent(eventTrigger, k -> new ArrayList<>(4)).add(function);
                     } else if (eventSection.containsKey("functions")) {
-                        @SuppressWarnings("unchecked")
-                        List<Map<String, Object>> functionList = (List<Map<String, Object>>) eventSection.get("functions");
-                        for (Map<String, Object> function : functionList) {
-                            events.computeIfAbsent(eventTrigger, k -> new ArrayList<>(4)).add(EventFunctions.fromMap(function));
-                        }
+                        events.computeIfAbsent(eventTrigger, k -> new ArrayList<>(4)).add(Objects.requireNonNull(BuiltInRegistries.EVENT_FUNCTION_FACTORY.getValue(CommonFunctions.RUN)).create(eventSection));
                     }
                 } catch (IllegalArgumentException e) {
-                    throw new LocalizedResourceConfigException("warning.config.event.invalid_trigger", onObj.toString());
+                    throw new LocalizedResourceConfigException("warning.config.event.invalid_trigger", on);
                 }
             }
         }
diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/event/EventTrigger.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/event/EventTrigger.java
similarity index 93%
rename from core/src/main/java/net/momirealms/craftengine/core/plugin/event/EventTrigger.java
rename to core/src/main/java/net/momirealms/craftengine/core/plugin/context/event/EventTrigger.java
index 8c7060079..7e5f3c882 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/plugin/event/EventTrigger.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/event/EventTrigger.java
@@ -1,4 +1,4 @@
-package net.momirealms.craftengine.core.plugin.event;
+package net.momirealms.craftengine.core.plugin.context.event;
 
 import java.util.HashMap;
 import java.util.Map;