Improved predicates in the Watch module