Improved token specifications

Signed-off-by: Collin Baker <chbaker0@gmail.com>