Fixing Quiz Model

@aelnouby please review and merge