added all of the new token types