Refactor endpoint descriptions, add token info