added cli support