Removed deprecated parsing style
removed Match and changed Token