Reformed CLI interface