Questionnaires are now in a proper model