Integration with service discovery