Added questionnaire configuration