Improve Telemetry service