Added predicate functions and expressions (not completed predicate validations)