Added service discovery (for some reason)