Modified XML generation to use new xmlHelper question functions