add tokens, categories