Fixed XML structure in 3.1 branch