diff --git a/include/UECS/AccessTypeID.h b/include/UECS/AccessTypeID.h
index 26cb95a..38e7e9f 100644
--- a/include/UECS/AccessTypeID.h
+++ b/include/UECS/AccessTypeID.h
@@ -6,7 +6,7 @@
 
 #include <UTemplate/Type.hpp>
 
-#include <set>
+#include <USmallFlat/small_flat_set.hpp>
 
 namespace Ubpa::UECS {
 	// TypeID with AccessMode
@@ -28,7 +28,7 @@ namespace Ubpa::UECS {
 	template<typename Cmpt>
 	static constexpr AccessTypeID AccessTypeID_of = { TypeID_of<RemoveTag_t<Cmpt>>, AccessMode_of<Cmpt> };
 
-	using AccessTypeIDSet = std::set<AccessTypeID, std::less<>>;
+	using AccessTypeIDSet = small_flat_set<AccessTypeID, 16, std::less<>>;
 }
 
 template<>
diff --git a/include/UECS/ArchetypeFilter.h b/include/UECS/ArchetypeFilter.h
index 5052b5c..929f408 100644
--- a/include/UECS/ArchetypeFilter.h
+++ b/include/UECS/ArchetypeFilter.h
@@ -2,14 +2,12 @@
 
 #include "AccessTypeID.h"
 
-#include <set>
-
 namespace Ubpa::UECS {
 	// filter Archetype with all, any and none
 	struct ArchetypeFilter {
 		AccessTypeIDSet all;
 		AccessTypeIDSet any;
-		std::set<TypeID> none;
+		small_flat_set<TypeID> none;
 
 		std::size_t GetValue() const noexcept;
 
diff --git a/include/UECS/Schedule.h b/include/UECS/Schedule.h
index dbdef9c..1d7f4a5 100644
--- a/include/UECS/Schedule.h
+++ b/include/UECS/Schedule.h
@@ -108,8 +108,8 @@ namespace Ubpa::UECS {
 		std::unordered_map<std::size_t, std::size_t> sysFuncOrder;
 
 		struct FilterChange {
-			std::set<TypeID> insertNones;
-			std::set<TypeID> eraseNones;
+			small_flat_set<TypeID> insertNones;
+			small_flat_set<TypeID> eraseNones;
 		};
 		std::unordered_map<std::size_t, FilterChange> sysFilterChange;
 
diff --git a/include/UECS/details/TypeIDSet.h b/include/UECS/details/TypeIDSet.h
index 234d5ea..d2c52d7 100644
--- a/include/UECS/details/TypeIDSet.h
+++ b/include/UECS/details/TypeIDSet.h
@@ -2,13 +2,9 @@
 
 #include "../EntityQuery.h"
 
-#include <span>
-
-#include <set>
-
 namespace Ubpa::UECS {
 	struct TypeIDSet {
-		std::set<TypeID> data;
+		small_flat_set<TypeID> data;
 
 		std::size_t GetValue() const noexcept;
 
diff --git a/src/app/CmptHashCode/main.cpp b/src/app/CmptHashCode/main.cpp
index 553c231..b25ff3d 100644
--- a/src/app/CmptHashCode/main.cpp
+++ b/src/app/CmptHashCode/main.cpp
@@ -1,4 +1,4 @@
-#include <UTemplate/Type.h>
+#include <UTemplate/Type.hpp>
 
 #include <iostream>
 
diff --git a/src/test/12_framegraph/main.cpp b/src/test/12_framegraph/main.cpp
index fc46aa6..d571e96 100644
--- a/src/test/12_framegraph/main.cpp
+++ b/src/test/12_framegraph/main.cpp
@@ -31,18 +31,9 @@ struct MySystem {
 
 int main() {
 	World w;
+	w.entityMngr.cmptTraits.Register<A, B, C, D, E, F, G>();
 	w.systemMngr.RegisterAndActivate<MySystem>();
 
-	w.entityMngr.cmptTraits
-		.RegisterName(Type_of<A>)
-		.RegisterName(Type_of<B>)
-		.RegisterName(Type_of<C>)
-		.RegisterName(Type_of<D>)
-		.RegisterName(Type_of<E>)
-		.RegisterName(Type_of<F>)
-		.RegisterName(Type_of<G>)
-		;
-
 	w.entityMngr.Create(Ubpa::TypeIDs_of<A, B, C, D, E>);
 	w.Update();