Make service name configurable
Make service name configurable