added tokens and templates