CLI updated and tested.