Adds new Token class
Removes obsolete Token types