* Updated command-line handler.