Fixed Discovery Service Client