Change Token type and add basic matchers