Added support for compound questions