diff --git a/jecs/build.txt b/jecs/build.txt
index 26a4baa..df2f1ec 100644
--- a/jecs/build.txt
+++ b/jecs/build.txt
@@ -1,2 +1,2 @@
-modified = ["CHANGELOG.md"]
-version = "0.6.0-nightly.20250511T001101Z"
+modified = ["jecs.luau"]
+version = "0.6.0-nightly.20250517T001101Z"
diff --git a/jecs/jecs.luau b/jecs/jecs.luau
index f705f0e..7f47472 100644
--- a/jecs/jecs.luau
+++ b/jecs/jecs.luau
@@ -2650,10 +2650,10 @@ return {
 	tag = (ECS_TAG :: any) :: <T>() -> Entity<T>,
 	meta = (ECS_META :: any) :: <T>(id: Entity, id: Id<T>, value: T) -> Entity<T>,
 	is_tag = (ecs_is_tag :: any) :: <T>(World, Id<T>) -> boolean,
-
-	OnAdd = EcsOnAdd :: Entity<(entity: Entity) -> ()>,
-	OnRemove = EcsOnRemove :: Entity<(entity: Entity) -> ()>,
-	OnChange = EcsOnChange :: Entity<(entity: Entity, data: any) -> ()>,
+	
+    OnAdd = EcsOnAdd :: Entity<<T>(entity: Entity, id: Id<T>, data: T) -> ()>,
+	OnRemove = EcsOnRemove :: Entity<(entity: Entity, id: Id) -> ()>,
+	OnChange = EcsOnChange :: Entity<<T>(entity: Entity, id: Id<T>, data: T) -> ()>,
 	ChildOf = EcsChildOf :: Entity,
 	Component = EcsComponent :: Entity,
 	Wildcard = EcsWildcard :: Entity,
diff --git a/jecs/pesde-rbx.toml b/jecs/pesde-rbx.toml
index ff61ec5..495083b 100644
--- a/jecs/pesde-rbx.toml
+++ b/jecs/pesde-rbx.toml
@@ -3,7 +3,7 @@ includes = ["init.luau", "pesde.toml", "README.md", "CHANGELOG.md", "LICENSE", "
 license = "MIT"
 name = "marked/jecs_nightly"
 repository = "https://git.devmarked.win/marked/jecs-nightly"
-version = "0.6.0-nightly.20250511T001101Z"
+version = "0.6.0-nightly.20250517T001101Z"
 
 [indices]
 default = "https://github.com/pesde-pkg/index"
diff --git a/jecs/pesde.toml b/jecs/pesde.toml
index e5f0dcf..ae74a14 100644
--- a/jecs/pesde.toml
+++ b/jecs/pesde.toml
@@ -3,7 +3,7 @@ includes = ["init.luau", "pesde.toml", "README.md", "CHANGELOG.md", "LICENSE", "
 license = "MIT"
 name = "marked/jecs_nightly"
 repository = "https://git.devmarked.win/marked/jecs-nightly"
-version = "0.6.0-nightly.20250511T001101Z"
+version = "0.6.0-nightly.20250517T001101Z"
 
 [indices]
 default = "https://github.com/pesde-pkg/index"
diff --git a/jecs/test.txt b/jecs/test.txt
index 9c153bb..a948a92 100644
--- a/jecs/test.txt
+++ b/jecs/test.txt
@@ -1,2 +1,2 @@
 passed = true
-timestamp = "20250516T001102Z"
+timestamp = "20250518T001104Z"
diff --git a/jecs/test_fulllog.txt b/jecs/test_fulllog.txt
index 1801c9f..cab8c16 100644
--- a/jecs/test_fulllog.txt
+++ b/jecs/test_fulllog.txt
@@ -1,5 +1,5 @@
-[38;1m 12[0m [33;1mus[0m [38;1m  3[0m [33;1mkB[0m[38;1m│[0m [38;1mdelete children of entity[0m
-[38;1m9.1[0m [33;1mus[0m [38;1m  1[0m [33;1mkB[0m[38;1m│[0m [38;1mremove friends of entity[0m
+[38;1m7.3[0m [33;1mus[0m [38;1m  3[0m [33;1mkB[0m[38;1m│[0m [38;1mdelete children of entity[0m
+[38;1m9.3[0m [33;1mus[0m [38;1m  1[0m [33;1mkB[0m[38;1m│[0m [38;1mremove friends of entity[0m
 [38;1m348[0m [32;1mns[0m [38;1m 10[0m [32;1m B[0m[38;1m│[0m [38;1msimple deletion of entity[0m
 [37;1mrepro[0m
 [38;5;208mNONE[0m[38;1m│[0m [38;1m[0m
@@ -121,5 +121,5 @@
 [32;1mPASS[0m[38;1m│[0m [38;1m#2[0m
 [32;1mPASS[0m[38;1m│[0m [38;1m#3[0m
 
-[38;1m74/74 test cases passed in 32.738 ms.[0m
+[38;1m74/74 test cases passed in 32.645 ms.[0m
 [32;1m0 fails[0m
diff --git a/jecs/wally.toml b/jecs/wally.toml
index 2b85107..81b25d6 100644
--- a/jecs/wally.toml
+++ b/jecs/wally.toml
@@ -5,4 +5,4 @@ license = "MIT"
 name = "mark-marks/jecs-nightly"
 realm = "shared"
 registry = "https://github.com/UpliftGames/wally-index"
-version = "0.6.0-nightly.20250511T001101Z"
+version = "0.6.0-nightly.20250517T001101Z"
