Updated XML
Link support