add auto detector code
Remove service name