Updated service discovery pattern