Telemetry refactoring continued