Use new cli