Added support for patient context in questionnaire