getServer improvement