Move instrumentation to service.