add configurable service type to discover method
fix merge conflict