Modified: Improved cli.

Improved cli.