Improve predicates