Add multiple questions support