CLI Improvement.