Added int-like and string-like token classes