Updated command-line interface