Improve cli package