diff --git a/src-build/Dependencies/Debug/ImOverlay/CeiveImOverlay.luau b/src-build/Dependencies/Debug/ImOverlay/CeiveImOverlay.luau
index 730a4e3..a7d4286 100644
--- a/src-build/Dependencies/Debug/ImOverlay/CeiveImOverlay.luau
+++ b/src-build/Dependencies/Debug/ImOverlay/CeiveImOverlay.luau
@@ -122,16 +122,11 @@ end
 function ImOverlay:m_Pool()
 
 	
-for _, Obj in self.BackFrame:GetChildren() do
-		if Obj:IsA("UIListLayout") or not Obj.Visible then
-			continue
-		end
-
+for _, Obj in self.BackFrame:QueryDescendants("> :not(UIListLayout, [Visible = false])") do
 		-- Quicker to change visibility than to re-parent
 		Obj.Visible = false
 		table.insert(self.m_ItemPool, Obj)
 	end
-
 end
 
 function ImOverlay:m_Cleanup()
diff --git a/src-build/init.luau b/src-build/init.luau
index e22169f..b904386 100644
--- a/src-build/init.luau
+++ b/src-build/init.luau
@@ -141,16 +141,14 @@ function Class:m_CreateBoneTree(RootPart: BasePart, RootBone: Bone)
 	local function AddChildren(Bone, ParentIndex, HeirarchyLength)
 		SB_VERBOSE_LOG(`Adding bone: {Bone.Name}; {ParentIndex}; {HeirarchyLength}`)
 		SB_INDENT_LOG()
-		local Children = Bone:GetChildren()
+		local Children = Bone:QueryDescendants("> Bone")
 		local HasBoneChild = false
 
 		for _, Child in Children do
-			if Child:IsA("Bone") then
-				self:m_AppendBone(BoneTree, Child, ParentIndex, HeirarchyLength)
+			self:m_AppendBone(BoneTree, Child, ParentIndex, HeirarchyLength)
 
-				AddChildren(Child, #BoneTree.Bones, HeirarchyLength + 1)
-				HasBoneChild = true
-			end
+			AddChildren(Child, #BoneTree.Bones, HeirarchyLength + 1)
+			HasBoneChild = true
 		end
 
 		if string.sub(Bone.Name, #Bone.Name - 3, #Bone.Name) == "_end" or string.sub(Bone.Name, #Bone.Name - 4, #Bone.Name) == "_Tail" then
diff --git a/src/Dependencies/Debug/ImOverlay/CeiveImOverlay.luau b/src/Dependencies/Debug/ImOverlay/CeiveImOverlay.luau
index dd72459..871cddc 100644
--- a/src/Dependencies/Debug/ImOverlay/CeiveImOverlay.luau
+++ b/src/Dependencies/Debug/ImOverlay/CeiveImOverlay.luau
@@ -122,11 +122,7 @@ end
 function ImOverlay:m_Pool()
 	debug.profilebegin("ImOverlay::m_Pool")
 
-	for _, Obj in self.BackFrame:GetChildren() do
-		if Obj:IsA("UIListLayout") or not Obj.Visible then
-			continue
-		end
-
+	for _, Obj in self.BackFrame:QueryDescendants("> :not(UIListLayout, [Visible = false])") do
 		-- Quicker to change visibility than to re-parent
 		Obj.Visible = false
 		table.insert(self.m_ItemPool, Obj)
diff --git a/src/init.luau b/src/init.luau
index a08de23..5eb432f 100644
--- a/src/init.luau
+++ b/src/init.luau
@@ -141,16 +141,14 @@ function Class:m_CreateBoneTree(RootPart: BasePart, RootBone: Bone)
 	local function AddChildren(Bone, ParentIndex, HeirarchyLength)
 		SB_VERBOSE_LOG(`Adding bone: {Bone.Name}; {ParentIndex}; {HeirarchyLength}`)
 		SB_INDENT_LOG()
-		local Children = Bone:GetChildren()
+		local Children = Bone:QueryDescendants("> Bone")
 		local HasBoneChild = false
 
 		for _, Child in Children do
-			if Child:IsA("Bone") then
-				self:m_AppendBone(BoneTree, Child, ParentIndex, HeirarchyLength)
+			self:m_AppendBone(BoneTree, Child, ParentIndex, HeirarchyLength)
 
-				AddChildren(Child, #BoneTree.Bones, HeirarchyLength + 1)
-				HasBoneChild = true
-			end
+			AddChildren(Child, #BoneTree.Bones, HeirarchyLength + 1)
+			HasBoneChild = true
 		end
 
 		if string.sub(Bone.Name, #Bone.Name - 3, #Bone.Name) == "_end" or string.sub(Bone.Name, #Bone.Name - 4, #Bone.Name) == "_Tail" then