Telemetry refactoring - Fixes #1634