Change Cli to Command