Added support for comments in the questions