Fixed Xsd, Change signatures of predicate constructors