Adapt also the cli module to removed verbatim service