Updated based on recent xml changes.