Support for cli integration