Improved command line interface