Proper CLI interface