Add new token managment rilying on hack
Add decision and merge node code generation