Updated based on xml changes.