Improve cli interface