Update with auto-xml generation