Enhanced the CLIs.
5 files changed