Added body predicate and some minor predicate validation