before pul abdelmajed's part
Before add name to node
Token type added to node
Merge