Made KeyPredicateSupplier and PredicateSupplier IdentifiedDataSerializable