Better grouping of fields @ challenge.xml