diff --git a/Cargo.lock b/Cargo.lock
index 72e3e84..2291b4c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -317,9 +317,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.7"
+version = "4.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b"
+checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -327,9 +327,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.7"
+version = "4.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663"
+checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc"
 dependencies = [
  "anstream",
  "anstyle",
@@ -343,7 +343,7 @@ version = "4.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae"
 dependencies = [
- "clap 4.4.7",
+ "clap 4.4.8",
 ]
 
 [[package]]
@@ -818,9 +818,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f95b9abcae896730d42b78e09c155ed4ddf82c07b4de772c64aee5b2d8b7c150"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
 dependencies = [
  "bytes",
  "fnv",
@@ -1492,9 +1492,9 @@ dependencies = [
 
 [[package]]
 name = "preserves-schema"
-version = "4.992.0"
+version = "5.992.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "664ffedfcc230ae69a43aecee85aee6d634be501f96928d12ec875e6d3d9533d"
+checksum = "ff2774b8d2df1924ffcac0afe9526b8d8c35841af18ae42879c18e0f9df8b45c"
 dependencies = [
  "convert_case",
  "glob",
@@ -1956,7 +1956,7 @@ dependencies = [
 name = "syndicate-tools"
 version = "0.9.0"
 dependencies = [
- "clap 4.4.7",
+ "clap 4.4.8",
  "clap_complete",
  "noise-protocol",
  "noise-rust-crypto",
diff --git a/syndicate-schema-plugin/Cargo.toml b/syndicate-schema-plugin/Cargo.toml
index 6c41ec6..cbcd9ee 100644
--- a/syndicate-schema-plugin/Cargo.toml
+++ b/syndicate-schema-plugin/Cargo.toml
@@ -12,7 +12,7 @@ license = "Apache-2.0"
 [lib]
 
 [dependencies]
-preserves-schema = "4.992.0"
+preserves-schema = "5.992"
 syndicate = { path = "../syndicate", version = "0.31.0"}
 
 [package.metadata.workspaces]
diff --git a/syndicate-server/Cargo.toml b/syndicate-server/Cargo.toml
index 454495b..c946176 100644
--- a/syndicate-server/Cargo.toml
+++ b/syndicate-server/Cargo.toml
@@ -13,12 +13,12 @@ license = "Apache-2.0"
 jemalloc = ["dep:tikv-jemallocator"]
 
 [build-dependencies]
-preserves-schema = "4.992"
+preserves-schema = "5.992"
 syndicate = { path = "../syndicate", version = "0.31.0"}
 syndicate-schema-plugin = { path = "../syndicate-schema-plugin", version = "0.2.0"}
 
 [dependencies]
-preserves-schema = "4.992"
+preserves-schema = "5.992"
 syndicate = { path = "../syndicate", version = "0.31.0"}
 syndicate-macros = { path = "../syndicate-macros", version = "0.25.0"}
 
diff --git a/syndicate-server/build.rs b/syndicate-server/build.rs
index 86a8730..7c6e575 100644
--- a/syndicate-server/build.rs
+++ b/syndicate-server/build.rs
@@ -6,7 +6,7 @@ fn main() -> std::io::Result<()> {
     let mut gen_dir = buildroot.clone();
     gen_dir.push("src/schemas");
 
-    let mut c = CompilerConfig::new(gen_dir, "crate::schemas".to_owned());
+    let mut c = CompilerConfig::new("crate::schemas".to_owned());
     c.plugins.push(Box::new(syndicate_schema_plugin::PatternPlugin));
     c.add_external_module(ExternalModule::new(vec!["EntityRef".to_owned()], "syndicate::actor"));
     c.add_external_module(
@@ -28,5 +28,5 @@ fn main() -> std::io::Result<()> {
     let inputs = expand_inputs(&vec!["protocols/schema-bundle.bin".to_owned()])?;
     c.load_schemas_and_bundles(&inputs, &vec![])?;
     c.load_xref_bin("syndicate", syndicate::schemas::_bundle())?;
-    compile(&c)
+    compile(&c, &mut CodeCollector::files(gen_dir))
 }
diff --git a/syndicate/Cargo.toml b/syndicate/Cargo.toml
index ea303cb..e0cd08a 100644
--- a/syndicate/Cargo.toml
+++ b/syndicate/Cargo.toml
@@ -13,11 +13,11 @@ license = "Apache-2.0"
 vendored-openssl = ["openssl/vendored"]
 
 [build-dependencies]
-preserves-schema = "4.992"
+preserves-schema = "5.992"
 
 [dependencies]
 preserves = "4.992"
-preserves-schema = "4.992"
+preserves-schema = "5.992"
 
 tokio = { version = "1.10", features = ["io-util", "macros", "rt", "rt-multi-thread", "time"] }
 tokio-util = "0.6"
diff --git a/syndicate/build.rs b/syndicate/build.rs
index 7e7b81e..9a8daf1 100644
--- a/syndicate/build.rs
+++ b/syndicate/build.rs
@@ -26,11 +26,11 @@ fn main() -> std::io::Result<()> {
     let mut gen_dir = buildroot.clone();
     gen_dir.push("src/schemas");
 
-    let mut c = CompilerConfig::new(gen_dir, "crate::schemas".to_owned());
+    let mut c = CompilerConfig::new("crate::schemas".to_owned());
     c.plugins.push(Box::new(syndicate_plugins::PatternPlugin));
     c.add_external_module(ExternalModule::new(vec!["EntityRef".to_owned()], "crate::actor"));
 
     let inputs = expand_inputs(&vec!["protocols/schema-bundle.bin".to_owned()])?;
     c.load_schemas_and_bundles(&inputs, &vec![])?;
-    compile(&c)
+    compile(&c, &mut CodeCollector::files(gen_dir))
 }