Added additional question/answer fields