Modified client questionnaire