Add formatting for numbers in indicators and variables.
Add stat field and type to variables definition.