Added support to inject service type/name in the client