adding support for questions