feat(model): Cleanup and introduce telemetry