diff --git a/cheat-library/src/user/cheat/game/AdvancedFilter.h b/cheat-library/src/user/cheat/game/AdvancedFilter.h
index 4a8abec..051b04d 100644
--- a/cheat-library/src/user/cheat/game/AdvancedFilter.h
+++ b/cheat-library/src/user/cheat/game/AdvancedFilter.h
@@ -26,8 +26,10 @@ namespace cheat::game
         public IEntityFilter
     {
     public:
-        AdvancedFilter(const std::vector<app::EntityType__Enum_1>& types = {}, const std::vector<std::string>& names = {}) : m_Names(names), m_Types(types) {}
-        AdvancedFilter(const app::EntityType__Enum_1 type, const std::string name) : AdvancedFilter(std::vector<app::EntityType__Enum_1>{type}, std::vector<std::string>{name}) {}
+        AdvancedFilter(std::initializer_list<app::EntityType__Enum_1> types = {}, std::initializer_list<std::string> names = {}) : m_Names(names), m_Types(types) {}
+        AdvancedFilter(std::initializer_list<app::EntityType__Enum_1> types, const std::string& name) : AdvancedFilter(types, { name }) {}
+        AdvancedFilter(const app::EntityType__Enum_1 type, std::initializer_list<std::string> name) : AdvancedFilter({ type }, name) {}
+        AdvancedFilter(const app::EntityType__Enum_1 type, const std::string& name) : AdvancedFilter({ type }, { name }) {}
         friend AdvancedFilter operator+(AdvancedFilter lFilter, const AdvancedFilter& rFilter);
         
         bool IsValid(Entity* entity) const override {
diff --git a/cheat-library/src/user/cheat/game/SimpleFilter.cpp b/cheat-library/src/user/cheat/game/SimpleFilter.cpp
index 887766b..59a8dc1 100644
--- a/cheat-library/src/user/cheat/game/SimpleFilter.cpp
+++ b/cheat-library/src/user/cheat/game/SimpleFilter.cpp
@@ -3,6 +3,13 @@
 
 namespace cheat::game
 {
+	SimpleFilter::SimpleFilter(std::initializer_list<SimpleFilter> names)
+		: m_Type(names.begin()->m_Type)
+	{
+		std::for_each(names.begin(), names.end(), [this](const SimpleFilter& other) {
+			m_Names.insert(m_Names.begin(), other.m_Names.begin(), other.m_Names.end());
+		});
+	}
 
 	bool SimpleFilter::IsValid(Entity* entity) const
 	{
@@ -24,15 +31,4 @@ namespace cheat::game
 
 		return false;
 	}
-
-	SimpleFilter::SimpleFilter(app::EntityType__Enum_1 type, const std::vector<std::string>& names) : m_Names(names), m_Type(type)
-	{
-
-	}
-
-	SimpleFilter operator+(SimpleFilter lFilter, const SimpleFilter& rFilter)
-	{
-		lFilter.m_Names.insert(lFilter.m_Names.end(), rFilter.m_Names.begin(), rFilter.m_Names.end());
-		return lFilter;
-	}
-}
\ No newline at end of file
+}
diff --git a/cheat-library/src/user/cheat/game/SimpleFilter.h b/cheat-library/src/user/cheat/game/SimpleFilter.h
index ee380f1..b2c3db3 100644
--- a/cheat-library/src/user/cheat/game/SimpleFilter.h
+++ b/cheat-library/src/user/cheat/game/SimpleFilter.h
@@ -10,12 +10,11 @@ namespace cheat::game
         public IEntityFilter
     {
 	public:
-
-        SimpleFilter(app::EntityType__Enum_1 type, const std::vector<std::string>& names = {});
-        SimpleFilter(app::EntityType__Enum_1 type, const std::string name) : SimpleFilter(type, std::vector<std::string>{name}) {}
+        SimpleFilter(app::EntityType__Enum_1 type, std::initializer_list<std::string> names = {}) : m_Type(type), m_Names{ names } {}
+        SimpleFilter(app::EntityType__Enum_1 type, const std::string& name) : SimpleFilter(type, {name}) {}
+        SimpleFilter(std::initializer_list<SimpleFilter> lst);
         bool IsValid(Entity* entity) const override;
-        friend SimpleFilter operator+(SimpleFilter lFilter, const SimpleFilter& rFilter);
-    private:
+    protected:
 		app::EntityType__Enum_1 m_Type;
         std::vector<std::string> m_Names;
     };
diff --git a/cheat-library/src/user/cheat/game/filters.cpp b/cheat-library/src/user/cheat/game/filters.cpp
index 7591011..6e6290e 100644
--- a/cheat-library/src/user/cheat/game/filters.cpp
+++ b/cheat-library/src/user/cheat/game/filters.cpp
@@ -4,6 +4,9 @@
 
 namespace cheat::game::filters
 {
+	using namespace game;
+	using namespace app;
+
 	namespace collection
 	{
 		SimpleFilter Book = { app::EntityType__Enum_1::GatherObject, "SkillObj_EmptyGadget" };
@@ -17,306 +20,303 @@ namespace cheat::game::filters
 
 	namespace chest
 	{
-		ChestFilter CommonChest = ChestFilter(game::Chest::ChestRarity::Common);
-		ChestFilter ExquisiteChest = ChestFilter(game::Chest::ChestRarity::Exquisite);
-		ChestFilter PreciousChest = ChestFilter(game::Chest::ChestRarity::Precious);
-		ChestFilter LuxuriousChest = ChestFilter(game::Chest::ChestRarity::Luxurious);
-		ChestFilter RemarkableChest = ChestFilter(game::Chest::ChestRarity::Remarkable);
-		ChestFilter SearchPoint = ChestFilter(game::Chest::ItemType::Investigate);
+		ChestFilter CommonChest = ChestFilter(Chest::ChestRarity::Common);
+		ChestFilter ExquisiteChest = ChestFilter(Chest::ChestRarity::Exquisite);
+		ChestFilter PreciousChest = ChestFilter(Chest::ChestRarity::Precious);
+		ChestFilter LuxuriousChest = ChestFilter(Chest::ChestRarity::Luxurious);
+		ChestFilter RemarkableChest = ChestFilter(Chest::ChestRarity::Remarkable);
+		ChestFilter SearchPoint = ChestFilter(Chest::ItemType::Investigate);
 
-		ChestFilter SLocked = ChestFilter(game::Chest::ChestState::Locked);
-		ChestFilter SInLock = ChestFilter(game::Chest::ChestState::InRock);
-		ChestFilter SFrozen = ChestFilter(game::Chest::ChestState::Frozen);
-		ChestFilter SBramble = ChestFilter(game::Chest::ChestState::Bramble);
-		ChestFilter STrap = ChestFilter(game::Chest::ChestState::Trap);
+		ChestFilter SLocked = ChestFilter(Chest::ChestState::Locked);
+		ChestFilter SInLock = ChestFilter(Chest::ChestState::InRock);
+		ChestFilter SFrozen = ChestFilter(Chest::ChestState::Frozen);
+		ChestFilter SBramble = ChestFilter(Chest::ChestState::Bramble);
+		ChestFilter STrap = ChestFilter(Chest::ChestState::Trap);
 	}
 
 	namespace equipment
 	{
-		SimpleFilter Artifacts = { app::EntityType__Enum_1::DropItem, "_Relic" };
-		SimpleFilter Bow = { app::EntityType__Enum_1::DropItem, "_Bow" };
-		SimpleFilter Claymore = { app::EntityType__Enum_1::DropItem, "_Claymore" };
-		SimpleFilter Catalyst = { app::EntityType__Enum_1::DropItem, "_Catalyst" };
-		SimpleFilter Pole = { app::EntityType__Enum_1::DropItem, "_Pole" };
-		SimpleFilter Sword = { app::EntityType__Enum_1::DropItem, "_Sword" };
+		SimpleFilter Artifacts = { EntityType__Enum_1::DropItem, "_Relic" };
+		SimpleFilter Bow = { EntityType__Enum_1::DropItem, "_Bow" };
+		SimpleFilter Claymore = { EntityType__Enum_1::DropItem, "_Claymore" };
+		SimpleFilter Catalyst = { EntityType__Enum_1::DropItem, "_Catalyst" };
+		SimpleFilter Pole = { EntityType__Enum_1::DropItem, "_Pole" };
+		SimpleFilter Sword = { EntityType__Enum_1::DropItem, "_Sword" };
 	}
 
 	namespace featured
 	{
-		SimpleFilter Anemoculus = { app::EntityType__Enum_1::GatherObject, "WindCrystalShell" };
-		SimpleFilter CrimsonAgate = { app::EntityType__Enum_1::GatherObject, "Prop_Essence" };
-		SimpleFilter Electroculus = { app::EntityType__Enum_1::GatherObject, "Prop_ElectricCrystal" };
-		SimpleFilter Electrogranum = { app::EntityType__Enum_1::Gadget, "ThunderSeedCreate" };
-		SimpleFilter FishingPoint = { app::EntityType__Enum_1::FishPool, "_FishingShoal" };
-		SimpleFilter Geoculus = { app::EntityType__Enum_1::GatherObject, "RockCrystalShell" };
-		WhitelistFilter ItemDrops = { std::vector<app::EntityType__Enum_1> {app::EntityType__Enum_1::GatherObject, app::EntityType__Enum_1::DropItem }, std::vector<std::string> {"_Food_BirdMeat", "_Food_Meat", "_DropItem" } };
-		SimpleFilter Lumenspar = { app::EntityType__Enum_1::GatherObject, "CelestiaSplinter" };
-		SimpleFilter KeySigil = { app::EntityType__Enum_1::GatherObject, "RuneContent" };
-		SimpleFilter ShrineOfDepth = { app::EntityType__Enum_1::Gadget, "Temple" };
-		SimpleFilter TimeTrialChallenge = { app::EntityType__Enum_1::Field, "Challengestarter_" };
+		SimpleFilter Anemoculus = { EntityType__Enum_1::GatherObject, "WindCrystalShell" };
+		SimpleFilter CrimsonAgate = { EntityType__Enum_1::GatherObject, "Prop_Essence" };
+		SimpleFilter Electroculus = { EntityType__Enum_1::GatherObject, "Prop_ElectricCrystal" };
+		SimpleFilter Electrogranum = { EntityType__Enum_1::Gadget, "ThunderSeedCreate" };
+		SimpleFilter FishingPoint = { EntityType__Enum_1::FishPool, "_FishingShoal" };
+		SimpleFilter Geoculus = { EntityType__Enum_1::GatherObject, "RockCrystalShell" };
+		WhitelistFilter ItemDrops = { {EntityType__Enum_1::GatherObject, EntityType__Enum_1::DropItem }, {"_Food_BirdMeat", "_Food_Meat", "_DropItem" } };
+		SimpleFilter Lumenspar = { EntityType__Enum_1::GatherObject, "CelestiaSplinter" };
+		SimpleFilter KeySigil = { EntityType__Enum_1::GatherObject, "RuneContent" };
+		SimpleFilter ShrineOfDepth = { EntityType__Enum_1::Gadget, "Temple" };
+		SimpleFilter TimeTrialChallenge = { EntityType__Enum_1::Field, "Challengestarter_" };
 	}
 
 	namespace guide
 	{
-		SimpleFilter CampfireTorch = { app::EntityType__Enum_1::Gadget, "_FireBasin" };
-		SimpleFilter DayNightSwitchingMechanism = { app::EntityType__Enum_1::Field, "_CircleConsole" };
-		SimpleFilter EnkanomiyaPhaseGate = { app::EntityType__Enum_1::Gadget, "_Singularity" };
-		SimpleFilter MysteriousCarvings = { app::EntityType__Enum_1::Gadget, "_ReginStatue" };
-		SimpleFilter PhaseGate = { app::EntityType__Enum_1::Field, "_TeleportHighway" };
-		SimpleFilter PlacesofEssenceWorship = { app::EntityType__Enum_1::Field, "_EnergySource" };
-		SimpleFilter Pot = { app::EntityType__Enum_1::Gadget, "_Cooking_" };
-		SimpleFilter RuinBrazier = { app::EntityType__Enum_1::Gadget, "_AncientHeatSource" };
-		SimpleFilter Stormstone = { app::EntityType__Enum_1::Gadget, "_ReginLamp" };
-		SimpleFilter TriangularMechanism = { app::EntityType__Enum_1::Field, "_TuningFork" };
+		SimpleFilter CampfireTorch = { EntityType__Enum_1::Gadget, "_FireBasin" };
+		SimpleFilter DayNightSwitchingMechanism = { EntityType__Enum_1::Field, "_CircleConsole" };
+		SimpleFilter EnkanomiyaPhaseGate = { EntityType__Enum_1::Gadget, "_Singularity" };
+		SimpleFilter MysteriousCarvings = { EntityType__Enum_1::Gadget, "_ReginStatue" };
+		SimpleFilter PhaseGate = { EntityType__Enum_1::Field, "_TeleportHighway" };
+		SimpleFilter PlacesofEssenceWorship = { EntityType__Enum_1::Field, "_EnergySource" };
+		SimpleFilter Pot = { EntityType__Enum_1::Gadget, "_Cooking_" };
+		SimpleFilter RuinBrazier = { EntityType__Enum_1::Gadget, "_AncientHeatSource" };
+		SimpleFilter Stormstone = { EntityType__Enum_1::Gadget, "_ReginLamp" };
+		SimpleFilter TriangularMechanism = { EntityType__Enum_1::Field, "_TuningFork" };
 	}
 
 	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" };
-		SimpleFilter CrystalCore = { app::EntityType__Enum_1::EnvAnimal, "Wisp" };
-		SimpleFilter Fish = { app::EntityType__Enum_1::EnvAnimal, "Fish" };
-		SimpleFilter Frog = { app::EntityType__Enum_1::EnvAnimal, "Frog" };
-		SimpleFilter LizardTail = { app::EntityType__Enum_1::EnvAnimal, "Lizard" };
-		SimpleFilter LuminescentSpine = { app::EntityType__Enum_1::EnvAnimal, "FireFly" };
-		SimpleFilter Onikabuto = { app::EntityType__Enum_1::GatherObject, "Electrohercules" };
-		SimpleFilter Starconch = { app::EntityType__Enum_1::GatherObject, "_Shell" };
-		SimpleFilter Eel = { app::EntityType__Enum_1::EnvAnimal, "Eel_" };
-		SimpleFilter Inu = { app::EntityType__Enum_1::EnvAnimal, "_Inu_Shihandai" };
-		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_" };
-		SimpleFilter Salamander = { app::EntityType__Enum_1::EnvAnimal, "Salamander" };
-		SimpleFilter Pigeon = { app::EntityType__Enum_1::Monster, "Pigeon" };
-		SimpleFilter Crow = { app::EntityType__Enum_1::Monster, "Crow" };
-		SimpleFilter Finch = { app::EntityType__Enum_1::Monster, "Tit" };
-		SimpleFilter Wigeon = { app::EntityType__Enum_1::Monster, "Wigeon" };
-		SimpleFilter Dog = { app::EntityType__Enum_1::Monster, "DogPrick" };
-		SimpleFilter Cat = { app::EntityType__Enum_1::Monster, "Cat" };
-		SimpleFilter Weasel = { app::EntityType__Enum_1::Monster, "Marten" };
-		SimpleFilter WeaselThief = { app::EntityType__Enum_1::Monster, "Thoarder_Weasel" };
-		SimpleFilter Kitsune = { app::EntityType__Enum_1::EnvAnimal, "Vulpes" };
-		SimpleFilter BakeDanuki = { app::EntityType__Enum_1::Monster, "Inu_Tanuki" };
-		SimpleFilter Meat = { app::EntityType__Enum_1::GatherObject , std::vector<std::string> { "_Food_BirdMeat", "_Food_Meat", "_Fishmeat" }};
+		SimpleFilter AvatarTeammate = { EntityType__Enum_1::Avatar, "authority :False" };
+		SimpleFilter AvatarOwn = { EntityType__Enum_1::Avatar, "authority :True" };
+		SimpleFilter BirdEgg = { EntityType__Enum_1::GatherObject, "BirdEgg" };
+		SimpleFilter ButterflyWings = { EntityType__Enum_1::EnvAnimal, "Butterfly" };
+		SimpleFilter Crab = { EntityType__Enum_1::EnvAnimal, "Crab" };
+		SimpleFilter CrystalCore = { EntityType__Enum_1::EnvAnimal, "Wisp" };
+		SimpleFilter Fish = { EntityType__Enum_1::EnvAnimal, "Fish" };
+		SimpleFilter Frog = { EntityType__Enum_1::EnvAnimal, "Frog" };
+		SimpleFilter LizardTail = { EntityType__Enum_1::EnvAnimal, "Lizard" };
+		SimpleFilter LuminescentSpine = { EntityType__Enum_1::EnvAnimal, "FireFly" };
+		SimpleFilter Onikabuto = { EntityType__Enum_1::GatherObject, "Electrohercules" };
+		SimpleFilter Starconch = { EntityType__Enum_1::GatherObject, "_Shell" };
+		SimpleFilter Eel = { EntityType__Enum_1::EnvAnimal, "Eel_" };
+		SimpleFilter Inu = { EntityType__Enum_1::EnvAnimal, "_Inu_Shihandai" };
+		SimpleFilter Boar = { EntityType__Enum_1::Monster, "Boar" };
+		SimpleFilter Fox = { EntityType__Enum_1::Monster, "Fox" };
+		SimpleFilter Squirrel = { EntityType__Enum_1::Monster, "Squirrel" };
+		SimpleFilter Npc = { EntityType__Enum_1::NPC, { "_Liyue", "_Mengde", "_Inazuma", "_Coop", "_Quest", "_Enkanomiya", "_Animal", "_Guide", "_Homeworld" } };
+		SimpleFilter Crane = { EntityType__Enum_1::Monster, "Crane" };
+		SimpleFilter Falcon = { EntityType__Enum_1::Monster, "Falcon" };
+		SimpleFilter LucklightFly = { EntityType__Enum_1::EnvAnimal, "Boltbug_" };
+		SimpleFilter Salamander = { EntityType__Enum_1::EnvAnimal, "Salamander" };
+		SimpleFilter Pigeon = { EntityType__Enum_1::Monster, "Pigeon" };
+		SimpleFilter Crow = { EntityType__Enum_1::Monster, "Crow" };
+		SimpleFilter Finch = { EntityType__Enum_1::Monster, "Tit" };
+		SimpleFilter Wigeon = { EntityType__Enum_1::Monster, "Wigeon" };
+		SimpleFilter Dog = { EntityType__Enum_1::Monster, "DogPrick" };
+		SimpleFilter Cat = { EntityType__Enum_1::Monster, "Cat" };
+		SimpleFilter Weasel = { EntityType__Enum_1::Monster, "Marten" };
+		SimpleFilter WeaselThief = { EntityType__Enum_1::Monster, "Thoarder_Weasel" };
+		SimpleFilter Kitsune = { EntityType__Enum_1::EnvAnimal, "Vulpes" };
+		SimpleFilter BakeDanuki = { EntityType__Enum_1::Monster, "Inu_Tanuki" };
+		SimpleFilter Meat = { EntityType__Enum_1::GatherObject , { "_Food_BirdMeat", "_Food_Meat", "_Fishmeat" }};
 	}
 
 	namespace mineral
 	{
-		SimpleFilter AmethystLump = { app::EntityType__Enum_1::GatherObject, "_Thundercrystal" };
-		SimpleFilter ArchaicStone = { app::EntityType__Enum_1::GatherObject, "_AncientOre" };
-		SimpleFilter CorLapis = { app::EntityType__Enum_1::GatherObject, "_ElementRock" };
-		SimpleFilter CrystalChunk = { app::EntityType__Enum_1::GatherObject,
-			std::vector<std::string> { "_OreCrystal", "_ShiningCrystalOre" } };
-		SimpleFilter CrystalMarrow = { app::EntityType__Enum_1::GatherObject, "_Crystalizedmarrow" };
-		SimpleFilter ElectroCrystal = { app::EntityType__Enum_1::GatherObject, "_OreElectricRock" };
-		SimpleFilter IronChunk = { app::EntityType__Enum_1::GatherObject, "_OreStone" };
-		SimpleFilter NoctilucousJade = { app::EntityType__Enum_1::GatherObject,
-			std::vector<std::string> { "_OreNightBerth", "_ShiningNightBerthOre" } };
-		SimpleFilter MagicalCrystalChunk = { app::EntityType__Enum_1::GatherObject, "_OreMagicCrystal" };
-		SimpleFilter ScarletQuartz = { app::EntityType__Enum_1::GatherObject, "_OreDulinsBlood" };
-		SimpleFilter Starsilver = { app::EntityType__Enum_1::GatherObject, "_OreMoonMeteor" };
-		SimpleFilter WhiteIronChunk = { app::EntityType__Enum_1::GatherObject, "_OreMetal" };
-		SimpleFilter DunlinsTooth = { app::EntityType__Enum_1::GatherObject, "_DunlinsTooth" };
+		SimpleFilter AmethystLump = { EntityType__Enum_1::GatherObject, "_Thundercrystal" };
+		SimpleFilter ArchaicStone = { EntityType__Enum_1::GatherObject, "_AncientOre" };
+		SimpleFilter CorLapis = { EntityType__Enum_1::GatherObject, "_ElementRock" };
+		SimpleFilter CrystalChunk = { EntityType__Enum_1::GatherObject, { "_OreCrystal", "_ShiningCrystalOre" } };
+		SimpleFilter CrystalMarrow = { EntityType__Enum_1::GatherObject, "_Crystalizedmarrow" };
+		SimpleFilter ElectroCrystal = { EntityType__Enum_1::GatherObject, "_OreElectricRock" };
+		SimpleFilter IronChunk = { EntityType__Enum_1::GatherObject, "_OreStone" };
+		SimpleFilter NoctilucousJade = { EntityType__Enum_1::GatherObject, { "_OreNightBerth", "_ShiningNightBerthOre" } };
+		SimpleFilter MagicalCrystalChunk = { EntityType__Enum_1::GatherObject, "_OreMagicCrystal" };
+		SimpleFilter ScarletQuartz = { EntityType__Enum_1::GatherObject, "_OreDulinsBlood" };
+		SimpleFilter Starsilver = { EntityType__Enum_1::GatherObject, "_OreMoonMeteor" };
+		SimpleFilter WhiteIronChunk = { EntityType__Enum_1::GatherObject, "_OreMetal" };
+		SimpleFilter DunlinsTooth = { EntityType__Enum_1::GatherObject, "_DunlinsTooth" };
 
-		SimpleFilter AmethystLumpDrop = { app::EntityType__Enum_1::GatherObject, "_Thundercrystaldrop" };
-		SimpleFilter CrystalChunkDrop = { app::EntityType__Enum_1::GatherObject,"_Drop_Crystal"};
-		SimpleFilter ElectroCrystalDrop = { app::EntityType__Enum_1::GatherObject, "_Drop_Ore_ElectricRock" };
-		SimpleFilter IronChunkDrop = { app::EntityType__Enum_1::GatherObject, "_Drop_Stone" };
-		SimpleFilter NoctilucousJadeDrop = { app::EntityType__Enum_1::GatherObject,"_NightBerth" };
-		SimpleFilter MagicalCrystalChunkDrop = { app::EntityType__Enum_1::GatherObject, "_DropMagicCrystal" };
-		SimpleFilter ScarletQuartzDrop = { app::EntityType__Enum_1::GatherObject, "_DropDulinsBlood" };
-		SimpleFilter StarsilverDrop = { app::EntityType__Enum_1::GatherObject, "_DropMoonMeteor" };
-		SimpleFilter WhiteIronChunkDrop = { app::EntityType__Enum_1::GatherObject, "_Drop_Metal" };
+		SimpleFilter AmethystLumpDrop = { EntityType__Enum_1::GatherObject, "_Thundercrystaldrop" };
+		SimpleFilter CrystalChunkDrop = { EntityType__Enum_1::GatherObject,"_Drop_Crystal"};
+		SimpleFilter ElectroCrystalDrop = { EntityType__Enum_1::GatherObject, "_Drop_Ore_ElectricRock" };
+		SimpleFilter IronChunkDrop = { EntityType__Enum_1::GatherObject, "_Drop_Stone" };
+		SimpleFilter NoctilucousJadeDrop = { EntityType__Enum_1::GatherObject,"_NightBerth" };
+		SimpleFilter MagicalCrystalChunkDrop = { EntityType__Enum_1::GatherObject, "_DropMagicCrystal" };
+		SimpleFilter ScarletQuartzDrop = { EntityType__Enum_1::GatherObject, "_DropDulinsBlood" };
+		SimpleFilter StarsilverDrop = { EntityType__Enum_1::GatherObject, "_DropMoonMeteor" };
+		SimpleFilter WhiteIronChunkDrop = { EntityType__Enum_1::GatherObject, "_Drop_Metal" };
 	}
 
 	namespace monster
 	{
-		SimpleFilter AbyssMage = { app::EntityType__Enum_1::Monster, "_Abyss" };
-		SimpleFilter FatuiAgent = { app::EntityType__Enum_1::Monster, "_Fatuus" };
-		SimpleFilter FatuiCicinMage = { app::EntityType__Enum_1::Monster, "_Fatuus_Summoner" };
-		SimpleFilter FatuiMirrorMaiden = { app::EntityType__Enum_1::Monster, "_Fatuus_Maiden" };
-		SimpleFilter FatuiSkirmisher = { app::EntityType__Enum_1::Monster, "_Skirmisher" };
-		SimpleFilter Geovishap = { app::EntityType__Enum_1::Monster, "_Drake_Rock" };
-		SimpleFilter GeovishapHatchling = { app::EntityType__Enum_1::Monster, "_Wyrm_Rock" };
-		SimpleFilter Hilichurl = { app::EntityType__Enum_1::Monster, "_Hili" };
-		SimpleFilter Mitachurl = { app::EntityType__Enum_1::Monster, "_Brute" };
-		SimpleFilter Nobushi = { app::EntityType__Enum_1::Monster, "_Ronin" };
-		SimpleFilter Kairagi = { app::EntityType__Enum_1::Monster, "_Kairagi" };
-		SimpleFilter RuinGuard = { app::EntityType__Enum_1::Monster, "_Defender" };
-		SimpleFilter RuinHunter = { app::EntityType__Enum_1::Monster, "_Formathr" };
-		SimpleFilter RuinGrader = { app::EntityType__Enum_1::Monster, "_Konungmathr" };
-		SimpleFilter RuinSentinel = { app::EntityType__Enum_1::Monster, "_Apparatus_Enigma" };
-		SimpleFilter Samachurl = { app::EntityType__Enum_1::Monster, "_Shaman" };
-	    SimpleFilter ShadowyHusk = { app::EntityType__Enum_1::Monster, "ForlornVessel_Strong" };
-		SimpleFilter Slime = { app::EntityType__Enum_1::Monster, "_Slime" };
-		SimpleFilter FloatingFungus = { app::EntityType__Enum_1::Monster, "_Fungus" };
-		SimpleFilter Specter = { app::EntityType__Enum_1::Monster, "_Sylph" };
-		SimpleFilter TreasureHoarder = { app::EntityType__Enum_1::Monster, "_Thoarder" };
-		SimpleFilter UnusualHilichurl = { app::EntityType__Enum_1::Monster, "_Hili_Wei" };
-		SimpleFilter Whopperflower = { app::EntityType__Enum_1::Monster, "_Mimik" };
-		SimpleFilter RifthoundWhelp = { app::EntityType__Enum_1::Monster, "_Hound_Kanis" };
-		SimpleFilter Rifthound = { app::EntityType__Enum_1::Monster, "_Hound_Riftstalker" };
-		SimpleFilter Dvalin = { app::EntityType__Enum_1::Monster, "_Dragon_Dvalin" };
-		SimpleFilter Andrius = { app::EntityType__Enum_1::Monster, "_Wolf_LupiBoreas" };
-		SimpleFilter Tartaglia = { app::EntityType__Enum_1::Monster, "_Tartaglia" };
-		SimpleFilter Azhdaha = { app::EntityType__Enum_1::Monster, "_Dahaka" };
-		SimpleFilter Signora = { app::EntityType__Enum_1::Monster, "_LaSignora" };
-		SimpleFilter Shogun = { app::EntityType__Enum_1::Monster, "_Shougun" };
-		SimpleFilter EyeOfTheStorm = { app::EntityType__Enum_1::Monster, "_Elemental_Wind" };
-		SimpleFilter ElectroHypostasis = { app::EntityType__Enum_1::Monster, "_Effigy_Electric" };
-		SimpleFilter AnemoHypostasis = { app::EntityType__Enum_1::Monster, "_Effigy_Wind" };
-		SimpleFilter GeoHypostasis = { app::EntityType__Enum_1::Monster, "_Effigy_Rock" };
-		SimpleFilter HydroHypostasis = { app::EntityType__Enum_1::Monster, "_Effigy_Water" };
-		SimpleFilter CryoHypostasis = { app::EntityType__Enum_1::Monster, "_Effigy_Ice" };
-		SimpleFilter PyroHypostasis = { app::EntityType__Enum_1::Monster, "_Effigy_Fire" };
-		SimpleFilter HydroHypostasisSummon = { app::EntityType__Enum_1::Monster, "_Effigy_Water_Underling_Ooze" };
-		SimpleFilter Oceanid = { app::EntityType__Enum_1::Monster, "_Oceanid" };
-		SimpleFilter OceanidBoar = { app::EntityType__Enum_1::Monster, "_Oceanid_Boar" };
-		SimpleFilter OceanidCrane = { app::EntityType__Enum_1::Monster, "_Oceanid_Crane" };
-		SimpleFilter OceanidCrab = { app::EntityType__Enum_1::Monster, "_Oceanid_Crab" };
-		SimpleFilter OceanidFinch = { app::EntityType__Enum_1::Monster, "_Oceanid_Tit" };
-		SimpleFilter OceanidWigeon = { app::EntityType__Enum_1::Monster, "_Oceanid_Wigeon" };
-		SimpleFilter OceanidSquirrel = { app::EntityType__Enum_1::Monster, "_Oceanid_Squirrel" };
-		SimpleFilter OceanidFrog = { app::EntityType__Enum_1::Monster, "_Oceanid_Frog" };
-		SimpleFilter OceanidFalcon = { app::EntityType__Enum_1::Monster, "_Oceanid_Falcon" };
-		SimpleFilter PerpetualMechanicalArray = { app::EntityType__Enum_1::Monster, "_Apparatus_Perpetual" };
-		SimpleFilter PrimoGeovishap = { app::EntityType__Enum_1::Monster, "_Drake_Primo_Rock" };
-		SimpleFilter HydroBathysmalVishap = { app::EntityType__Enum_1::Monster, "_Drake_Deepsea_Water" };
-		SimpleFilter CryoBathysmalVishap = { app::EntityType__Enum_1::Monster, "_Drake_Deepsea_Ice" };
-		SimpleFilter ElectroBathysmalVishap = { app::EntityType__Enum_1::Monster, "_Drake_Deepsea_Electric" };
-		SimpleFilter ThunderManifestation = { app::EntityType__Enum_1::Monster, "_Raijin" };
-		SimpleFilter HydroAbyssHerald = { app::EntityType__Enum_1::Monster, "_Invoker_Herald_Water" };
-		SimpleFilter ElectroAbyssLector = { app::EntityType__Enum_1::Monster, "_Invoker_Deacon_Electric" };
-		SimpleFilter PyroAbyssLector = { app::EntityType__Enum_1::Monster, "_Invoker_Deacon_Fire" };
-		SimpleFilter BlackSerpentKnight = { app::EntityType__Enum_1::Monster, "_Darkwraith_Strong_Wind" };
-		SimpleFilter GoldenWolflord = { app::EntityType__Enum_1::Monster, "_Hound_Planelurker" };
-		SimpleFilter RuinSerpent = { app::EntityType__Enum_1::Monster, "_Nithhoggr" };
-		SimpleFilter Millelith = { app::EntityType__Enum_1::Monster, "_Millelith_" };
-		SimpleFilter ShogunateInfantry = { app::EntityType__Enum_1::Monster, "_Aahigaru_" };
-		SimpleFilter SangonomiyaCohort = { app::EntityType__Enum_1::Monster, "_AahigaruTaisho_" };
-		SimpleFilter CryoRegisvine = { app::EntityType__Enum_1::Monster, "_Regisvine_Ice" };
-		SimpleFilter PyroRegisvine = { app::EntityType__Enum_1::Monster, "_Regisvine_Fire" };
-		SimpleFilter MaguuKenki = { app::EntityType__Enum_1::Monster, "_Ningyo" };
-		SimpleFilter Cicin = { app::EntityType__Enum_1::Monster, "_Cicin" };
-		SimpleFilter Beisht = { app::EntityType__Enum_1::Monster, "_Eldritch" };
+		SimpleFilter AbyssMage = { EntityType__Enum_1::Monster, "_Abyss" };
+		SimpleFilter FatuiAgent = { EntityType__Enum_1::Monster, "_Fatuus" };
+		SimpleFilter FatuiCicinMage = { EntityType__Enum_1::Monster, "_Fatuus_Summoner" };
+		SimpleFilter FatuiMirrorMaiden = { EntityType__Enum_1::Monster, "_Fatuus_Maiden" };
+		SimpleFilter FatuiSkirmisher = { EntityType__Enum_1::Monster, "_Skirmisher" };
+		SimpleFilter Geovishap = { EntityType__Enum_1::Monster, "_Drake_Rock" };
+		SimpleFilter GeovishapHatchling = { EntityType__Enum_1::Monster, "_Wyrm_Rock" };
+		SimpleFilter Hilichurl = { EntityType__Enum_1::Monster, "_Hili" };
+		SimpleFilter Mitachurl = { EntityType__Enum_1::Monster, "_Brute" };
+		SimpleFilter Nobushi = { EntityType__Enum_1::Monster, "_Ronin" };
+		SimpleFilter Kairagi = { EntityType__Enum_1::Monster, "_Kairagi" };
+		SimpleFilter RuinGuard = { EntityType__Enum_1::Monster, "_Defender" };
+		SimpleFilter RuinHunter = { EntityType__Enum_1::Monster, "_Formathr" };
+		SimpleFilter RuinGrader = { EntityType__Enum_1::Monster, "_Konungmathr" };
+		SimpleFilter RuinSentinel = { EntityType__Enum_1::Monster, "_Apparatus_Enigma" };
+		SimpleFilter Samachurl = { EntityType__Enum_1::Monster, "_Shaman" };
+	    SimpleFilter ShadowyHusk = { EntityType__Enum_1::Monster, "ForlornVessel_Strong" };
+		SimpleFilter Slime = { EntityType__Enum_1::Monster, "_Slime" };
+		SimpleFilter FloatingFungus = { EntityType__Enum_1::Monster, "_Fungus" };
+		SimpleFilter Specter = { EntityType__Enum_1::Monster, "_Sylph" };
+		SimpleFilter TreasureHoarder = { EntityType__Enum_1::Monster, "_Thoarder" };
+		SimpleFilter UnusualHilichurl = { EntityType__Enum_1::Monster, "_Hili_Wei" };
+		SimpleFilter Whopperflower = { EntityType__Enum_1::Monster, "_Mimik" };
+		SimpleFilter RifthoundWhelp = { EntityType__Enum_1::Monster, "_Hound_Kanis" };
+		SimpleFilter Rifthound = { EntityType__Enum_1::Monster, "_Hound_Riftstalker" };
+		SimpleFilter Dvalin = { EntityType__Enum_1::Monster, "_Dragon_Dvalin" };
+		SimpleFilter Andrius = { EntityType__Enum_1::Monster, "_Wolf_LupiBoreas" };
+		SimpleFilter Tartaglia = { EntityType__Enum_1::Monster, "_Tartaglia" };
+		SimpleFilter Azhdaha = { EntityType__Enum_1::Monster, "_Dahaka" };
+		SimpleFilter Signora = { EntityType__Enum_1::Monster, "_LaSignora" };
+		SimpleFilter Shogun = { EntityType__Enum_1::Monster, "_Shougun" };
+		SimpleFilter EyeOfTheStorm = { EntityType__Enum_1::Monster, "_Elemental_Wind" };
+		SimpleFilter ElectroHypostasis = { EntityType__Enum_1::Monster, "_Effigy_Electric" };
+		SimpleFilter AnemoHypostasis = { EntityType__Enum_1::Monster, "_Effigy_Wind" };
+		SimpleFilter GeoHypostasis = { EntityType__Enum_1::Monster, "_Effigy_Rock" };
+		SimpleFilter HydroHypostasis = { EntityType__Enum_1::Monster, "_Effigy_Water" };
+		SimpleFilter CryoHypostasis = { EntityType__Enum_1::Monster, "_Effigy_Ice" };
+		SimpleFilter PyroHypostasis = { EntityType__Enum_1::Monster, "_Effigy_Fire" };
+		SimpleFilter HydroHypostasisSummon = { EntityType__Enum_1::Monster, "_Effigy_Water_Underling_Ooze" };
+		SimpleFilter Oceanid = { EntityType__Enum_1::Monster, "_Oceanid" };
+		SimpleFilter OceanidBoar = { EntityType__Enum_1::Monster, "_Oceanid_Boar" };
+		SimpleFilter OceanidCrane = { EntityType__Enum_1::Monster, "_Oceanid_Crane" };
+		SimpleFilter OceanidCrab = { EntityType__Enum_1::Monster, "_Oceanid_Crab" };
+		SimpleFilter OceanidFinch = { EntityType__Enum_1::Monster, "_Oceanid_Tit" };
+		SimpleFilter OceanidWigeon = { EntityType__Enum_1::Monster, "_Oceanid_Wigeon" };
+		SimpleFilter OceanidSquirrel = { EntityType__Enum_1::Monster, "_Oceanid_Squirrel" };
+		SimpleFilter OceanidFrog = { EntityType__Enum_1::Monster, "_Oceanid_Frog" };
+		SimpleFilter OceanidFalcon = { EntityType__Enum_1::Monster, "_Oceanid_Falcon" };
+		SimpleFilter PerpetualMechanicalArray = { EntityType__Enum_1::Monster, "_Apparatus_Perpetual" };
+		SimpleFilter PrimoGeovishap = { EntityType__Enum_1::Monster, "_Drake_Primo_Rock" };
+		SimpleFilter HydroBathysmalVishap = { EntityType__Enum_1::Monster, "_Drake_Deepsea_Water" };
+		SimpleFilter CryoBathysmalVishap = { EntityType__Enum_1::Monster, "_Drake_Deepsea_Ice" };
+		SimpleFilter ElectroBathysmalVishap = { EntityType__Enum_1::Monster, "_Drake_Deepsea_Electric" };
+		SimpleFilter ThunderManifestation = { EntityType__Enum_1::Monster, "_Raijin" };
+		SimpleFilter HydroAbyssHerald = { EntityType__Enum_1::Monster, "_Invoker_Herald_Water" };
+		SimpleFilter ElectroAbyssLector = { EntityType__Enum_1::Monster, "_Invoker_Deacon_Electric" };
+		SimpleFilter PyroAbyssLector = { EntityType__Enum_1::Monster, "_Invoker_Deacon_Fire" };
+		SimpleFilter BlackSerpentKnight = { EntityType__Enum_1::Monster, "_Darkwraith_Strong_Wind" };
+		SimpleFilter GoldenWolflord = { EntityType__Enum_1::Monster, "_Hound_Planelurker" };
+		SimpleFilter RuinSerpent = { EntityType__Enum_1::Monster, "_Nithhoggr" };
+		SimpleFilter Millelith = { EntityType__Enum_1::Monster, "_Millelith_" };
+		SimpleFilter ShogunateInfantry = { EntityType__Enum_1::Monster, "_Aahigaru_" };
+		SimpleFilter SangonomiyaCohort = { EntityType__Enum_1::Monster, "_AahigaruTaisho_" };
+		SimpleFilter CryoRegisvine = { EntityType__Enum_1::Monster, "_Regisvine_Ice" };
+		SimpleFilter PyroRegisvine = { EntityType__Enum_1::Monster, "_Regisvine_Fire" };
+		SimpleFilter MaguuKenki = { EntityType__Enum_1::Monster, "_Ningyo" };
+		SimpleFilter Cicin = { EntityType__Enum_1::Monster, "_Cicin" };
+		SimpleFilter Beisht = { EntityType__Enum_1::Monster, "_Eldritch" };
 	}
 
 	namespace plant
 	{
-		SimpleFilter AmakumoFruit = { app::EntityType__Enum_1::GatherObject, "_Electroseed" };
-		SimpleFilter Apple = { app::EntityType__Enum_1::GatherObject, "_Drop_Plant_Apple" };
-		SimpleFilter BambooShoot = { app::EntityType__Enum_1::GatherObject, "_Bambooshoot" };
-		SimpleFilter Berry = { app::EntityType__Enum_1::GatherObject, "_Raspberry" };
-		SimpleFilter CallaLily = { app::EntityType__Enum_1::GatherObject, "_Plant_Callas" };
-		SimpleFilter Cabbage = { app::EntityType__Enum_1::GatherObject, "_Plant_Cabbage" };
-		SimpleFilter Carrot = { app::EntityType__Enum_1::GatherObject, "_Plant_Carrot" };
-		SimpleFilter Cecilia = { app::EntityType__Enum_1::GatherObject, "_Cecilia" };
-		SimpleFilter DandelionSeed = { app::EntityType__Enum_1::GatherObject, "_Plant_Dandelion" };
-		SimpleFilter Dendrobium = { app::EntityType__Enum_1::GatherObject, "_Blooddendrobe" };
-		SimpleFilter FlamingFlowerStamen = { app::EntityType__Enum_1::GatherObject, "_Flower_FireFlower" };
-		SimpleFilter FluorescentFungus = { app::EntityType__Enum_1::GatherObject, "_Lampmushroom" };
-		SimpleFilter GlazeLily = { app::EntityType__Enum_1::GatherObject, "_GlazedLily" };
-		SimpleFilter Horsetail = { app::EntityType__Enum_1::GatherObject, "_HorseTail" };
-		SimpleFilter JueyunChili = { app::EntityType__Enum_1::GatherObject, "_UltimateChilli_Fruit" };
-		SimpleFilter LavenderMelon = { app::EntityType__Enum_1::GatherObject, "_Akebia" };
-		SimpleFilter LotusHead = { app::EntityType__Enum_1::GatherObject, "_Lotus_Drop" };
-		SimpleFilter Matsutake = { app::EntityType__Enum_1::GatherObject, "_Food_Matsutake" };
-		SimpleFilter Mint = { app::EntityType__Enum_1::GatherObject, "_Plant_Mint" };
-		SimpleFilter MistFlowerCorolla = { app::EntityType__Enum_1::GatherObject, "_Flower_IceFlower" };
-		SimpleFilter Mushroom = { app::EntityType__Enum_1::GatherObject, "_Plant_Mushroom" };
-		SimpleFilter NakuWeed = { app::EntityType__Enum_1::GatherObject, "_Howlgrass" };
-		SimpleFilter PhilanemoMushroom = { app::EntityType__Enum_1::GatherObject, "_WindmilHunter" };
-		SimpleFilter Pinecone = { app::EntityType__Enum_1::GatherObject, "_Drop_Plant_Pine" };
-		SimpleFilter Potato = { app::EntityType__Enum_1::GatherObject, "_Plant_Potato" };
-		SimpleFilter Qingxin = { app::EntityType__Enum_1::GatherObject, "_QingXin" };
-		SimpleFilter Radish = { app::EntityType__Enum_1::GatherObject, "_Plant_Radish" };
-		SimpleFilter SakuraBloom = { app::EntityType__Enum_1::GatherObject, "_Cherrypetals" };
-		SimpleFilter SangoPearl = { app::EntityType__Enum_1::GatherObject, "_Coralpearl" };
-		SimpleFilter SeaGanoderma = { app::EntityType__Enum_1::GatherObject, "_Electroanemones" };
-		SimpleFilter Seagrass = { app::EntityType__Enum_1::GatherObject, "_Seagrass" };
-		SimpleFilter SilkFlower = { app::EntityType__Enum_1::GatherObject, "_NiChang_Drop" };
-		SimpleFilter SmallLampGrass = { app::EntityType__Enum_1::Field, "_Plant_Fuchsia" };
-		SimpleFilter Snapdragon = { app::EntityType__Enum_1::GatherObject, "_Plant_Snapdragon" };
-		SimpleFilter Sunsettia = { app::EntityType__Enum_1::GatherObject, "_SunsetFruit" };
-		SimpleFilter SweetFlower = { app::EntityType__Enum_1::GatherObject, "_Plant_Whiteballet" };
-		SimpleFilter Valberry = { app::EntityType__Enum_1::GatherObject, "_DropingBerry_Gather" };
-		SimpleFilter Violetgrass = { app::EntityType__Enum_1::GatherObject, "_GlazedGrass" };
-		SimpleFilter Wheat = { app::EntityType__Enum_1::GatherObject, "_Plant_Wheat" };
-		SimpleFilter WindwheelAster = { app::EntityType__Enum_1::GatherObject, "_WindmilDaisy" };
-		SimpleFilter Wolfhook = { app::EntityType__Enum_1::GatherObject, "_GogoFruit" };
+		SimpleFilter AmakumoFruit = { EntityType__Enum_1::GatherObject, "_Electroseed" };
+		SimpleFilter Apple = { EntityType__Enum_1::GatherObject, "_Drop_Plant_Apple" };
+		SimpleFilter BambooShoot = { EntityType__Enum_1::GatherObject, "_Bambooshoot" };
+		SimpleFilter Berry = { EntityType__Enum_1::GatherObject, "_Raspberry" };
+		SimpleFilter CallaLily = { EntityType__Enum_1::GatherObject, "_Plant_Callas" };
+		SimpleFilter Cabbage = { EntityType__Enum_1::GatherObject, "_Plant_Cabbage" };
+		SimpleFilter Carrot = { EntityType__Enum_1::GatherObject, "_Plant_Carrot" };
+		SimpleFilter Cecilia = { EntityType__Enum_1::GatherObject, "_Cecilia" };
+		SimpleFilter DandelionSeed = { EntityType__Enum_1::GatherObject, "_Plant_Dandelion" };
+		SimpleFilter Dendrobium = { EntityType__Enum_1::GatherObject, "_Blooddendrobe" };
+		SimpleFilter FlamingFlowerStamen = { EntityType__Enum_1::GatherObject, "_Flower_FireFlower" };
+		SimpleFilter FluorescentFungus = { EntityType__Enum_1::GatherObject, "_Lampmushroom" };
+		SimpleFilter GlazeLily = { EntityType__Enum_1::GatherObject, "_GlazedLily" };
+		SimpleFilter Horsetail = { EntityType__Enum_1::GatherObject, "_HorseTail" };
+		SimpleFilter JueyunChili = { EntityType__Enum_1::GatherObject, "_UltimateChilli_Fruit" };
+		SimpleFilter LavenderMelon = { EntityType__Enum_1::GatherObject, "_Akebia" };
+		SimpleFilter LotusHead = { EntityType__Enum_1::GatherObject, "_Lotus_Drop" };
+		SimpleFilter Matsutake = { EntityType__Enum_1::GatherObject, "_Food_Matsutake" };
+		SimpleFilter Mint = { EntityType__Enum_1::GatherObject, "_Plant_Mint" };
+		SimpleFilter MistFlowerCorolla = { EntityType__Enum_1::GatherObject, "_Flower_IceFlower" };
+		SimpleFilter Mushroom = { EntityType__Enum_1::GatherObject, "_Plant_Mushroom" };
+		SimpleFilter NakuWeed = { EntityType__Enum_1::GatherObject, "_Howlgrass" };
+		SimpleFilter PhilanemoMushroom = { EntityType__Enum_1::GatherObject, "_WindmilHunter" };
+		SimpleFilter Pinecone = { EntityType__Enum_1::GatherObject, "_Drop_Plant_Pine" };
+		SimpleFilter Potato = { EntityType__Enum_1::GatherObject, "_Plant_Potato" };
+		SimpleFilter Qingxin = { EntityType__Enum_1::GatherObject, "_QingXin" };
+		SimpleFilter Radish = { EntityType__Enum_1::GatherObject, "_Plant_Radish" };
+		SimpleFilter SakuraBloom = { EntityType__Enum_1::GatherObject, "_Cherrypetals" };
+		SimpleFilter SangoPearl = { EntityType__Enum_1::GatherObject, "_Coralpearl" };
+		SimpleFilter SeaGanoderma = { EntityType__Enum_1::GatherObject, "_Electroanemones" };
+		SimpleFilter Seagrass = { EntityType__Enum_1::GatherObject, "_Seagrass" };
+		SimpleFilter SilkFlower = { EntityType__Enum_1::GatherObject, "_NiChang_Drop" };
+		SimpleFilter SmallLampGrass = { EntityType__Enum_1::Field, "_Plant_Fuchsia" };
+		SimpleFilter Snapdragon = { EntityType__Enum_1::GatherObject, "_Plant_Snapdragon" };
+		SimpleFilter Sunsettia = { EntityType__Enum_1::GatherObject, "_SunsetFruit" };
+		SimpleFilter SweetFlower = { EntityType__Enum_1::GatherObject, "_Plant_Whiteballet" };
+		SimpleFilter Valberry = { EntityType__Enum_1::GatherObject, "_DropingBerry_Gather" };
+		SimpleFilter Violetgrass = { EntityType__Enum_1::GatherObject, "_GlazedGrass" };
+		SimpleFilter Wheat = { EntityType__Enum_1::GatherObject, "_Plant_Wheat" };
+		SimpleFilter WindwheelAster = { EntityType__Enum_1::GatherObject, "_WindmilDaisy" };
+		SimpleFilter Wolfhook = { EntityType__Enum_1::GatherObject, "_GogoFruit" };
 	}
 
 	namespace puzzle
 	{
-		SimpleFilter AncientRime = { app::EntityType__Enum_1::Gadget, "_IceSolidBulk" };
-		SimpleFilter BakeDanuki = { app::EntityType__Enum_1::Monster, "Animal_Inu_Tanuki_" };
-		SimpleFilter BloattyFloatty = { app::EntityType__Enum_1::Field, "_Flower_PongPongTree_" };
-		WhitelistFilter CubeDevices = { std::vector<app::EntityType__Enum_1> {app::EntityType__Enum_1::Gadget, app::EntityType__Enum_1::Platform }, std::vector<std::string> {"_ElecStone", "_ElecSwitch" }};
-		SimpleFilter EightStoneTablets = { app::EntityType__Enum_1::Gadget, "_HistoryBoard" };
-		SimpleFilter ElectricConduction = { app::EntityType__Enum_1::Gear, "_ElectricPowerSource" };
-		SimpleFilter RelayStone = { app::EntityType__Enum_1::Worktop, "_ElectricTransfer_" };
-		WhitelistFilter ElectroSeelie = { std::vector<app::EntityType__Enum_1> {app::EntityType__Enum_1::Field, app::EntityType__Enum_1::Platform }, std::vector<std::string> {"_ElectricSeelie"} };
-		SimpleFilter ElementalMonument = { app::EntityType__Enum_1::Gear, "_ElemTablet" };
-		SimpleFilter FloatingAnemoSlime = { app::EntityType__Enum_1::Platform, "_WindSlime" };
-		SimpleFilter Geogranum = { app::EntityType__Enum_1::Gadget, "_Property_Prop_RockFragment" };
-		SimpleFilter GeoPuzzle = { app::EntityType__Enum_1::Field, "_Rockstraight_" };
-		SimpleFilter LargeRockPile = { app::EntityType__Enum_1::Gadget, std::vector<std::string> {"_ElecRocks", "_StonePile_02" } };
-		SimpleFilter LightUpTilePuzzle = { app::EntityType__Enum_1::Field, "_TwinStoryFloor" };
-		SimpleFilter LightningStrikeProbe = { app::EntityType__Enum_1::Gadget, "_MagneticGear" };
-		SimpleFilter LumenCage = { app::EntityType__Enum_1::Gadget, "_LitBulletLauncher" };
-		SimpleFilter LuminousSeelie = { app::EntityType__Enum_1::Platform, "_LitSeelie" };
-		SimpleFilter MistBubble = { app::EntityType__Enum_1::Platform, "_Suspiciousbubbles" };
-		SimpleFilter OozingConcretions = { app::EntityType__Enum_1::Gadget, "_AbyssCoreLv" };
-		SimpleFilter PirateHelm = { app::EntityType__Enum_1::Field, "_PirateHelm" };
-		WhitelistFilter PressurePlate = { std::vector<app::EntityType__Enum_1> {app::EntityType__Enum_1::Field, app::EntityType__Enum_1::Gadget }, std::vector<std::string> {"Gear_Gravity", "_LitPathPlate" } };
-		SimpleFilter SealLocations = { app::EntityType__Enum_1::Gadget, "_RunesKey" };
-		SimpleFilter SeelieLamp = { app::EntityType__Enum_1::Field, "Gear_SeeliaLamp" };
-		SimpleFilter Seelie = { app::EntityType__Enum_1::Platform, "Gear_Seelie" };
-		SimpleFilter SmallRockPile = { app::EntityType__Enum_1::Gadget, "_StonePile_01" };
-		SimpleFilter StormBarrier = { app::EntityType__Enum_1::Field, "_WindField_PushField" };
-		SimpleFilter SwordHilt = { app::EntityType__Enum_1::Field, "_WastedSword_" };
-		SimpleFilter Temari = { app::EntityType__Enum_1::Field, "_Temari" };
-		SimpleFilter TorchPuzzle = { app::EntityType__Enum_1::Gadget, "_ImmortalFire" };
-		SimpleFilter UniqueRocks = { app::EntityType__Enum_1::Gadget, "_Chalcedony" };
-		SimpleFilter WarmingSeelie = { app::EntityType__Enum_1::Platform, "_FireSeelie" };
-		SimpleFilter WindmillMechanism = { app::EntityType__Enum_1::Gear, "Gear_Windmill" };
+		SimpleFilter AncientRime = { EntityType__Enum_1::Gadget, "_IceSolidBulk" };
+		SimpleFilter BakeDanuki = { EntityType__Enum_1::Monster, "Animal_Inu_Tanuki_" };
+		SimpleFilter BloattyFloatty = { EntityType__Enum_1::Field, "_Flower_PongPongTree_" };
+		WhitelistFilter CubeDevices = { {EntityType__Enum_1::Gadget, EntityType__Enum_1::Platform }, {"_ElecStone", "_ElecSwitch" }};
+		SimpleFilter EightStoneTablets = { EntityType__Enum_1::Gadget, "_HistoryBoard" };
+		SimpleFilter ElectricConduction = { EntityType__Enum_1::Gear, "_ElectricPowerSource" };
+		SimpleFilter RelayStone = { EntityType__Enum_1::Worktop, "_ElectricTransfer_" };
+		WhitelistFilter ElectroSeelie = { {EntityType__Enum_1::Field, EntityType__Enum_1::Platform }, "_ElectricSeelie" };
+		SimpleFilter ElementalMonument = { EntityType__Enum_1::Gear, "_ElemTablet" };
+		SimpleFilter FloatingAnemoSlime = { EntityType__Enum_1::Platform, "_WindSlime" };
+		SimpleFilter Geogranum = { EntityType__Enum_1::Gadget, "_Property_Prop_RockFragment" };
+		SimpleFilter GeoPuzzle = { EntityType__Enum_1::Field, "_Rockstraight_" };
+		SimpleFilter LargeRockPile = { EntityType__Enum_1::Gadget, {"_ElecRocks", "_StonePile_02" } };
+		SimpleFilter LightUpTilePuzzle = { EntityType__Enum_1::Field, "_TwinStoryFloor" };
+		SimpleFilter LightningStrikeProbe = { EntityType__Enum_1::Gadget, "_MagneticGear" };
+		SimpleFilter LumenCage = { EntityType__Enum_1::Gadget, "_LitBulletLauncher" };
+		SimpleFilter LuminousSeelie = { EntityType__Enum_1::Platform, "_LitSeelie" };
+		SimpleFilter MistBubble = { EntityType__Enum_1::Platform, "_Suspiciousbubbles" };
+		SimpleFilter OozingConcretions = { EntityType__Enum_1::Gadget, "_AbyssCoreLv" };
+		SimpleFilter PirateHelm = { EntityType__Enum_1::Field, "_PirateHelm" };
+		WhitelistFilter PressurePlate = { {EntityType__Enum_1::Field, EntityType__Enum_1::Gadget }, {"Gear_Gravity", "_LitPathPlate" } };
+		SimpleFilter SealLocations = { EntityType__Enum_1::Gadget, "_RunesKey" };
+		SimpleFilter SeelieLamp = { EntityType__Enum_1::Field, "Gear_SeeliaLamp" };
+		SimpleFilter Seelie = { EntityType__Enum_1::Platform, "Gear_Seelie" };
+		SimpleFilter SmallRockPile = { EntityType__Enum_1::Gadget, "_StonePile_01" };
+		SimpleFilter StormBarrier = { EntityType__Enum_1::Field, "_WindField_PushField" };
+		SimpleFilter SwordHilt = { EntityType__Enum_1::Field, "_WastedSword_" };
+		SimpleFilter Temari = { EntityType__Enum_1::Field, "_Temari" };
+		SimpleFilter TorchPuzzle = { EntityType__Enum_1::Gadget, "_ImmortalFire" };
+		SimpleFilter UniqueRocks = { EntityType__Enum_1::Gadget, "_Chalcedony" };
+		SimpleFilter WarmingSeelie = { EntityType__Enum_1::Platform, "_FireSeelie" };
+		SimpleFilter WindmillMechanism = { EntityType__Enum_1::Gear, "Gear_Windmill" };
 	}
 
 	namespace combined
 	{
 		SimpleFilter Oculies = {
-			featured::Anemoculus +
-			featured::CrimsonAgate +
-			featured::Electroculus +
-			featured::Geoculus +
-			featured::Lumenspar +
+			featured::Anemoculus,
+			featured::CrimsonAgate,
+			featured::Electroculus,
+			featured::Geoculus,
+			featured::Lumenspar,
 			featured::KeySigil
 		};
-		SimpleFilter Chests = { app::EntityType__Enum_1::Chest };
+		SimpleFilter Chests = { EntityType__Enum_1::Chest };
 		SimpleFilter Ores = {
-			mineral::AmethystLump +
-			mineral::ArchaicStone +
-			mineral::CorLapis +
-			mineral::CrystalChunk +
-			mineral::CrystalMarrow +
-			mineral::ElectroCrystal +
-			mineral::IronChunk +
-			mineral::NoctilucousJade +
-			mineral::MagicalCrystalChunk +
-			mineral::Starsilver +
+			mineral::AmethystLump,
+			mineral::ArchaicStone,
+			mineral::CorLapis,
+			mineral::CrystalChunk,
+			mineral::CrystalMarrow,
+			mineral::ElectroCrystal,
+			mineral::IronChunk,
+			mineral::NoctilucousJade,
+			mineral::MagicalCrystalChunk,
+			mineral::Starsilver,
 			mineral::WhiteIronChunk
 		};
 		WhitelistFilter Doodads = {
-			std::vector<app::EntityType__Enum_1> { app::EntityType__Enum_1::Gadget },
-			std::vector<std::string> {
+			EntityType__Enum_1::Gadget,
+			{
 			"Monster_Effigy_Electric_01",
 			"Monster_Effigy_Electric_02",
 			"Monster_Effigy_Wind_01",
@@ -340,151 +340,149 @@ namespace cheat::game::filters
 			"StonePile",
 			"BrokenWall",
 			"WoodenBox"
-		} };
-		SimpleFilter Animals = { app::EntityType__Enum_1::EnvAnimal };
+			}
+		};
+		SimpleFilter Animals = { EntityType__Enum_1::EnvAnimal };
 		SimpleFilter AnimalDrop = {
-			living::Falcon +
-			living::Pigeon +
-			living::Finch +
-			living::Wigeon +
-			living::Crane +
-			living::Crow +
-			living::Fox +
-			living::Squirrel +
-			living::Boar +
+			living::Falcon,
+			living::Pigeon,
+			living::Finch,
+			living::Wigeon,
+			living::Crane,
+			living::Crow,
+			living::Fox,
+			living::Squirrel,
+			living::Boar,
 			living::Weasel
 		};
 		SimpleFilter AnimalPickUp = {
-			living::CrystalCore +
-			living::Salamander +
-			living::Frog +
-			living::Crab +
-			living::LizardTail +
-			living::Eel +
-			living::Onikabuto +
-			living::ButterflyWings +
-			living::LucklightFly +
-			living::LuminescentSpine +
-			living::Starconch +
-			living::BirdEgg +
-			living::WeaselThief +
+			living::CrystalCore,
+			living::Salamander,
+			living::Frog,
+			living::Crab,
+			living::LizardTail,
+			living::Eel,
+			living::Onikabuto,
+			living::ButterflyWings,
+			living::LucklightFly,
+			living::LuminescentSpine,
+			living::Starconch,
+			living::BirdEgg,
+			living::WeaselThief,
 			living::Fish
 		};
 		SimpleFilter AnimalNPC = {
-			living::Dog +
-			living::Cat +
-			living::Kitsune +
+			living::Dog,
+			living::Cat,
+			living::Kitsune,
 			living::BakeDanuki
 		};
-		SimpleFilter Monsters = { app::EntityType__Enum_1::Monster };
+		SimpleFilter Monsters = { EntityType__Enum_1::Monster };
 		SimpleFilter MonsterCommon = {
-			monster::Slime +
-			monster::FloatingFungus +
-			monster::Specter +
-			monster::Whopperflower +
-			monster::Hilichurl +
-			monster::Samachurl +
-			monster::UnusualHilichurl +
-			monster::FatuiSkirmisher +
-			monster::TreasureHoarder +
-			monster::Nobushi +
-			monster::Kairagi +
-			monster::Millelith +
-			monster::ShogunateInfantry +
+			monster::Slime,
+			monster::FloatingFungus,
+			monster::Specter,
+			monster::Whopperflower,
+			monster::Hilichurl,
+			monster::Samachurl,
+			monster::UnusualHilichurl,
+			monster::FatuiSkirmisher,
+			monster::TreasureHoarder,
+			monster::Nobushi,
+			monster::Kairagi,
+			monster::Millelith,
+			monster::ShogunateInfantry,
 			monster::SangonomiyaCohort
 		};
 		SimpleFilter MonsterElites = {
-			monster::Mitachurl +
-			monster::AbyssMage +
-			monster::HydroAbyssHerald +
-			monster::PyroAbyssLector +
-			monster::ElectroAbyssLector +
-			monster::RifthoundWhelp +
-			monster::Rifthound +
-			monster::ShadowyHusk +
-			monster::RuinGuard +
-			monster::RuinHunter +
-			monster::RuinGrader +
-			monster::RuinSentinel +
-			monster::Cicin +
-			monster::FatuiCicinMage +
-			monster::FatuiAgent +
-			monster::FatuiMirrorMaiden +
-			monster::GeovishapHatchling +
-			monster::Geovishap +
-			monster::HydroBathysmalVishap +
-			monster::EyeOfTheStorm +
+			monster::Mitachurl,
+			monster::AbyssMage,
+			monster::HydroAbyssHerald,
+			monster::PyroAbyssLector,
+			monster::ElectroAbyssLector,
+			monster::RifthoundWhelp,
+			monster::Rifthound,
+			monster::ShadowyHusk,
+			monster::RuinGuard,
+			monster::RuinHunter,
+			monster::RuinGrader,
+			monster::RuinSentinel,
+			monster::Cicin,
+			monster::FatuiCicinMage,
+			monster::FatuiAgent,
+			monster::FatuiMirrorMaiden,
+			monster::GeovishapHatchling,
+			monster::Geovishap,
+			monster::HydroBathysmalVishap,
+			monster::EyeOfTheStorm,
 			monster::BlackSerpentKnight
 		};
 		SimpleFilter MonsterBosses = {
 			// Adding these comments for better tracking.
 			// Trounce
-			monster::Dvalin +
-			monster::Azhdaha +
-			monster::Signora +
-			monster::Shogun +
-			monster::Andrius +
-			monster::Tartaglia +
+			monster::Dvalin,
+			monster::Azhdaha,
+			monster::Signora,
+			monster::Shogun,
+			monster::Andrius,
+			monster::Tartaglia,
 			// Mondstadt
-			monster::CryoRegisvine +
-			monster::ElectroHypostasis +
-			monster::AnemoHypostasis +
-			monster::CryoHypostasis +
+			monster::CryoRegisvine,
+			monster::ElectroHypostasis,
+			monster::AnemoHypostasis,
+			monster::CryoHypostasis,
 			// Liyue
-			monster::PyroRegisvine +
-			monster::Oceanid +
-			monster::OceanidBoar +
-			monster::OceanidCrab +
-			monster::OceanidCrane +
-			monster::OceanidFalcon +
-			monster::OceanidFinch +
-			monster::OceanidFrog +
-			monster::OceanidSquirrel +
-			monster::OceanidWigeon +
-			monster::GeoHypostasis +
-			monster::RuinSerpent +
-			monster::PrimoGeovishap +
-			monster::Beisht +
+			monster::PyroRegisvine,
+			monster::Oceanid,
+			monster::OceanidBoar,
+			monster::OceanidCrab,
+			monster::OceanidCrane,
+			monster::OceanidFalcon,
+			monster::OceanidFinch,
+			monster::OceanidFrog,
+			monster::OceanidSquirrel,
+			monster::OceanidWigeon,
+			monster::GeoHypostasis,
+			monster::RuinSerpent,
+			monster::PrimoGeovishap,
+			monster::Beisht,
 			// Inazuma
-			monster::PerpetualMechanicalArray +
-			monster::PyroHypostasis +
-			monster::MaguuKenki +
-			monster::ThunderManifestation +
-			monster::GoldenWolflord +
-			monster::HydroHypostasis +
-			monster::HydroHypostasisSummon +
-			monster::CryoBathysmalVishap +
+			monster::PerpetualMechanicalArray,
+			monster::PyroHypostasis,
+			monster::MaguuKenki,
+			monster::ThunderManifestation,
+			monster::GoldenWolflord,
+			monster::HydroHypostasis,
+			monster::HydroHypostasisSummon,
+			monster::CryoBathysmalVishap,
 			monster::ElectroBathysmalVishap
 		};
 		SimpleFilter MonsterShielded = {
 			// Taken from https://genshin-impact.fandom.com/wiki/Shields/Enemy.
 			// We won't be including Regisvines and enemy objects here,
 			// just regular monsters.
-			monster::AbyssMage +
-			monster::Slime +
-			monster::Mitachurl +
-			monster::ElectroAbyssLector +
-			monster::HydroAbyssHerald +
-			monster::PyroAbyssLector +
-			monster::FatuiCicinMage +
-			monster::Cicin +
+			monster::AbyssMage,
+			monster::Slime,
+			monster::Mitachurl,
+			monster::ElectroAbyssLector,
+			monster::HydroAbyssHerald,
+			monster::PyroAbyssLector,
+			monster::FatuiCicinMage,
+			monster::Cicin,
 			monster::Whopperflower
 		};
-		SimpleFilter MonsterEquips = { app::EntityType__Enum_1::MonsterEquip };
-		BlacklistFilter Living = {
-			std::vector<app::EntityType__Enum_1> {
-				app::EntityType__Enum_1::EnvAnimal,
-				app::EntityType__Enum_1::Monster
-			},
-			std::vector<std::string> {
-				// Environmental mobs
-				"Cat", "DogPrick", "Vulpues", "Inu_Tanuki",
-				// Overworld bosses
-				"Ningyo", "Regisvine", "Hypostasis", "Planelurker", "Nithhoggr"
-			}
-		};
-		SimpleFilter OrganicTargets = Monsters + Animals; // Solael: Please don't mess around with this filter.
+		SimpleFilter MonsterEquips = { EntityType__Enum_1::MonsterEquip };
+        BlacklistFilter Living = {
+            {EntityType__Enum_1::EnvAnimal, EntityType__Enum_1::Monster},
+            {
+                // Environmental mobs
+                "Cat", "DogPrick", "Vulpues", "Inu_Tanuki",
+                // Overworld bosses
+                "Ningyo", "Regisvine", "Hypostasis", "Planelurker", "Nithhoggr"
+            }
+        };
+		SimpleFilter OrganicTargets = { Monsters, Animals }; // Solael: Please don't mess around with this filter.
 		//m0nkrel: We can choose the entities we need ourselves so as not to magnetize cats, dogs, etc.
-		//AdvancedFilter Animals = { std::vector<app::EntityType__Enum_1> {app::EntityType__Enum_1::EnvAnimal, app::EntityType__Enum_1::Monster }, std::vector<std::string> {"Crane","Tit", "Boar" , "Squirrel", "Fox", "Pigeon", "Wigeon", "Falcon" ,"Marten" } };
+		//AdvancedFilter Animals = { {EntityType__Enum_1::EnvAnimal, EntityType__Enum_1::Monster }, {"Crane", "Tit", "Boar", "Squirrel", "Fox", "Pigeon", "Wigeon", "Falcon" ,"Marten" } };
 	}
-}
\ No newline at end of file
+}