Added expandable qualifier tree