Updated XML to 2.5-3.0