Update to new cli.

Update cli-commands for new syntax.