Added proper clue generation