Improved command-line tools