Update to have better cli