CLI improvement.