Updated server to add command line options