More predicate information
Various changes