Improved command-line arguments