Improvements in the command line interface