Redesign of QuizModel