markupGenerator: add token field to template