Add option to pass server name argument