Add CLI functionality
Add CLI functionality