Improved the command line interface