General Update :
Support mutli cmds, improve struct and code factoring