Add support for all the command line arguments