Refactor CommandTree
Refactor CommandTreee
Merge branch 'validate-option'