Updated the command-line parsing