Ready to refactoring, in order to fix the wrong design.
Decoupled token type from parser.