Added Riddle classes.