Adding structure to support args from the command line