WSInstrumentation refactor