add more code for supporting multiple servers, add server name