 @liclac I could try a PR but perhaps better to wait for the CLI refactor.