Fixed PredicateData and PredicateStruct Classes and methods involved on PredicateData