Added telemetry support