Added service discovery