Add predicate support