feature: replace the old parsing strategy and move towards a tree based one

feature: replace the old parsing strategy and move towards a tree based one #3159