CLI interface improvements.