Token class refactoring. Fix multiple char add