Updated XML with everything now