Re-organizing the telemetry methods