Change internal predicates' API