diff --git a/cheat-library/res/icons/Avatar.png b/cheat-library/res/icons/Avatar.png
new file mode 100644
index 0000000..227affc
Binary files /dev/null and b/cheat-library/res/icons/Avatar.png differ
diff --git a/cheat-library/res/icons/Npc.png b/cheat-library/res/icons/Npc.png
new file mode 100644
index 0000000..8586d1e
Binary files /dev/null and b/cheat-library/res/icons/Npc.png differ
diff --git a/cheat-library/res/res.rc b/cheat-library/res/res.rc
index ca167ba..e8945e0 100644
--- a/cheat-library/res/res.rc
+++ b/cheat-library/res/res.rc
@@ -668,6 +668,10 @@ ARCHAICSTONE            PNG                     "icons\\ArchaicStone.png"
 
 ARTIFACT                PNG                     "icons\\Artifact.png"
 
+AVATAROWN              PNG                     "icons\\Avatar.png"
+
+AVATARTEAMMATE         PNG                     "icons\\Avatar.png"
+
 BAKEDANUKI              PNG                     "icons\\BakeDanuki.png"
 
 BAMBOOSEGMENT           PNG                     "icons\\BambooSegment.png"
@@ -974,6 +978,8 @@ NOBUSHI                 PNG                     "icons\\Nobushi.png"
 
 NOCTILUCOUSJADE         PNG                     "icons\\NoctilucousJade.png"
 
+NPC                     PNG                     "icons\\Npc.png"
+
 OCEANCRAB               PNG                     "icons\\OceanCrab.png"
 
 OCEANID                 PNG                     "icons\\Oceanid.png"
diff --git a/cheat-library/src/user/cheat/esp/ESP.cpp b/cheat-library/src/user/cheat/esp/ESP.cpp
index 0b4f33f..b6f9d94 100644
--- a/cheat-library/src/user/cheat/esp/ESP.cpp
+++ b/cheat-library/src/user/cheat/esp/ESP.cpp
@@ -472,6 +472,8 @@ namespace cheat::feature
 		ADD_FILTER_FIELD(guide, Stormstone);
 		ADD_FILTER_FIELD(guide, TriangularMechanism);
 
+		ADD_FILTER_FIELD(living, AvatarTeammate);
+		ADD_FILTER_FIELD(living, AvatarOwn);
 		ADD_FILTER_FIELD(living, BakeDanuki);
 		ADD_FILTER_FIELD(living, BirdEgg);
 		ADD_FILTER_FIELD(living, Boar);
@@ -493,6 +495,7 @@ namespace cheat::feature
 		ADD_FILTER_FIELD(living, LizardTail);
 		ADD_FILTER_FIELD(living, LucklightFly);
 		ADD_FILTER_FIELD(living, LuminescentSpine);
+		ADD_FILTER_FIELD(living, Npc);
 		ADD_FILTER_FIELD(living, Onikabuto);
 		ADD_FILTER_FIELD(living, Pigeon);
 		ADD_FILTER_FIELD(living, Salamander);
diff --git a/cheat-library/src/user/cheat/game/filters.cpp b/cheat-library/src/user/cheat/game/filters.cpp
index 05a7d00..70f87df 100644
--- a/cheat-library/src/user/cheat/game/filters.cpp
+++ b/cheat-library/src/user/cheat/game/filters.cpp
@@ -60,6 +60,8 @@ namespace cheat::game::filters
 
 	namespace living
 	{
+		SimpleFilter AvatarTeammate = { app::EntityType__Enum_1::Avatar, "authority :False" };
+		SimpleFilter AvatarOwn = { app::EntityType__Enum_1::Avatar, "authority :True" };
 		SimpleFilter BirdEgg = { app::EntityType__Enum_1::GatherObject, "BirdEgg" };
 		SimpleFilter ButterflyWings = { app::EntityType__Enum_1::EnvAnimal, "Butterfly" };
 		SimpleFilter Crab = { app::EntityType__Enum_1::EnvAnimal, "Crab" };
@@ -75,6 +77,8 @@ namespace cheat::game::filters
 		SimpleFilter Boar = { app::EntityType__Enum_1::Monster, "Boar" };
 		SimpleFilter Fox = { app::EntityType__Enum_1::Monster, "Fox" };
 		SimpleFilter Squirrel = { app::EntityType__Enum_1::Monster, "Squirrel" };
+		SimpleFilter Npc = { app::EntityType__Enum_1::NPC,
+			std::vector<std::string> { "_Liyue", "_Mengde", "_Inazuma", "_Coop", "_Quest", "_Enkanomiya", "_Animal", "_Guide", "_Homeworld" } };
 		SimpleFilter Crane = { app::EntityType__Enum_1::Monster, "Crane" };
 		SimpleFilter Falcon = { app::EntityType__Enum_1::Monster, "Falcon" };
 		SimpleFilter LucklightFly = { app::EntityType__Enum_1::EnvAnimal, "Boltbug_" };
diff --git a/cheat-library/src/user/cheat/game/filters.h b/cheat-library/src/user/cheat/game/filters.h
index a630f36..aafe47e 100644
--- a/cheat-library/src/user/cheat/game/filters.h
+++ b/cheat-library/src/user/cheat/game/filters.h
@@ -63,6 +63,8 @@ namespace cheat::game::filters
 
 	namespace living
 	{
+		extern SimpleFilter AvatarOwn;
+		extern SimpleFilter AvatarTeammate;
 		extern SimpleFilter BirdEgg;
 		extern SimpleFilter ButterflyWings;
 		extern SimpleFilter Crab;
@@ -81,6 +83,7 @@ namespace cheat::game::filters
 		extern SimpleFilter Crane;
 		extern SimpleFilter Falcon;
 		extern SimpleFilter LucklightFly;
+		extern SimpleFilter Npc;
 		extern SimpleFilter Salamander;
 		extern SimpleFilter Pigeon;
 		extern SimpleFilter Crow;