Use new CLI approach