Add span infos to XML dump
Set span info as subnodes instead of attributes