Improve the command line interface