Changed serverId to be hostAddress:port