Added --server option