Added support for Questions, Types