More xml changes