add working cli support