Updated based on RFC3315bis XML changes.