Adding server host figuring out on the fly