Rename method
Improve token discrimination
Add parsing function