Adds preliminary support for predicates