Added --server command line flag