Update to new command-line arguments format