Added and-predicate and not-predicate