add 'attribute' and 'value' token types