Added more validation with Clue dictionaries