Telemetry refactoring