Added fullform XML generation