Added Query sub structure hierarchy.