Updated command-line interface.