Refactory CommandNode class
Merge lastest code