More use of tokens in the forms