Add a proper CLI interface