Add cli support