Improved command line arguments