Added support for service discovery