add generic token types