Better draft for ConsoleClient CLI