Added support for question type