added token-map dict for class token generation. added additional token ...

...class definitions