Change the predicate tree design