diff --git a/src/main/java/dev/zenfyr/commander/api/expression/ExpressionLibrary.java b/src/main/java/dev/zenfyr/commander/api/expression/ExpressionLibrary.java
index 33f4d7e..d893a0b 100644
--- a/src/main/java/dev/zenfyr/commander/api/expression/ExpressionLibrary.java
+++ b/src/main/java/dev/zenfyr/commander/api/expression/ExpressionLibrary.java
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.UnmodifiableView;
 public interface ExpressionLibrary {
 
   static ExpressionLibrary get(MinecraftServer server) {
-    return server.pulsar$getReloader(ExpressionLibraryLoader.RELOADER);
+    return server.pulsar$getReloadListener(ExpressionLibraryLoader.RELOADER);
   }
 
   /**
diff --git a/src/main/java/dev/zenfyr/commander/impl/Commander.java b/src/main/java/dev/zenfyr/commander/impl/Commander.java
index 37ab4fc..58658a3 100644
--- a/src/main/java/dev/zenfyr/commander/impl/Commander.java
+++ b/src/main/java/dev/zenfyr/commander/impl/Commander.java
@@ -8,9 +8,9 @@ import dev.zenfyr.commander.impl.expression.extension.ExpressionLootCondition;
 import dev.zenfyr.commander.impl.expression.extension.ExpressionLootNumberProvider;
 import dev.zenfyr.commander.impl.expression.library.ExpressionLibraryLoader;
 import dev.zenfyr.commander.impl.util.NbtCodecs;
-import dev.zenfyr.pulsar.codec.ExtraCodecs;
-import dev.zenfyr.pulsar.resources.ServerReloadersEvent;
-import dev.zenfyr.pulsar.util.TextUtil;
+import dev.zenfyr.pulsar.api.codec.ExtraCodecs;
+import dev.zenfyr.pulsar.api.resources.ServerReloadListenersEvent;
+import dev.zenfyr.pulsar.api.util.TextUtil;
 import java.util.List;
 import lombok.experimental.Accessors;
 import net.fabricmc.api.ModInitializer;
@@ -60,9 +60,9 @@ public class Commander implements ModInitializer {
   }
 
   public void onInitialize() {
-    ServerReloadersEvent.EVENT.register(context -> {
+    ServerReloadListenersEvent.EVENT.listen(context -> {
       this.resetCaches();
-      context.register(new ExpressionLibraryLoader());
+      context.register(ExpressionLibraryLoader.RELOADER.location(), new ExpressionLibraryLoader());
     });
 
     ServerLifecycleEvents.SERVER_STOPPING.register(server -> this.resetCaches());
diff --git a/src/main/java/dev/zenfyr/commander/impl/brigadier/DataCommand.java b/src/main/java/dev/zenfyr/commander/impl/brigadier/DataCommand.java
index 68b93c8..0b5d6e9 100644
--- a/src/main/java/dev/zenfyr/commander/impl/brigadier/DataCommand.java
+++ b/src/main/java/dev/zenfyr/commander/impl/brigadier/DataCommand.java
@@ -16,9 +16,9 @@ import dev.zenfyr.commander.impl.Commander;
 import dev.zenfyr.commander.impl.expression.CmdEvalException;
 import dev.zenfyr.commander.impl.expression.library.ExpressionLibraryLoader;
 import dev.zenfyr.commander.impl.util.DataTarget;
-import dev.zenfyr.pulsar.loot.LootContextBuilder;
-import dev.zenfyr.pulsar.util.MakeSure;
-import dev.zenfyr.pulsar.util.TextUtil;
+import dev.zenfyr.pulsar.api.loot.LootContextBuilder;
+import dev.zenfyr.pulsar.api.util.MakeSure;
+import dev.zenfyr.pulsar.api.util.TextUtil;
 import java.util.Locale;
 import java.util.function.BiFunction;
 import net.fabricmc.fabric.api.attachment.v1.AttachmentTarget;
diff --git a/src/main/java/dev/zenfyr/commander/impl/brigadier/ExpressionCommand.java b/src/main/java/dev/zenfyr/commander/impl/brigadier/ExpressionCommand.java
index 40afd02..157f936 100644
--- a/src/main/java/dev/zenfyr/commander/impl/brigadier/ExpressionCommand.java
+++ b/src/main/java/dev/zenfyr/commander/impl/brigadier/ExpressionCommand.java
@@ -14,7 +14,7 @@ import dev.zenfyr.commander.api.expression.ExpressionLibrary;
 import dev.zenfyr.commander.impl.Commander;
 import dev.zenfyr.commander.impl.expression.CmdEvalException;
 import dev.zenfyr.commander.impl.expression.library.ExpressionLibraryLoader;
-import dev.zenfyr.pulsar.loot.LootContextBuilder;
+import dev.zenfyr.pulsar.api.loot.LootContextBuilder;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.StringJoiner;
diff --git a/src/main/java/dev/zenfyr/commander/impl/expression/EvalUtils.java b/src/main/java/dev/zenfyr/commander/impl/expression/EvalUtils.java
index 513b815..79d068b 100644
--- a/src/main/java/dev/zenfyr/commander/impl/expression/EvalUtils.java
+++ b/src/main/java/dev/zenfyr/commander/impl/expression/EvalUtils.java
@@ -16,8 +16,8 @@ import dev.zenfyr.commander.impl.expression.conversion.ReflectiveValueConverter;
 import dev.zenfyr.commander.impl.expression.function.*;
 import dev.zenfyr.commander.impl.expression.function.ArrayOf;
 import dev.zenfyr.commander.impl.expression.operator.SafeOrOperator;
-import dev.zenfyr.pulsar.util.ExceptionUtil;
-import dev.zenfyr.pulsar.util.functions.Memoize;
+import dev.zenfyr.pulsar.api.util.ExceptionUtil;
+import dev.zenfyr.pulsar.api.util.functions.Memoize;
 import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap;
 import java.util.*;
 import java.util.function.Function;
diff --git a/src/main/java/dev/zenfyr/commander/impl/expression/ExtractionTypes.java b/src/main/java/dev/zenfyr/commander/impl/expression/ExtractionTypes.java
index 4a0fae0..ca44c9f 100644
--- a/src/main/java/dev/zenfyr/commander/impl/expression/ExtractionTypes.java
+++ b/src/main/java/dev/zenfyr/commander/impl/expression/ExtractionTypes.java
@@ -3,7 +3,7 @@ package dev.zenfyr.commander.impl.expression;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.mojang.serialization.Codec;
-import dev.zenfyr.pulsar.codec.ExtraCodecs;
+import dev.zenfyr.pulsar.api.codec.ExtraCodecs;
 import lombok.NonNull;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParam;
diff --git a/src/main/java/dev/zenfyr/commander/impl/expression/adapter/ReflectiveTypeAdapter.java b/src/main/java/dev/zenfyr/commander/impl/expression/adapter/ReflectiveTypeAdapter.java
index 6c46962..650c384 100644
--- a/src/main/java/dev/zenfyr/commander/impl/expression/adapter/ReflectiveTypeAdapter.java
+++ b/src/main/java/dev/zenfyr/commander/impl/expression/adapter/ReflectiveTypeAdapter.java
@@ -6,7 +6,7 @@ import com.ezylang.evalex.data.EvaluationValue;
 import com.ezylang.evalex.data.adapter.TypeAdapter;
 import com.ezylang.evalex.data.adapter.context.MethodAdapterContext;
 import com.ezylang.evalex.data.adapter.context.PropertyAdapterContext;
-import dev.zenfyr.pulsar.util.functions.ThrowingSupplier;
+import dev.zenfyr.pulsar.api.util.functions.ThrowingSupplier;
 import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap;
 import java.lang.invoke.*;
 import java.lang.reflect.Method;
diff --git a/src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/ListAdapter.java b/src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/ListAdapter.java
index 2cdd4ff..322a6c2 100644
--- a/src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/ListAdapter.java
+++ b/src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/ListAdapter.java
@@ -9,8 +9,8 @@ import com.ezylang.evalex.data.EvaluationValue;
 import com.ezylang.evalex.data.adapter.TypeAdapter;
 import com.ezylang.evalex.data.adapter.context.MethodAdapterContext;
 import com.google.common.collect.Lists;
-import dev.zenfyr.pulsar.util.ExceptionUtil;
-import dev.zenfyr.pulsar.util.Utilities;
+import dev.zenfyr.pulsar.api.util.ExceptionUtil;
+import dev.zenfyr.pulsar.api.util.Utilities;
 import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/StringAdapter.java b/src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/StringAdapter.java
index b1f6a23..81531ec 100644
--- a/src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/StringAdapter.java
+++ b/src/main/java/dev/zenfyr/commander/impl/expression/adapter/core/StringAdapter.java
@@ -9,7 +9,7 @@ import com.ezylang.evalex.data.adapter.context.IndexAdapterContext;
 import com.ezylang.evalex.data.adapter.context.MethodAdapterContext;
 import com.ezylang.evalex.functions.string.StringFormatFunction;
 import dev.zenfyr.commander.impl.Commander;
-import dev.zenfyr.pulsar.util.Utilities;
+import dev.zenfyr.pulsar.api.util.Utilities;
 import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap;
 import java.util.ArrayList;
 import java.util.IllegalFormatException;
diff --git a/src/main/java/dev/zenfyr/commander/impl/expression/function/math/RangedRandomFunction.java b/src/main/java/dev/zenfyr/commander/impl/expression/function/math/RangedRandomFunction.java
index fd25f42..b465997 100644
--- a/src/main/java/dev/zenfyr/commander/impl/expression/function/math/RangedRandomFunction.java
+++ b/src/main/java/dev/zenfyr/commander/impl/expression/function/math/RangedRandomFunction.java
@@ -7,7 +7,7 @@ import com.ezylang.evalex.data.number.NumberValue;
 import com.ezylang.evalex.functions.AbstractFunction;
 import com.ezylang.evalex.functions.FunctionParameter;
 import com.ezylang.evalex.parser.Token;
-import dev.zenfyr.pulsar.util.MathUtil;
+import dev.zenfyr.pulsar.api.util.MathUtil;
 
 @FunctionParameter(name = "min")
 @FunctionParameter(name = "max")
diff --git a/src/main/java/dev/zenfyr/commander/impl/expression/library/ExpressionLibraryLoader.java b/src/main/java/dev/zenfyr/commander/impl/expression/library/ExpressionLibraryLoader.java
index 6de07f6..f106cef 100644
--- a/src/main/java/dev/zenfyr/commander/impl/expression/library/ExpressionLibraryLoader.java
+++ b/src/main/java/dev/zenfyr/commander/impl/expression/library/ExpressionLibraryLoader.java
@@ -11,9 +11,9 @@ import com.mojang.serialization.codecs.RecordCodecBuilder;
 import dev.zenfyr.commander.api.expression.Expression;
 import dev.zenfyr.commander.api.expression.ExpressionLibrary;
 import dev.zenfyr.commander.impl.Commander;
-import dev.zenfyr.pulsar.codec.JsonCodecDataLoader;
-import dev.zenfyr.pulsar.resources.ReloaderType;
-import dev.zenfyr.pulsar.util.TextUtil;
+import dev.zenfyr.pulsar.api.codec.JsonCodecDataLoader;
+import dev.zenfyr.pulsar.api.resources.ReloadListenerType;
+import dev.zenfyr.pulsar.api.util.TextUtil;
 import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap;
 import java.util.Collections;
 import java.util.Map;
@@ -30,8 +30,8 @@ public class ExpressionLibraryLoader extends JsonCodecDataLoader<ExpressionLibra
       new DynamicCommandExceptionType(
           object -> TextUtil.literal("No such expression in library %s!".formatted(object)));
 
-  public static final ReloaderType<ExpressionLibraryLoader> RELOADER =
-      ReloaderType.create(Commander.id("expression_library"));
+  public static final ReloadListenerType<ExpressionLibraryLoader> RELOADER =
+      ReloadListenerType.create(Commander.id("expression_library"));
 
   private Map<ResourceLocation, Expression> library = new Object2ReferenceOpenHashMap<>();
   private Map<String, Supplier<Expression>> cache = new Object2ReferenceOpenHashMap<>();
diff --git a/src/main/java/dev/zenfyr/commander/impl/mixin/ExecuteCommandMixin.java b/src/main/java/dev/zenfyr/commander/impl/mixin/ExecuteCommandMixin.java
index a4b084e..1971905 100644
--- a/src/main/java/dev/zenfyr/commander/impl/mixin/ExecuteCommandMixin.java
+++ b/src/main/java/dev/zenfyr/commander/impl/mixin/ExecuteCommandMixin.java
@@ -9,7 +9,7 @@ import dev.zenfyr.commander.api.expression.Expression;
 import dev.zenfyr.commander.api.expression.ExpressionLibrary;
 import dev.zenfyr.commander.impl.Commander;
 import dev.zenfyr.commander.impl.expression.library.ExpressionLibraryLoader;
-import dev.zenfyr.pulsar.loot.LootContextBuilder;
+import dev.zenfyr.pulsar.api.loot.LootContextBuilder;
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
diff --git a/src/main/java/dev/zenfyr/commander/impl/mixin/ScoreboardCommandMixin.java b/src/main/java/dev/zenfyr/commander/impl/mixin/ScoreboardCommandMixin.java
index 7b99eed..159f4eb 100644
--- a/src/main/java/dev/zenfyr/commander/impl/mixin/ScoreboardCommandMixin.java
+++ b/src/main/java/dev/zenfyr/commander/impl/mixin/ScoreboardCommandMixin.java
@@ -10,7 +10,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import dev.zenfyr.commander.api.expression.Expression;
 import dev.zenfyr.commander.api.expression.ExpressionLibrary;
 import dev.zenfyr.commander.impl.Commander;
-import dev.zenfyr.pulsar.loot.LootContextBuilder;
+import dev.zenfyr.pulsar.api.loot.LootContextBuilder;
 import java.util.ArrayList;
 import java.util.Collections;
 import net.minecraft.commands.CommandSourceStack;
diff --git a/src/testmod/java/dev/zenfyr/commander/test/ExpressionTest.java b/src/testmod/java/dev/zenfyr/commander/test/ExpressionTest.java
index dda7044..398006d 100644
--- a/src/testmod/java/dev/zenfyr/commander/test/ExpressionTest.java
+++ b/src/testmod/java/dev/zenfyr/commander/test/ExpressionTest.java
@@ -2,7 +2,7 @@ package dev.zenfyr.commander.test;
 
 import com.ezylang.evalex.data.EvaluationValue;
 import dev.zenfyr.commander.api.expression.Expression;
-import dev.zenfyr.pulsar.loot.LootContextBuilder;
+import dev.zenfyr.pulsar.api.loot.LootContextBuilder;
 import java.util.Map;
 import net.fabricmc.fabric.api.gametest.v1.FabricGameTest;
 import net.minecraft.gametest.framework.GameTest;