Updated command-line utility.