Some changes in ChallengeGenerator and ProofGenerator