Updates to support Quiz.