Add CLI support.
Add CLI support.