Add functions with map of tokens
Fix nextChar
fix parser about fields