improved CLI interface