Updated auto predicate and data predicate to pass type of predicate. Removed notification and failure as predicate template types.