updated token class