Bsongis/telemetry refactoring