Revise the CLI functionality