diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 36630be..147fee4 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,5 +1,6 @@
 Ubpa_AddTarget(
   MODE STATIC
+  RET_TARGET_NAME tname
   SOURCE
     "${PROJECT_SOURCE_DIR}/include/UECS"
   LIB
@@ -8,3 +9,5 @@ Ubpa_AddTarget(
   INC
     "${PROJECT_SOURCE_DIR}/include"
 )
+
+target_precompile_headers(${tname} PRIVATE "${PROJECT_SOURCE_DIR}/include/UECS/World.h")
diff --git a/src/test/00_basic/CMakeLists.txt b/src/test/00_basic/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/00_basic/CMakeLists.txt
+++ b/src/test/00_basic/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/01_tag/CMakeLists.txt b/src/test/01_tag/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/01_tag/CMakeLists.txt
+++ b/src/test/01_tag/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/02_order/CMakeLists.txt b/src/test/02_order/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/02_order/CMakeLists.txt
+++ b/src/test/02_order/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/03_query_entity/CMakeLists.txt b/src/test/03_query_entity/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/03_query_entity/CMakeLists.txt
+++ b/src/test/03_query_entity/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/04_filter/CMakeLists.txt b/src/test/04_filter/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/04_filter/CMakeLists.txt
+++ b/src/test/04_filter/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/05_alignment/CMakeLists.txt b/src/test/05_alignment/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/05_alignment/CMakeLists.txt
+++ b/src/test/05_alignment/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/06_none_parallel/CMakeLists.txt b/src/test/06_none_parallel/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/06_none_parallel/CMakeLists.txt
+++ b/src/test/06_none_parallel/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/07_overload/CMakeLists.txt b/src/test/07_overload/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/07_overload/CMakeLists.txt
+++ b/src/test/07_overload/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/08_job/CMakeLists.txt b/src/test/08_job/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/08_job/CMakeLists.txt
+++ b/src/test/08_job/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/10_instantiate/CMakeLists.txt b/src/test/10_instantiate/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/10_instantiate/CMakeLists.txt
+++ b/src/test/10_instantiate/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/11_runtime_cmpt/CMakeLists.txt b/src/test/11_runtime_cmpt/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/11_runtime_cmpt/CMakeLists.txt
+++ b/src/test/11_runtime_cmpt/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/12_framegraph/CMakeLists.txt b/src/test/12_framegraph/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/12_framegraph/CMakeLists.txt
+++ b/src/test/12_framegraph/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/13_performance/CMakeLists.txt b/src/test/13_performance/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/13_performance/CMakeLists.txt
+++ b/src/test/13_performance/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/14_serialize/CMakeLists.txt b/src/test/14_serialize/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/14_serialize/CMakeLists.txt
+++ b/src/test/14_serialize/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/15_chunk_job/CMakeLists.txt b/src/test/15_chunk_job/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/15_chunk_job/CMakeLists.txt
+++ b/src/test/15_chunk_job/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/16_singleton/CMakeLists.txt b/src/test/16_singleton/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/16_singleton/CMakeLists.txt
+++ b/src/test/16_singleton/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/17_serial/CMakeLists.txt b/src/test/17_serial/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/17_serial/CMakeLists.txt
+++ b/src/test/17_serial/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/18_copy/CMakeLists.txt b/src/test/18_copy/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/18_copy/CMakeLists.txt
+++ b/src/test/18_copy/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/19_direct_run/CMakeLists.txt b/src/test/19_direct_run/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/19_direct_run/CMakeLists.txt
+++ b/src/test/19_direct_run/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/20_system_lifecycle/CMakeLists.txt b/src/test/20_system_lifecycle/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/20_system_lifecycle/CMakeLists.txt
+++ b/src/test/20_system_lifecycle/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)
diff --git a/src/test/21_random/CMakeLists.txt b/src/test/21_random/CMakeLists.txt
index ec4a795..9c1502e 100644
--- a/src/test/21_random/CMakeLists.txt
+++ b/src/test/21_random/CMakeLists.txt
@@ -1,6 +1,8 @@
-Ubpa_GetTargetName(core "${PROJECT_SOURCE_DIR}/src/core")
 Ubpa_AddTarget(
   TEST
+  RET_TARGET_NAME tname
   MODE EXE
-  LIB ${core}
+  LIB
+    Ubpa::UECS_core
 )
+target_precompile_headers(${tname} REUSE_FROM UECS_core)