Next version with QuestionnaireManager framework