Updated XML and schema