Add plumbing for cli