Some changes in ElementChallengeGenerator