More xml changes...