Enhance command line tools