Update NodeIdentifierWithPredicates construction