Move instrumentation to own plugin