improve tsr token generation
new attributes for tsr 0.7.0