Improve examples to be more cli friendly