Improved command line support