Iterating on cli integration