Rewrite CLI interface