Modify commands and add sub-commands array