Improved command-line interface