xml dump: add more token attributes