Fix for cli tool

Changed cli tool interface too, a bit of BC break!