Modified Main to have the cli args as field