Adding support for custom service name